Merge pull request #6531 from covlllp/new_merge

Fixes bluebeam password protection issue

src/core/crypto.js

@@ -1762,9 +1762,10 @@ var CipherTransformFactory = (function CipherTransformFactoryClosure() {
       if (pdfAlgorithm.checkUserPassword(password, userValidationSalt,
                                          userPassword)) {
         return pdfAlgorithm.getUserKey(password, userKeySalt, userEncryption);
-      } else if (pdfAlgorithm.checkOwnerPassword(password, ownerValidationSalt,
+      } else if (password.length && pdfAlgorithm.checkOwnerPassword(password,
-                                                 uBytes,
+                                                   ownerValidationSalt,
-                                                 ownerPassword)) {
+                                                   uBytes,
+                                                   ownerPassword)) {
         return pdfAlgorithm.getOwnerKey(password, ownerKeySalt, uBytes,
                                         ownerEncryption);
       }