diff options
| author | jpierre%netscape.com <devnull@localhost> | 2004-01-08 01:37:46 +0000 |
|---|---|---|
| committer | jpierre%netscape.com <devnull@localhost> | 2004-01-08 01:37:46 +0000 |
| commit | c404320492a920902d3f4374206a75a70e69280b (patch) | |
| tree | 946253c9b8b9ed04919d6d0baae249b95de50e58 | |
| parent | 38d82034c7e95b00d8fbd9a1b5f4456c239f0931 (diff) | |
| download | nss-hg-c404320492a920902d3f4374206a75a70e69280b.tar.gz | |
Rename PK11_PubDeriveExtended to PK11_PubDeriveWithKDF
| -rw-r--r-- | security/nss/lib/nss/nss.def | 2 | ||||
| -rw-r--r-- | security/nss/lib/pk11wrap/pk11func.h | 2 | ||||
| -rw-r--r-- | security/nss/lib/pk11wrap/pk11skey.c | 2 | ||||
| -rw-r--r-- | security/nss/lib/ssl/ssl3con.c | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/security/nss/lib/nss/nss.def b/security/nss/lib/nss/nss.def index 87cf80aa7..40e959697 100644 --- a/security/nss/lib/nss/nss.def +++ b/security/nss/lib/nss/nss.def @@ -771,7 +771,7 @@ PK11_ExportEncryptedPrivKeyInfo; PK11_FindSlotsByNames; PK11_GetSymKeyType; PK11_MoveSymKey; -PK11_PubDeriveExtended; +PK11_PubDeriveWithKDF; PK11_PubUnwrapSymKeyWithFlagsPerm; PK11_UnwrapSymKeyWithFlagsPerm; SECITEM_ArenaDupItem; diff --git a/security/nss/lib/pk11wrap/pk11func.h b/security/nss/lib/pk11wrap/pk11func.h index e78c864ad..ddd968d22 100644 --- a/security/nss/lib/pk11wrap/pk11func.h +++ b/security/nss/lib/pk11wrap/pk11func.h @@ -330,7 +330,7 @@ PK11SymKey *PK11_PubDerive( 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) ; -PK11SymKey *PK11_PubDeriveExtended( SECKEYPrivateKey *privKey, +PK11SymKey *PK11_PubDeriveWithKDF( SECKEYPrivateKey *privKey, SECKEYPublicKey *pubKey, PRBool isSender, SECItem *randomA, SECItem *randomB, CK_MECHANISM_TYPE derive, CK_MECHANISM_TYPE target, CK_ATTRIBUTE_TYPE operation, int keySize, diff --git a/security/nss/lib/pk11wrap/pk11skey.c b/security/nss/lib/pk11wrap/pk11skey.c index 02a6c26f4..35c553507 100644 --- a/security/nss/lib/pk11wrap/pk11skey.c +++ b/security/nss/lib/pk11wrap/pk11skey.c @@ -3000,7 +3000,7 @@ PK11_PubDerive(SECKEYPrivateKey *privKey, SECKEYPublicKey *pubKey, } PK11SymKey * -PK11_PubDeriveExtended(SECKEYPrivateKey *privKey, SECKEYPublicKey *pubKey, +PK11_PubDeriveWithKDF(SECKEYPrivateKey *privKey, SECKEYPublicKey *pubKey, PRBool isSender, SECItem *randomA, SECItem *randomB, CK_MECHANISM_TYPE derive, CK_MECHANISM_TYPE target, CK_ATTRIBUTE_TYPE operation, int keySize, diff --git a/security/nss/lib/ssl/ssl3con.c b/security/nss/lib/ssl/ssl3con.c index 3099b97c8..1b2cd4fc1 100644 --- a/security/nss/lib/ssl/ssl3con.c +++ b/security/nss/lib/ssl/ssl3con.c @@ -3759,7 +3759,7 @@ sendECDHClientKeyExchange(sslSocket * ss, SECKEYPublicKey * svrPubKey) } /* Determine the PMS */ - pms = PK11_PubDeriveExtended(privKey, svrPubKey, PR_FALSE, NULL, NULL, + pms = PK11_PubDeriveWithKDF(privKey, svrPubKey, PR_FALSE, NULL, NULL, CKM_ECDH1_DERIVE, target, CKA_DERIVE, 0, kdf, NULL, NULL); @@ -6983,7 +6983,7 @@ ssl3_HandleECDHClientKeyExchange(sslSocket *ss, SSL3Opaque *b, } /* Determine the PMS */ - pms = PK11_PubDeriveExtended(srvrPrivKey, &clntPubKey, PR_FALSE, NULL, NULL, + pms = PK11_PubDeriveWithKDF(srvrPrivKey, &clntPubKey, PR_FALSE, NULL, NULL, CKM_ECDH1_DERIVE, target, CKA_DERIVE, 0, kdf, NULL, NULL); |