summaryrefslogtreecommitdiff
path: root/security/nss/lib/pki/pki.h
diff options
context:
space:
mode:
Diffstat (limited to 'security/nss/lib/pki/pki.h')
-rw-r--r--security/nss/lib/pki/pki.h17
1 files changed, 3 insertions, 14 deletions
diff --git a/security/nss/lib/pki/pki.h b/security/nss/lib/pki/pki.h
index a06eaf572..80c935bad 100644
--- a/security/nss/lib/pki/pki.h
+++ b/security/nss/lib/pki/pki.h
@@ -61,7 +61,7 @@ nssTrustDomain_FindTokenForAlgNParam (
NSS_EXTERN NSSToken *
nssTrustDomain_FindTokenForAlgorithm (
NSSTrustDomain *td,
- const NSSOID *algorithm
+ NSSOIDTag algorithm
);
NSS_EXTERN NSSCallback *
@@ -224,7 +224,7 @@ NSS_EXTERN NSSCert **
nssCert_BuildChain (
NSSCert *c,
NSSTime time,
- NSSUsages *usagesOpt,
+ const NSSUsages *usagesOpt,
NSSPolicies *policiesOpt,
NSSCert **rvOpt,
PRUint32 rvLimit,
@@ -240,7 +240,7 @@ nssPrivateKey_AddRef (
NSS_EXTERN NSSPrivateKey *
nssPrivateKey_Decode (
NSSBER *ber,
- NSSOID *keyPairAlg,
+ NSSKeyPairType keyPairType,
NSSOperations operations,
NSSProperties properties,
NSSUTF8 *passwordOpt,
@@ -296,17 +296,6 @@ nssSymKey_AddRef (
NSSSymKey *mk
);
-NSS_EXTERN PRStatus
-nssSymKey_DeriveSSLSessionKeys (
- NSSSymKey *masterSecret,
- const NSSAlgNParam *ap,
- NSSSymKeyType bulkKeyType,
- NSSOperations operations,
- NSSProperties properties,
- PRUint32 keySize,
- NSSSymKey **sessionKeys
-);
-
NSS_EXTERN NSSVolatileDomain *
nssVolatileDomain_Create (
NSSTrustDomain *td,