Switch to checking for AES_KEY_WRAP by default

Signed-off-by: Alexander Scheel <[email protected]>
dogtagpki · Feb 24, 2021 · 4446afe · 4446afe
1 parent e45b5dc
commit 4446afe
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/org/mozilla/jss/pkcs11/PK11KeyWrapper.c b/org/mozilla/jss/pkcs11/PK11KeyWrapper.c
@@ -886,17 +886,17 @@ CK_MECHANISM_TYPE getSupportedWrappingMechanism(JNIEnv *env, jobject algObj, PK1
      */
     if ( mech == CKM_AES_KEY_WRAP ||
              mech == CKM_NSS_AES_KEY_WRAP) {
-        if (!PK11_DoesMechanism(slot, CKM_AES_KEY_WRAP)) {
-            mech = CKM_NSS_AES_KEY_WRAP;
-        } else {
+        if (PK11_DoesMechanism(slot, CKM_AES_KEY_WRAP)) {
             mech = CKM_AES_KEY_WRAP;
+        } else {
+            mech = CKM_NSS_AES_KEY_WRAP;
         }
     } else if ( mech == CKM_AES_KEY_WRAP_PAD
             || mech == CKM_NSS_AES_KEY_WRAP_PAD) {
-        if (!PK11_DoesMechanism(slot, CKM_AES_KEY_WRAP_PAD)) {
-            mech = CKM_NSS_AES_KEY_WRAP_PAD;
-        } else {
+        if (PK11_DoesMechanism(slot, CKM_AES_KEY_WRAP_PAD)) {
             mech = CKM_AES_KEY_WRAP_PAD;
+        } else {
+            mech = CKM_NSS_AES_KEY_WRAP_PAD;
         }
     }
     return mech;