Refactor PGPPublicKey.init

gefeili · gefeili · commit 1bbbd2f90faa · 2024-09-03T12:23:36.000+09:30
diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPPublicKey.java b/pg/src/main/java/org/bouncycastle/openpgp/PGPPublicKey.java
@@ -70,11 +70,7 @@ else if (publicPk.getVersion() == PublicKeyPacket.VERSION_4)
         {
             this.keyID = Pack.bigEndianToLong(fingerprint, fingerprint.length - 8);
         }
-        else if (publicPk.getVersion() == PublicKeyPacket.LIBREPGP_5)
-        {
-            this.keyID = Pack.bigEndianToLong(fingerprint, 0);
-        }
-        else if (publicPk.getVersion() == PublicKeyPacket.VERSION_6)
+        else if (publicPk.getVersion() == PublicKeyPacket.LIBREPGP_5 || publicPk.getVersion() ==  PublicKeyPacket.VERSION_6)
         {
             this.keyID = Pack.bigEndianToLong(fingerprint, 0);
         }

Original file line number	Diff line number	Diff line change
`@@ -70,11 +70,7 @@ else if (publicPk.getVersion() == PublicKeyPacket.VERSION_4)`
`70`	`70`	`{`
`71`	`71`	`this.keyID = Pack.bigEndianToLong(fingerprint, fingerprint.length - 8);`
`72`	`72`	`}`
`73`		`- else if (publicPk.getVersion() == PublicKeyPacket.LIBREPGP_5)`
`74`		`- {`
`75`		`- this.keyID = Pack.bigEndianToLong(fingerprint, 0);`
`76`		`- }`
`77`		`- else if (publicPk.getVersion() == PublicKeyPacket.VERSION_6)`
	`73`	`+ else if (publicPk.getVersion() == PublicKeyPacket.LIBREPGP_5 \|\| publicPk.getVersion() == PublicKeyPacket.VERSION_6)`
`78`	`74`	`{`
`79`	`75`	`this.keyID = Pack.bigEndianToLong(fingerprint, 0);`
`80`	`76`	`}`