Made wincx the last argument of PK11_PubDeriveExtended. r=relyea.

Modified Files: pk11func.h pk11skey.c ssl3con.c
sailfishos-mirror · Dec 19, 2003 · 1a4de6b · 1a4de6b
1 parent f21d4d3
commit 1a4de6b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/security/nss/lib/pk11wrap/pk11func.h b/security/nss/lib/pk11wrap/pk11func.h
@@ -333,8 +333,8 @@ PK11SymKey *PK11_PubDerive( SECKEYPrivateKey *privKey,
 PK11SymKey *PK11_PubDeriveExtended( SECKEYPrivateKey *privKey, 
  SECKEYPublicKey *pubKey, PRBool isSender, SECItem *randomA, SECItem *randomB,
  CK_MECHANISM_TYPE derive, CK_MECHANISM_TYPE target,
-		 CK_ATTRIBUTE_TYPE operation, int keySize,void *wincx,
-		 CK_ULONG kdf, SECItem *sharedData);
+		 CK_ATTRIBUTE_TYPE operation, int keySize,
+		 CK_ULONG kdf, SECItem *sharedData, void *wincx);
 
 /*
  * unwrap a new key with a symetric key.

diff --git a/security/nss/lib/pk11wrap/pk11skey.c b/security/nss/lib/pk11wrap/pk11skey.c
@@ -3003,8 +3003,8 @@ PK11SymKey *
 PK11_PubDeriveExtended(SECKEYPrivateKey *privKey, SECKEYPublicKey *pubKey, 
 	PRBool isSender, SECItem *randomA, SECItem *randomB, 
 	CK_MECHANISM_TYPE derive, CK_MECHANISM_TYPE target,
-	CK_ATTRIBUTE_TYPE operation, int keySize,void *wincx,
-	CK_ULONG kdf, SECItem *sharedData)
+	CK_ATTRIBUTE_TYPE operation, int keySize,
+	CK_ULONG kdf, SECItem *sharedData, void *wincx)
 {
     PK11SlotInfo *slot = privKey->pkcs11Slot;
     PK11SymKey *symKey;

diff --git a/security/nss/lib/ssl/ssl3con.c b/security/nss/lib/ssl/ssl3con.c
@@ -3760,8 +3760,8 @@ sendECDHClientKeyExchange(sslSocket * ss, SECKEYPublicKey * svrPubKey)
 
     /*  Determine the PMS */
     pms = PK11_PubDeriveExtended(privKey, svrPubKey, PR_FALSE, NULL, NULL,
-			    CKM_ECDH1_DERIVE, target, CKA_DERIVE, 0, NULL,
-			    kdf, NULL);
+			    CKM_ECDH1_DERIVE, target, CKA_DERIVE, 0,
+			    kdf, NULL, NULL);
 
     if (pms == NULL) {
 	ssl_MapLowLevelError(SSL_ERROR_CLIENT_KEY_EXCHANGE_FAILURE);
@@ -6984,8 +6984,8 @@ ssl3_HandleECDHClientKeyExchange(sslSocket *ss, SSL3Opaque *b,
 
     /*  Determine the PMS */
     pms = PK11_PubDeriveExtended(srvrPrivKey, &clntPubKey, PR_FALSE, NULL, NULL,
-			    CKM_ECDH1_DERIVE, target, CKA_DERIVE, 0, NULL,
-			    kdf, NULL);
+			    CKM_ECDH1_DERIVE, target, CKA_DERIVE, 0,
+			    kdf, NULL, NULL);
 
     PORT_Free(clntPubKey.u.ec.publicValue.data);