Renamed SECKEY_ECParams2KeySize as SECKEY_ECParamsToKeySize. Do not e…

…xport this function from the nss3 shared library. Modified Files: seckey.c pk11skey.c nss.def
sailfishos-mirror · Dec 22, 2003 · 71c8e91 · 71c8e91
1 parent fd7843e
commit 71c8e91
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/security/nss/lib/cryptohi/seckey.c b/security/nss/lib/cryptohi/seckey.c
@@ -1113,7 +1113,7 @@ CERT_KMIDPublicKey(CERTCertificate *cert)
 }
 
 int
-SECKEY_ECParams2KeySize(SECItem *encodedParams)
+SECKEY_ECParamsToKeySize(SECItem *encodedParams)
 {
     SECOidTag tag;
     SECItem oid = { siBuffer, NULL, 0};
@@ -1268,7 +1268,7 @@ SECKEY_PublicKeyStrength(SECKEYPublicKey *pubk)
 	/* Get the key size in bits and adjust */
 	if (pubk->u.ec.size == 0) {
 	    pubk->u.ec.size = 
-		SECKEY_ECParams2KeySize(&pubk->u.ec.DEREncodedParams);
+		SECKEY_ECParamsToKeySize(&pubk->u.ec.DEREncodedParams);
 	} 
 	return (pubk->u.ec.size + 7)/8;
 #endif /* NSS_ENABLE_ECC */
@@ -1292,7 +1292,7 @@ SECKEY_PublicKeyStrengthInBits(SECKEYPublicKey *pubk)
     case ecKey:
 	if (pubk->u.ec.size == 0) {
 	    pubk->u.ec.size = 
-		SECKEY_ECParams2KeySize(&pubk->u.ec.DEREncodedParams);
+		SECKEY_ECParamsToKeySize(&pubk->u.ec.DEREncodedParams);
 	} 
 	return pubk->u.ec.size;
 #endif /* NSS_ENABLE_ECC */

diff --git a/security/nss/lib/nss/nss.def b/security/nss/lib/nss/nss.def
@@ -775,7 +775,6 @@ PK11_PubDeriveExtended;
 PK11_PubUnwrapSymKeyWithFlagsPerm;
 PK11_UnwrapSymKeyWithFlagsPerm;
 SECITEM_ArenaDupItem;
-SECKEY_ECParams2KeySize;
 SECMOD_GetDBModuleList;
 SECMOD_GetDeadModuleList;
 SEC_ASN1DecoderAbort;

diff --git a/security/nss/lib/pk11wrap/pk11skey.c b/security/nss/lib/pk11wrap/pk11skey.c
@@ -73,7 +73,7 @@ static PRBool pk11_FindAttrInTemplate(CK_ATTRIBUTE *attr,
 	unsigned int numAttrs, CK_ATTRIBUTE_TYPE target);
 
 #ifdef NSS_ENABLE_ECC
-extern int SECKEY_ECParams2KeySize(SECItem *params);
+extern int SECKEY_ECParamsToKeySize(SECItem *params);
 #endif /* NSS_ENABLE_ECC */
 
 /*
@@ -1281,7 +1281,7 @@ PK11_SignatureLen(SECKEYPrivateKey *key)
 	    if (theTemplate.pValue != NULL) {
 	        params.len = theTemplate.ulValueLen;
 		params.data = (unsigned char *) theTemplate.pValue;
-	        length = SECKEY_ECParams2KeySize(&params);
+	        length = SECKEY_ECParamsToKeySize(&params);
 	        PORT_Free(theTemplate.pValue);
 	    }
 	    length = ((length + 7)/8) * 2;