Remove unused parameters

Author: msirringhaus

crypto/cipher/aes_gcm_nss.c

@@ -222,8 +222,7 @@ static srtp_err_status_t srtp_aes_gcm_nss_context_init(void *cv,
          * Note: the caller is now responsible for the proper FIPS usage of the
          * key material!
          */
-        c->key = import_sym_key_in_FIPS(slot, CKM_AES_GCM, PK11_OriginUnwrap,
-                                        CKA_ENCRYPT, &key_item, NULL);
+        c->key = import_sym_key_in_FIPS(slot, CKM_AES_GCM, CKA_ENCRYPT, &key_item);
     } else {
         c->key = PK11_ImportSymKey(slot, CKM_AES_GCM, PK11_OriginUnwrap,
                                    CKA_ENCRYPT, &key_item, NULL);

crypto/cipher/aes_icm_nss.c

@@ -263,8 +263,7 @@ static srtp_err_status_t srtp_aes_icm_nss_context_init(void *cv,
          * Note: the caller is now responsible for the proper FIPS usage of the
          * key material!
          */
-        c->key = import_sym_key_in_FIPS(slot, CKM_AES_CTR, PK11_OriginUnwrap,
-                                        CKA_ENCRYPT, &keyItem, NULL);
+        c->key = import_sym_key_in_FIPS(slot, CKM_AES_CTR, CKA_ENCRYPT, &keyItem);
     } else {
         c->key = PK11_ImportSymKey(slot, CKM_AES_CTR, PK11_OriginUnwrap,
                                    CKA_ENCRYPT, &keyItem, NULL);

crypto/hash/hmac_nss.c

@@ -196,7 +196,7 @@ static srtp_err_status_t srtp_hmac_init(void *statev,
          * key material!
          */
         sym_key = import_sym_key_in_FIPS(
-            slot, CKM_SHA_1_HMAC, PK11_OriginUnwrap, CKA_SIGN, &key_item, NULL);
+            slot, CKM_SHA_1_HMAC, CKA_SIGN, &key_item);
     } else {
         sym_key = PK11_ImportSymKey(slot, CKM_SHA_1_HMAC, PK11_OriginUnwrap,
                                     CKA_SIGN, &key_item, NULL);

crypto/include/nss_fips.h

@@ -43,10 +43,8 @@
 
 static PK11SymKey *import_sym_key_in_FIPS(PK11SlotInfo *const slot,
                                           const CK_MECHANISM_TYPE type,
-                                          const PK11Origin origin,
                                           const CK_ATTRIBUTE_TYPE operation,
-                                          SECItem *const raw_key,
-                                          void *const wincx)
+                                          SECItem *const raw_key)
 {
     PK11SymKey *wrapping_key = NULL;
     PK11Context *wrap_key_crypt_context = NULL;