pr-1701: reuse type constants

Jill Kleiber · Jill Kleiber · commit 8f5db23fd18f · 2024-06-24T15:14:44.000+02:00
diff --git a/pg/src/main/java/org/bouncycastle/bcpg/S2K.java b/pg/src/main/java/org/bouncycastle/bcpg/S2K.java
@@ -127,7 +127,7 @@ public class S2K
     public S2K(
         int algorithm)
     {
-        this.type = 0;
+        this.type = SIMPLE;
         this.algorithm = algorithm;
     }
 
@@ -141,7 +141,7 @@ public S2K(
         int algorithm,
         byte[] iv)
     {
-        this.type = 1;
+        this.type = SALTED;
         this.algorithm = algorithm;
         this.iv = iv;
     }
@@ -158,7 +158,7 @@ public S2K(
         byte[] iv,
         int itCount)
     {
-        this.type = 3;
+        this.type = SALTED_AND_ITERATED;
         this.algorithm = algorithm;
         this.iv = iv;
 

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ public class S2K`
`127`	`127`	`public S2K(`
`128`	`128`	`int algorithm)`
`129`	`129`	`{`
`130`		`- this.type = 0;`
	`130`	`+ this.type = SIMPLE;`
`131`	`131`	`this.algorithm = algorithm;`
`132`	`132`	`}`
`133`	`133`
`@@ -141,7 +141,7 @@ public S2K(`
`141`	`141`	`int algorithm,`
`142`	`142`	`byte[] iv)`
`143`	`143`	`{`
`144`		`- this.type = 1;`
	`144`	`+ this.type = SALTED;`
`145`	`145`	`this.algorithm = algorithm;`
`146`	`146`	`this.iv = iv;`
`147`	`147`	`}`
`@@ -158,7 +158,7 @@ public S2K(`
`158`	`158`	`byte[] iv,`
`159`	`159`	`int itCount)`
`160`	`160`	`{`
`161`		`- this.type = 3;`
	`161`	`+ this.type = SALTED_AND_ITERATED;`
`162`	`162`	`this.algorithm = algorithm;`
`163`	`163`	`this.iv = iv;`
`164`	`164`