You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2020/09/17 18:06:53 UTC

svn commit: r1881801 - /pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java

Author: tilman
Date: Thu Sep 17 18:06:53 2020
New Revision: 1881801

URL: http://svn.apache.org/viewvc?rev=1881801&view=rev
Log:
PDFBOX-4421: use switch statement

Modified:
    pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java

Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java?rev=1881801&r1=1881800&r2=1881801&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java Thu Sep 17 18:06:53 2020
@@ -380,23 +380,23 @@ public final class PublicKeySecurityHand
             }
 
             byte[] mdResult;
-            if (version == 4)
+            switch (version)
             {
-                dictionary.setSubFilter(SUBFILTER5);
-                mdResult = MessageDigests.getSHA1().digest(shaInput);
-                prepareEncryptionDictAES(dictionary, COSName.AESV2, recipientsFields);
-            }
-            else if (version == 5)
-            {
-                dictionary.setSubFilter(SUBFILTER5);
-                mdResult = MessageDigests.getSHA256().digest(shaInput);
-                prepareEncryptionDictAES(dictionary, COSName.AESV3, recipientsFields);
-            }
-            else
-            {
-                dictionary.setSubFilter(SUBFILTER4);
-                mdResult = MessageDigests.getSHA1().digest(shaInput);
-                dictionary.setRecipients(recipientsFields);
+                case 4:
+                    dictionary.setSubFilter(SUBFILTER5);
+                    mdResult = MessageDigests.getSHA1().digest(shaInput);
+                    prepareEncryptionDictAES(dictionary, COSName.AESV2, recipientsFields);
+                    break;
+                case 5:
+                    dictionary.setSubFilter(SUBFILTER5);
+                    mdResult = MessageDigests.getSHA256().digest(shaInput);
+                    prepareEncryptionDictAES(dictionary, COSName.AESV3, recipientsFields);
+                    break;
+                default:
+                    dictionary.setSubFilter(SUBFILTER4);
+                    mdResult = MessageDigests.getSHA1().digest(shaInput);
+                    dictionary.setRecipients(recipientsFields);
+                    break;
             }
 
             this.encryptionKey = new byte[this.keyLength/8];