s/AlgorithmAndParameters/AlgNParam/

author: ian.mcgreer%sun.com <devnull@localhost> 2003-01-09 20:00:19 +0000
committer: ian.mcgreer%sun.com <devnull@localhost> 2003-01-09 20:00:19 +0000
commit: 7ccdb0f2f5f01ceaacea9ac60b5b8b2dd7ffa5f2 (patch)
tree: 2a9f2e82ad770938c79d49d7254955dfb4c99541
parent: 511ba17fce9770e9bb9a8b53eeb08e60691a6847 (diff)
download: nss-hg-7ccdb0f2f5f01ceaacea9ac60b5b8b2dd7ffa5f2.tar.gz
30 files changed, 526 insertions, 526 deletions
diff --git a/security/nss/cmd/cipher/cipher.h b/security/nss/cmd/cipher/cipher.h
index 4afe253c3..69dd74670 100644
--- a/security/nss/cmd/cipher/cipher.h
+++ b/security/nss/cmd/cipher/cipher.h
@@ -95,10 +95,10 @@ GenerateKeyPair
   NSSPublicKey **publicKey
 );
 
-NSSAlgorithmAndParameters *
+NSSAlgNParam *
 GetSymKeyGenAP(char *cipher);
 
-NSSAlgorithmAndParameters *
+NSSAlgNParam *
 GetSymCipherAP(char *cipher, char *iv);
 
 PRStatus
diff --git a/security/nss/cmd/cipher/ciphertests.c b/security/nss/cmd/cipher/ciphertests.c
index 339d04ac1..54c4c0ce7 100644
--- a/security/nss/cmd/cipher/ciphertests.c
+++ b/security/nss/cmd/cipher/ciphertests.c
@@ -43,7 +43,7 @@
 
 PRStatus
 EncryptionTest(NSSSymmetricKey *symKey,
-               NSSAlgorithmAndParameters *cipher,
+               NSSAlgNParam *cipher,
                NSSItem *plaintext,
                NSSItem *ciphertext)
 {
@@ -128,7 +128,7 @@ static int numCipherArgs = sizeof(cipherArgs) / sizeof(cipherArgs[0]);
 
 static NSSSymmetricKey *
 unwrap_symkey(NSSVolatileDomain *vd, NSSPrivateKey *unwrapKey, 
-              NSSAlgorithmAndParameters *wrapAP,
+              NSSAlgNParam *wrapAP,
               const NSSOID *keyAlg, char *value)
 {
     NSSSymmetricKey *symKey = NULL;
@@ -149,14 +149,14 @@ PRStatus
 SymmetricCipherTests(CMDRunTimeData *rtData, 
                      NSSVolatileDomain *vd,
                      NSSPrivateKey *unwrapKey,
-                     NSSAlgorithmAndParameters *wrapAP)
+                     NSSAlgNParam *wrapAP)
 {
     int arg;
     char *value;
     PRStatus status;
     NSSArena *arena = NULL;
     NSSSymmetricKey *symKey = NULL;
-    NSSAlgorithmAndParameters *ap = NULL;
+    NSSAlgNParam *ap = NULL;
     NSSItem *plaintext = NULL;
     NSSItem *ciphertext = NULL;
     NSSItem *algID;
@@ -171,7 +171,7 @@ SymmetricCipherTests(CMDRunTimeData *rtData,
 	case cipherAlgID:
 	    if (symKey || !arena) {
 		if (ap) {
-		    NSSAlgorithmAndParameters_Destroy(ap); ap = NULL;
+		    NSSAlgNParam_Destroy(ap); ap = NULL;
 		}
 		if (symKey) {
 		    NSSSymmetricKey_Destroy(symKey); symKey = NULL;
@@ -192,14 +192,14 @@ SymmetricCipherTests(CMDRunTimeData *rtData,
 	    if (!algID) {
 		goto loser;
 	    }
-	    ap = NSSAlgorithmAndParameters_Decode(algID, arena);
+	    ap = NSSAlgNParam_Decode(algID, arena);
 	    NSSItem_Destroy(algID);
 	    if (!ap) {
 		goto loser;
 	    }
 	    break;
 	case cipherKey:
-	    alg = NSSAlgorithmAndParameters_GetAlgorithm(ap);
+	    alg = NSSAlgNParam_GetAlgorithm(ap);
 	    symKey = unwrap_symkey(vd, unwrapKey, wrapAP, alg, value);
 	    if (!symKey) {
 		goto loser;
@@ -255,7 +255,7 @@ SelfTest()
     CMDRunTimeData rtData;
     NSSPrivateKey *unwrapKey;
     NSSOID *alg;
-    NSSAlgorithmAndParameters *wrapAP;
+    NSSAlgNParam *wrapAP;
     NSSOID *anRSAkey = NSSOID_CreateFromTag(NSS_OID_PKCS1_RSA_ENCRYPTION);
     NSSItem *encodedKey;
 
@@ -299,7 +299,7 @@ SelfTest()
     }
 
     alg = NSSOID_CreateFromTag(NSS_OID_PKCS1_RSA_ENCRYPTION);
-    wrapAP = NSSOID_CreateAlgorithmAndParameters(alg, NULL, NULL);
+    wrapAP = NSSOID_CreateAlgNParam(alg, NULL, NULL);
     if (!wrapAP) {
 	NSSPrivateKey_Destroy(unwrapKey);
 	CMD_PrintError("failed to create alg/param for unwrap");
@@ -318,7 +318,7 @@ CreateASelfTest(char *cipher, int keysize, char *input)
     NSSTrustDomain *td = NSS_GetDefaultTrustDomain();
     CMDRunTimeData rtData;
     NSSOID *alg;
-    NSSAlgorithmAndParameters *ap, *wrapAP;
+    NSSAlgNParam *ap, *wrapAP;
     NSSSymmetricKey *symKey;
     NSSItem *wrappedKey, *algID, plaintext, *ciphertext;
     NSSToken *token = GetInternalCryptoToken();
@@ -365,7 +365,7 @@ CreateASelfTest(char *cipher, int keysize, char *input)
     }
 
     alg = NSSOID_CreateFromTag(NSS_OID_PKCS1_RSA_ENCRYPTION);
-    wrapAP = NSSOID_CreateAlgorithmAndParameters(alg, NULL, NULL);
+    wrapAP = NSSOID_CreateAlgNParam(alg, NULL, NULL);
     if (!wrapAP) {
 	NSSCertificate_Destroy(wrapCert);
 	CMD_PrintError("failed to create alg/param for unwrap");
@@ -379,7 +379,7 @@ CreateASelfTest(char *cipher, int keysize, char *input)
 
     symKey = NSSVolatileDomain_GenerateSymmetricKey(vd, ap, keysize, NULL,
                                                     0, 0, token, NULL);
-    NSSAlgorithmAndParameters_Destroy(ap);
+    NSSAlgNParam_Destroy(ap);
     if (!symKey) {
 	CMD_PrintError("failed to generate symkey");
 	return PR_FAILURE;
@@ -402,7 +402,7 @@ CreateASelfTest(char *cipher, int keysize, char *input)
                                                  NSSTime_Now(), NULL, NULL,
                                                  NULL, NULL, NULL);
 
-    algID = NSSAlgorithmAndParameters_Encode(ap, NULL, NULL);
+    algID = NSSAlgNParam_Encode(ap, NULL, NULL);
 
     CMD_WriteArgValue(&rtData, cipherArgs[cipherAlgID], 
                       algID, CMDFileMode_Hex);
diff --git a/security/nss/cmd/cipher/cipherutil.c b/security/nss/cmd/cipher/cipherutil.c
index b5fc22b7a..6cdfbbff9 100644
--- a/security/nss/cmd/cipher/cipherutil.c
+++ b/security/nss/cmd/cipher/cipherutil.c
@@ -46,7 +46,7 @@ GetSoftwareToken()
     return NSSTrustDomain_FindTokenByName(td, SOFTOKEN_NAME);
 }
 
-NSSAlgorithmAndParameters *
+NSSAlgNParam *
 GetHashAP(char *cipher)
 {
     NSSOID *alg;
@@ -62,7 +62,7 @@ GetHashAP(char *cipher)
 	fprintf(stderr, "Unknown hashing algorithm \"%s\"\n", cipher);
 	return NULL;
     }
-    return NSSOID_CreateAlgorithmAndParameters(alg, NULL, NULL);
+    return NSSOID_CreateAlgNParam(alg, NULL, NULL);
 }
 
 PRStatus
@@ -74,7 +74,7 @@ Hash
 )
 {
     NSSItem *input, *output;
-    NSSAlgorithmAndParameters *hasher;
+    NSSAlgNParam *hasher;
 
     input = CMD_GetInput(rtData);
     if (!input) {
@@ -94,15 +94,15 @@ Hash
     CMD_DumpOutput(output, rtData);
     NSSItem_Destroy(input);
     NSSItem_Destroy(output);
-    NSSAlgorithmAndParameters_Destroy(hasher);
+    NSSAlgNParam_Destroy(hasher);
     return PR_SUCCESS;
 }
 
-NSSAlgorithmAndParameters *
+NSSAlgNParam *
 GetSymKeyGenAP(char *cipher)
 {
     NSSOID *alg;
-    NSSAlgorithmAndParameters *ap;
+    NSSAlgNParam *ap;
 
     if (IS_CIPHER(cipher, "des")) {
 	alg = NSSOID_CreateFromTag(NSS_OID_DES_ECB);
@@ -119,7 +119,7 @@ GetSymKeyGenAP(char *cipher)
 	                       cipher);
 	return NULL;
     }
-    ap = NSSOID_CreateAlgorithmAndParametersForKeyGen(alg, NULL, NULL);
+    ap = NSSOID_CreateAlgNParamForKeyGen(alg, NULL, NULL);
     if (!ap) {
 	PR_fprintf(PR_STDERR, "Failed to create keygen alg/param for %s\n",
 	                       cipher);
@@ -138,7 +138,7 @@ GenerateSymmetricKey
   char *name
 )
 {
-    NSSAlgorithmAndParameters *keygen;
+    NSSAlgNParam *keygen;
     NSSSymmetricKey *skey;
 
     keygen = GetSymKeyGenAP(cipher);
@@ -149,12 +149,12 @@ GenerateSymmetricKey
     skey = NSSTrustDomain_GenerateSymmetricKey(td, keygen, length, 
                                                token, NULL);
 
-    NSSAlgorithmAndParameters_Destroy(keygen);
+    NSSAlgNParam_Destroy(keygen);
 
     return skey;
 }
 
-NSSAlgorithmAndParameters *
+NSSAlgNParam *
 GetSymCipherAP(char *cipher, char *iv)
 {
     char *paramStr, *p;
@@ -162,7 +162,7 @@ GetSymCipherAP(char *cipher, char *iv)
     NSSParameters params;
     NSSParameters *pParams = NULL;
     NSSOID *alg;
-    NSSAlgorithmAndParameters *ap;
+    NSSAlgNParam *ap;
     PRBool haveIV = PR_FALSE;
 
     memset(&params, 0, sizeof(params));
@@ -261,7 +261,7 @@ GetSymCipherAP(char *cipher, char *iv)
     } else {
 	PR_fprintf(PR_STDERR, "algorithm type \"%s\" unknown.\n", cipher);
     }
-    ap = NSSOID_CreateAlgorithmAndParameters(alg, pParams, NULL);
+    ap = NSSOID_CreateAlgNParam(alg, pParams, NULL);
     if (!ap) {
 	PR_fprintf(PR_STDERR, "Failed to create encryption alg/param for %s\n",
 	                       cipher);
@@ -280,7 +280,7 @@ Encrypt
 )
 {
     NSSItem *input, *output;
-    NSSAlgorithmAndParameters *cryptor;
+    NSSAlgNParam *cryptor;
 
     input = CMD_GetInput(rtData);
     if (!input) {
@@ -303,7 +303,7 @@ Encrypt
     return PR_SUCCESS;
 }
 
-NSSAlgorithmAndParameters *
+NSSAlgNParam *
 GetKeyPairGenAP(char *cipher)
 {
     PRStatus status;
@@ -373,9 +373,9 @@ GetKeyPairGenAP(char *cipher)
 	/* XXX pg from file */
     } else {
 	fprintf(stderr, "Unknown keypair type\"%s\"\n", cipher);
-	return (NSSAlgorithmAndParameters *)NULL;
+	return (NSSAlgNParam *)NULL;
     }
-    return NSSOID_CreateAlgorithmAndParametersForKeyGen(alg, &params, NULL);
+    return NSSOID_CreateAlgNParamForKeyGen(alg, &params, NULL);
 }
 
 PRStatus
@@ -391,7 +391,7 @@ GenerateKeyPair
 )
 {
     PRStatus status;
-    const NSSAlgorithmAndParameters *keygen;
+    const NSSAlgNParam *keygen;
 
     keygen = GetKeyPairGenAP(cipher);
     if (!keygen) {
diff --git a/security/nss/cmd/pkiutil/pkiobject.c b/security/nss/cmd/pkiutil/pkiobject.c
index 4052b2140..a79dc4779 100644
--- a/security/nss/cmd/pkiutil/pkiobject.c
+++ b/security/nss/cmd/pkiutil/pkiobject.c
@@ -876,7 +876,7 @@ vkeys = NULL;
 	}
     }
     if (vkey) {
-	NSSAlgorithmAndParameters *pbe;
+	NSSAlgNParam *pbe;
 	NSSParameters params;
 	NSSOID *pbeAlg;
 	NSSItem *encKey;
@@ -887,7 +887,7 @@ vkeys = NULL;
 	    NSSPrivateKey_Destroy(vkey);
 	    return PR_FAILURE;
 	}
-	pbe = NSSOID_CreateAlgorithmAndParameters(pbeAlg, &params, NULL);
+	pbe = NSSOID_CreateAlgNParam(pbeAlg, &params, NULL);
 	if (!pbe) {
 	    NSSPrivateKey_Destroy(vkey);
 	    return PR_FAILURE;
@@ -896,7 +896,7 @@ vkeys = NULL;
 	                              CMD_PWCallbackForKeyEncoding(keypass), 
 	                              NULL, NULL);
 	nss_ZFreeIf(params.pbe.salt.data); /* XXX */
-	NSSAlgorithmAndParameters_Destroy(pbe);
+	NSSAlgNParam_Destroy(pbe);
 	if (encKey) {
 	    CMD_DumpOutput(encKey, rtData);
 	    NSSItem_Destroy(encKey);
@@ -936,7 +936,7 @@ ExportObject (
     return status;
 }
 
-static NSSAlgorithmAndParameters *
+static NSSAlgNParam *
 get_rsa_key_gen_params(PRUint32 keySizeInBits, PRUint32 pubExp)
 {
     NSSOID *kpAlg;
@@ -952,7 +952,7 @@ get_rsa_key_gen_params(PRUint32 keySizeInBits, PRUint32 pubExp)
     if (CMD_SetRSAPE(&params.rsakg.publicExponent, pubExp) == PR_FAILURE)
 	return NULL;
 
-    return NSSOID_CreateAlgorithmAndParametersForKeyGen(kpAlg, &params, 
+    return NSSOID_CreateAlgNParamForKeyGen(kpAlg, &params, 
                                                         NULL);
 }
 
@@ -970,7 +970,7 @@ GenerateKeyPair
     PRStatus status;
     NSSPublicKey *bkey = NULL;
     NSSPrivateKey *vkey = NULL;
-    NSSAlgorithmAndParameters *kpGen = NULL;
+    NSSAlgNParam *kpGen = NULL;
     NSSKeyPairType keyPairType;
     PRUint32 keySizeInBits;
     PRUint32 pubExp;
@@ -1017,7 +1017,7 @@ GenerateKeyPair
                                             nickname, 0, 0, /* XXX */
                                             token, NULL);
 
-    NSSAlgorithmAndParameters_Destroy(kpGen);
+    NSSAlgNParam_Destroy(kpGen);
 
     if (status == PR_SUCCESS) {
 	NSSPublicKey_Destroy(bkey);
diff --git a/security/nss/lib/dev/algparam.c b/security/nss/lib/dev/algparam.c
index bb3e15ae1..a78982186 100644
--- a/security/nss/lib/dev/algparam.c
+++ b/security/nss/lib/dev/algparam.c
@@ -61,12 +61,12 @@ static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$ $Name$";
 #endif
 
 /*
- * NSSAlgorithmAndParametersStr
+ * NSSAlgNParamStr
  *
  * This generic container should hold everything we need to know
  * to use an algorithm, with the specific exclusion of keysizes when 
  * doing key generation (this is specified in the API, thus the same
- * AlgorithmAndParameters can be reused to generate keys of different
+ * AlgNParam can be reused to generate keys of different
  * length).
  *
  * Internally, we need to communicate the following information to
@@ -75,7 +75,7 @@ static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$ $Name$";
  * 1) a CK_MECHANISM
  * 2) template values for key generation and derivation
  *
- * The CK_MECHANISM is always set when the AlgorithmAndParameters is
+ * The CK_MECHANISM is always set when the AlgNParam is
  * created.  The template values are set upon request, and are extracted
  * from the the params field.
  *
@@ -83,10 +83,10 @@ static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$ $Name$";
  * Each algorithm that has a template for params will set it when the
  * AlgParam is created.
  *
- * Once an AlgorithmAndParameters is created, it is considered read-only.
+ * Once an AlgNParam is created, it is considered read-only.
  * Thus is it used as 'const' throughout the API.
  */
-struct NSSAlgorithmAndParametersStr
+struct NSSAlgNParamStr
 {
   NSSArena *arena;
   PRBool i_allocated_arena;
@@ -97,7 +97,7 @@ struct NSSAlgorithmAndParametersStr
   /* every happy algorithm sets a mechanism the same way, but each
    * unhappy one sets a template a different way.
    */
-  PRIntn (* set_template)(const NSSAlgorithmAndParameters *ap,
+  PRIntn (* set_template)(const NSSAlgNParam *ap,
                           CK_ATTRIBUTE_PTR aTemplate,
                           CK_ULONG templateSize);
 
@@ -154,7 +154,7 @@ set_bits_parameter (
 /* For all mechanisms that don't need to set template values (default) */
 static PRIntn
 null_settor (
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   CK_ATTRIBUTE_PTR aTemplate,
   CK_ULONG templateSize
 )
@@ -167,7 +167,7 @@ null_settor (
  */
 
 static PRStatus
-decode_iv(NSSAlgorithmAndParameters *ap, const NSSItem *params)
+decode_iv(NSSAlgNParam *ap, const NSSItem *params)
 {
     PRStatus status;
     NSSItem iv;
@@ -188,7 +188,7 @@ decode_iv(NSSAlgorithmAndParameters *ap, const NSSItem *params)
 /* set template parameters for RSA key generation */
 static PRIntn
 rsa_keygen_settor (
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   CK_ATTRIBUTE_PTR aTemplate,
   CK_ULONG templateSize
 )
@@ -208,7 +208,7 @@ rsa_keygen_settor (
  */
 static PRStatus
 set_rsa_mechanism (
-  NSSAlgorithmAndParameters *ap,
+  NSSAlgNParam *ap,
   CK_MECHANISM_TYPE mech,
   NSSParameters *parameters,
   NSSItem *encodedParams,
@@ -232,7 +232,7 @@ set_rsa_mechanism (
 /* set template parameters for DSA key generation */
 static PRIntn
 dsa_keygen_settor (
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   CK_ATTRIBUTE_PTR aTemplate,
   CK_ULONG templateSize
 )
@@ -257,7 +257,7 @@ dsa_keygen_settor (
  */
 static PRStatus
 set_dsa_mechanism (
-  NSSAlgorithmAndParameters *ap,
+  NSSAlgNParam *ap,
   CK_MECHANISM_TYPE mech,
   NSSParameters *parameters,
   NSSItem *encodedParams,
@@ -289,7 +289,7 @@ set_dsa_mechanism (
 /* set template parameters for Diffie-Hellman key generation */
 static PRIntn
 dh_keygen_settor (
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   CK_ATTRIBUTE_PTR aTemplate,
   CK_ULONG templateSize
 )
@@ -315,7 +315,7 @@ dh_keygen_settor (
  */
 static PRStatus
 set_dh_mechanism (
-  NSSAlgorithmAndParameters *ap,
+  NSSAlgNParam *ap,
   CK_MECHANISM_TYPE mech,
   NSSParameters *parameters,
   NSSItem *encodedParams,
@@ -343,7 +343,7 @@ set_dh_mechanism (
  */
 static PRStatus
 set_des_mechanism (
-  NSSAlgorithmAndParameters *ap,
+  NSSAlgNParam *ap,
   CK_MECHANISM_TYPE mech,
   NSSParameters *parameters,
   NSSItem *encodedParams,
@@ -380,7 +380,7 @@ set_des_mechanism (
  */
 static PRStatus
 set_des3_mechanism (
-  NSSAlgorithmAndParameters *ap,
+  NSSAlgNParam *ap,
   CK_MECHANISM_TYPE mech,
   NSSParameters *parameters,
   NSSItem *encodedParams,
@@ -417,7 +417,7 @@ set_des3_mechanism (
  */
 static PRStatus
 set_aes_mechanism (
-  NSSAlgorithmAndParameters *ap,
+  NSSAlgNParam *ap,
   CK_MECHANISM_TYPE mech,
   NSSParameters *parameters,
   NSSItem *encodedParams,
@@ -501,7 +501,7 @@ static PRStatus rc2_unmap(NSSRC2Parameters *params, NSSArena *arena)
 
 static PRStatus
 rc2_constructor (
-  NSSAlgorithmAndParameters *ap,
+  NSSAlgNParam *ap,
   CK_MECHANISM_TYPE mech,
   NSSParameters *parameters,
   NSSItem *encodedParams,
@@ -555,7 +555,7 @@ rc2_constructor (
  */
 static PRStatus
 set_rc5_mechanism (
-  NSSAlgorithmAndParameters *ap,
+  NSSAlgNParam *ap,
   CK_MECHANISM_TYPE mech,
   NSSParameters *parameters,
   NSSItem *encodedParams,
@@ -621,7 +621,7 @@ not really part of params
 */
 static PRStatus
 pbe_constructor (
-  NSSAlgorithmAndParameters *ap,
+  NSSAlgNParam *ap,
   CK_MECHANISM_TYPE mech,
   NSSParameters *parameters,
   NSSItem *encodedParams
@@ -665,8 +665,8 @@ pbe_constructor (
 }
 
 NSS_IMPLEMENT PRStatus
-nssAlgorithmAndParameters_SetPBEPassword (
-  NSSAlgorithmAndParameters *ap,
+nssAlgNParam_SetPBEPassword (
+  NSSAlgNParam *ap,
   NSSUTF8 *password
 )
 {
@@ -855,7 +855,7 @@ set_sslsession_derive_mechanism (
  */
 static PRStatus
 set_cryptoki_mechanism (
-  NSSAlgorithmAndParameters *ap,
+  NSSAlgNParam *ap,
   const NSSOID *algorithm,
   NSSParameters *params,
   NSSItem *encodedParams,
@@ -913,37 +913,37 @@ set_cryptoki_mechanism (
     return PR_SUCCESS;
 }
 
-static NSSAlgorithmAndParameters *
+static NSSAlgNParam *
 create_algparam (
   NSSArena *arenaOpt,
   nssArenaMark **mark
 )
 {
     NSSArena *arena;
-    NSSAlgorithmAndParameters *rvAP = NULL;
+    NSSAlgNParam *rvAP = NULL;
     PRBool i_allocated_arena = PR_FALSE;
 
     if (arenaOpt) {
 	arena = arenaOpt;
 	*mark = nssArena_Mark(arena);
 	if (!*mark) {
-	    return (NSSAlgorithmAndParameters *)NULL;
+	    return (NSSAlgNParam *)NULL;
 	}
     } else {
 	arena = nssArena_Create();
 	if (!arena) {
-	    return (NSSAlgorithmAndParameters *)NULL;
+	    return (NSSAlgNParam *)NULL;
 	}
 	i_allocated_arena = PR_TRUE;
     }
-    rvAP = nss_ZNEW(arena, NSSAlgorithmAndParameters);
+    rvAP = nss_ZNEW(arena, NSSAlgNParam);
     if (!rvAP) {
 	if (*mark) {
 	    nssArena_Release(arena, *mark);
 	} else {
 	    nssArena_Destroy(arena);
 	}
-	return (NSSAlgorithmAndParameters *)NULL;
+	return (NSSAlgNParam *)NULL;
     }
     rvAP->arena = arena;
     rvAP->set_template = null_settor; /* by default */
@@ -951,9 +951,9 @@ create_algparam (
     return rvAP;
 }
 
-static NSSAlgorithmAndParameters *
+static NSSAlgNParam *
 finish_create_algparam (
-  NSSAlgorithmAndParameters *ap,
+  NSSAlgNParam *ap,
   NSSArena *arena,
   nssArenaMark *mark,
   PRStatus isOK
@@ -969,13 +969,13 @@ finish_create_algparam (
 	} else {
 	    nssArena_Destroy(arena);
 	}
-	ap = (NSSAlgorithmAndParameters *)NULL;
+	ap = (NSSAlgNParam *)NULL;
     }
     return ap;
 }
 
-NSS_IMPLEMENT NSSAlgorithmAndParameters *
-nssAlgorithmAndParameters_Create (
+NSS_IMPLEMENT NSSAlgNParam *
+nssAlgNParam_Create (
   NSSArena *arenaOpt,
   const NSSOID *algorithm,
   NSSParameters *parametersOpt
@@ -983,11 +983,11 @@ nssAlgorithmAndParameters_Create (
 {
     PRStatus status;
     nssArenaMark *mark = NULL;
-    NSSAlgorithmAndParameters *rvAP = NULL;
+    NSSAlgNParam *rvAP = NULL;
 
     rvAP = create_algparam(arenaOpt, &mark);
     if (!rvAP) {
-	return (NSSAlgorithmAndParameters *)NULL;
+	return (NSSAlgNParam *)NULL;
     }
 
     status = set_cryptoki_mechanism(rvAP, algorithm, 
@@ -997,8 +997,8 @@ nssAlgorithmAndParameters_Create (
     return finish_create_algparam(rvAP, rvAP->arena, mark, status);
 }
 
-NSS_IMPLEMENT NSSAlgorithmAndParameters *
-nssAlgorithmAndParameters_CreateForKeyGen (
+NSS_IMPLEMENT NSSAlgNParam *
+nssAlgNParam_CreateForKeyGen (
   NSSArena *arenaOpt,
   const NSSOID *algorithm,
   NSSParameters *parametersOpt
@@ -1006,11 +1006,11 @@ nssAlgorithmAndParameters_CreateForKeyGen (
 {
     PRStatus status;
     nssArenaMark *mark = NULL;
-    NSSAlgorithmAndParameters *rvAP = NULL;
+    NSSAlgNParam *rvAP = NULL;
 
     rvAP = create_algparam(arenaOpt, &mark);
     if (!rvAP) {
-	return (NSSAlgorithmAndParameters *)NULL;
+	return (NSSAlgNParam *)NULL;
     }
 
     status = set_cryptoki_mechanism(rvAP, algorithm, 
@@ -1034,15 +1034,15 @@ const NSSASN1Template nssASN1Template_AlgorithmID[] =
  { 0 }
 };
 
-NSS_IMPLEMENT NSSAlgorithmAndParameters *
-nssAlgorithmAndParameters_Decode (
+NSS_IMPLEMENT NSSAlgNParam *
+nssAlgNParam_Decode (
   NSSArena *arenaOpt,
   NSSBER *algIDber
 )
 {
     PRStatus status;
     nssArenaMark *mark = NULL;
-    NSSAlgorithmAndParameters *rvAP = NULL;
+    NSSAlgNParam *rvAP = NULL;
     NSSOID *alg;
     nssAlgorithmID algID;
     NSSItem *params;
@@ -1051,7 +1051,7 @@ nssAlgorithmAndParameters_Decode (
 
     rvAP = create_algparam(arenaOpt, &mark);
     if (!rvAP) {
-	return (NSSAlgorithmAndParameters *)NULL;
+	return (NSSAlgNParam *)NULL;
     }
 
     status = nssASN1_DecodeBER(rvAP->arena, &algID, 
@@ -1074,19 +1074,19 @@ finish:
     return finish_create_algparam(rvAP, rvAP->arena, mark, status);
 }
 
-NSS_IMPLEMENT NSSAlgorithmAndParameters *
-NSSAlgorithmAndParameters_Decode (
+NSS_IMPLEMENT NSSAlgNParam *
+NSSAlgNParam_Decode (
   NSSBER *algIDber,
   NSSArena *arenaOpt
 )
 {
 /* XXX turn this around */
-    return nssAlgorithmAndParameters_Decode(arenaOpt, algIDber);
+    return nssAlgNParam_Decode(arenaOpt, algIDber);
 }
 
 NSS_IMPLEMENT NSSBER *
-nssAlgorithmAndParameters_Encode (
-  NSSAlgorithmAndParameters *ap,
+nssAlgNParam_Encode (
+  NSSAlgNParam *ap,
   NSSBER *rvOpt,
   NSSArena *arenaOpt
 )
@@ -1115,28 +1115,28 @@ nssAlgorithmAndParameters_Encode (
 }
 
 NSS_IMPLEMENT NSSBER *
-NSSAlgorithmAndParameters_Encode (
-  NSSAlgorithmAndParameters *ap,
+NSSAlgNParam_Encode (
+  NSSAlgNParam *ap,
   NSSBER *rvOpt,
   NSSArena *arenaOpt
 )
 {
-    return nssAlgorithmAndParameters_Encode(ap, rvOpt, arenaOpt);
+    return nssAlgNParam_Encode(ap, rvOpt, arenaOpt);
 }
 
-NSS_IMPLEMENT NSSAlgorithmAndParameters *
-nssAlgorithmAndParameters_CreateSSLSessionKeyDerivation (
+NSS_IMPLEMENT NSSAlgNParam *
+nssAlgNParam_CreateSSLSessionKeyDerivation (
   NSSArena *arenaOpt,
   NSSSSLSessionKeyParameters *parameters
 )
 {
     PRStatus status;
     nssArenaMark *mark = NULL;
-    NSSAlgorithmAndParameters *rvAP = NULL;
+    NSSAlgNParam *rvAP = NULL;
 
     rvAP = create_algparam(arenaOpt, &mark);
     if (!rvAP) {
-	return (NSSAlgorithmAndParameters *)NULL;
+	return (NSSAlgNParam *)NULL;
     }
 
     status = set_sslsession_derive_mechanism(&rvAP->mechanism,
@@ -1147,8 +1147,8 @@ nssAlgorithmAndParameters_CreateSSLSessionKeyDerivation (
 }
 
 NSS_IMPLEMENT void
-nssAlgorithmAndParameters_Destroy (
-  NSSAlgorithmAndParameters *ap
+nssAlgNParam_Destroy (
+  NSSAlgNParam *ap
 )
 {
     if (ap && ap->i_allocated_arena) {
@@ -1157,18 +1157,18 @@ nssAlgorithmAndParameters_Destroy (
 }
 
 NSS_IMPLEMENT CK_MECHANISM_PTR
-nssAlgorithmAndParameters_GetMechanism (
-  const NSSAlgorithmAndParameters *ap
+nssAlgNParam_GetMechanism (
+  const NSSAlgNParam *ap
 )
 {
-    return &((NSSAlgorithmAndParameters *)ap)->mechanism;
+    return &((NSSAlgNParam *)ap)->mechanism;
 }
 
 #if 0
 This alternative does not break const-ness.
 NSS_IMPLEMENT void
-nssAlgorithmAndParameters_GetMechanism2 (
-  const NSSAlgorithmAndParameters *ap,
+nssAlgNParam_GetMechanism2 (
+  const NSSAlgNParam *ap,
   CK_MECHANISM_PTR pMechanism
 )
 {
@@ -1177,8 +1177,8 @@ nssAlgorithmAndParameters_GetMechanism2 (
 #endif
 
 NSS_IMPLEMENT PRIntn
-nssAlgorithmAndParameters_SetTemplateValues (
-  const NSSAlgorithmAndParameters *ap,
+nssAlgNParam_SetTemplateValues (
+  const NSSAlgNParam *ap,
   CK_ATTRIBUTE_PTR aTemplate,
   CK_ULONG templateSize
 )
@@ -1188,8 +1188,8 @@ nssAlgorithmAndParameters_SetTemplateValues (
 
 static PRStatus
 copy_algparam (
-  NSSAlgorithmAndParameters *copy,
-  const NSSAlgorithmAndParameters *orig
+  NSSAlgNParam *copy,
+  const NSSAlgNParam *orig
 )
 {
     copy->mechanism.mechanism = orig->mechanism.mechanism;
@@ -1205,19 +1205,19 @@ copy_algparam (
     return PR_SUCCESS;
 }
 
-NSS_IMPLEMENT NSSAlgorithmAndParameters *
-nssAlgorithmAndParameters_Clone (
-  const NSSAlgorithmAndParameters *ap,
+NSS_IMPLEMENT NSSAlgNParam *
+nssAlgNParam_Clone (
+  const NSSAlgNParam *ap,
   NSSArena *arenaOpt
 )
 {
     PRStatus status;
     nssArenaMark *mark = NULL;
-    NSSAlgorithmAndParameters *rvAP = NULL;
+    NSSAlgNParam *rvAP = NULL;
 
     rvAP = create_algparam(arenaOpt, &mark);
     if (!rvAP) {
-	return (NSSAlgorithmAndParameters *)NULL;
+	return (NSSAlgNParam *)NULL;
     }
 
     status = copy_algparam(rvAP, ap);
@@ -1226,19 +1226,19 @@ nssAlgorithmAndParameters_Clone (
 }
 
 NSS_IMPLEMENT const NSSOID *
-nssAlgorithmAndParameters_GetAlgorithm (
-  const NSSAlgorithmAndParameters *ap
+nssAlgNParam_GetAlgorithm (
+  const NSSAlgNParam *ap
 )
 {
     return ap->alg;
 }
 
 NSS_IMPLEMENT const NSSOID *
-NSSAlgorithmAndParameters_GetAlgorithm (
-  const NSSAlgorithmAndParameters *ap
+NSSAlgNParam_GetAlgorithm (
+  const NSSAlgNParam *ap
 )
 {
-    return nssAlgorithmAndParameters_GetAlgorithm(ap);
+    return nssAlgNParam_GetAlgorithm(ap);
 }
 
 
@@ -1246,9 +1246,9 @@ NSSAlgorithmAndParameters_GetAlgorithm (
  * convert a PBE mechanism used to generate a key to a crypto mechanism
  * that can use the key
  */
-NSS_IMPLEMENT NSSAlgorithmAndParameters *
-nssAlgorithmAndParameters_ConvertPBEToCrypto (
-  const NSSAlgorithmAndParameters *ap,
+NSS_IMPLEMENT NSSAlgNParam *
+nssAlgNParam_ConvertPBEToCrypto (
+  const NSSAlgNParam *ap,
   PRBool usePadding
 )
 {
@@ -1256,11 +1256,11 @@ nssAlgorithmAndParameters_ConvertPBEToCrypto (
     CK_RC2_CBC_PARAMS_PTR rc2p;
     CK_PBE_PARAMS_PTR pPBE;
     CK_MECHANISM_PTR mech;
-    NSSAlgorithmAndParameters *rvAP = NULL;
+    NSSAlgNParam *rvAP = NULL;
 
     rvAP = create_algparam(NULL, NULL);
     if (!rvAP) {
-	return (NSSAlgorithmAndParameters *)NULL;
+	return (NSSAlgNParam *)NULL;
     }
     mech = &rvAP->mechanism;
     pPBE = (CK_PBE_PARAMS_PTR)ap->mechanism.pParameter;
@@ -1319,10 +1319,10 @@ nssAlgorithmAndParameters_ConvertPBEToCrypto (
 }
 
 NSS_IMPLEMENT void
-NSSAlgorithmAndParameters_Destroy (
-  NSSAlgorithmAndParameters *ap
+NSSAlgNParam_Destroy (
+  NSSAlgNParam *ap
 )
 {
-    nssAlgorithmAndParameters_Destroy(ap);
+    nssAlgNParam_Destroy(ap);
 }
 
diff --git a/security/nss/lib/dev/dev.h b/security/nss/lib/dev/dev.h
index 7d5c15c35..20b2a7e09 100644
--- a/security/nss/lib/dev/dev.h
+++ b/security/nss/lib/dev/dev.h
@@ -389,7 +389,7 @@ nssToken_IsReadOnly (
 NSS_EXTERN PRBool
 nssToken_DoesAlgorithm (
   NSSToken *token,
-  const NSSAlgorithmAndParameters *ap
+  const NSSAlgNParam *ap
 );
 
 NSS_EXTERN nssSession *
@@ -553,7 +553,7 @@ NSS_EXTERN PRStatus
 nssToken_GenerateKeyPair (
   NSSToken *tok,
   nssSession *session,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   PRBool asTokenObjects,
   const NSSUTF8 *labelOpt,
   NSSProperties properties,
@@ -597,7 +597,7 @@ NSS_EXTERN nssCryptokiObject *
 nssToken_GenerateSymmetricKey (
   NSSToken *token,
   nssSession *session,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   PRUint32 keysize,
   const NSSUTF8 *labelOpt,
   PRBool asTokenObject,
@@ -609,7 +609,7 @@ NSS_EXTERN nssCryptokiObject *
 nssToken_UnwrapPrivateKey (
   NSSToken *token,
   nssSession *session,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   nssCryptokiObject *wrappingKey,
   NSSItem *wrappedKey,
   PRBool asTokenObject,
@@ -622,7 +622,7 @@ NSS_IMPLEMENT nssCryptokiObject *
 nssToken_UnwrapSymmetricKey (
   NSSToken *token,
   nssSession *session,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   nssCryptokiObject *wrappingKey,
   NSSItem *wrappedKey,
   PRBool asTokenObject,
@@ -635,7 +635,7 @@ NSS_EXTERN NSSItem *
 nssToken_WrapKey (
   NSSToken *token,
   nssSession *session,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   nssCryptokiObject *wrappingKey,
   nssCryptokiObject *targetKey,
   NSSItem *rvOpt,
@@ -646,7 +646,7 @@ NSS_EXTERN nssCryptokiObject *
 nssToken_DeriveKey (
   NSSToken *token,
   nssSession *session,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   nssCryptokiObject *baseKey,
   PRBool asTokenObject,
   NSSOperations operations,
@@ -664,7 +664,7 @@ NSS_EXTERN PRStatus
 nssToken_DeriveSSLSessionKeys (
   NSSToken *token,
   nssSession *session,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   nssCryptokiObject *masterSecret,
   NSSSymmetricKeyType bulkKeyType,
   NSSOperations operations,
@@ -691,7 +691,7 @@ NSS_EXTERN NSSItem *
 nssToken_Encrypt (
   NSSToken *tok,
   nssSession *session,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   nssCryptokiObject *key,
   NSSItem *data,
   NSSItem *rvOpt,
@@ -702,7 +702,7 @@ NSS_EXTERN PRStatus
 nssToken_BeginEncrypt (
   NSSToken *token,
   nssSession *session,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   nssCryptokiObject *key
 );
 
@@ -727,7 +727,7 @@ NSS_EXTERN NSSItem *
 nssToken_Decrypt (
   NSSToken *tok,
   nssSession *session,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   nssCryptokiObject *key,
   NSSItem *data,
   NSSItem *rvOpt,
@@ -738,7 +738,7 @@ NSS_EXTERN PRStatus
 nssToken_BeginDecrypt (
   NSSToken *token,
   nssSession *session,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   nssCryptokiObject *key
 );
 
@@ -763,7 +763,7 @@ NSS_EXTERN NSSItem *
 nssToken_Sign (
   NSSToken *token,
   nssSession *session,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   nssCryptokiObject *key,
   NSSItem *data,
   NSSItem *rvOpt,
@@ -774,7 +774,7 @@ NSS_EXTERN PRStatus
 nssToken_BeginSign (
   NSSToken *token,
   nssSession *session,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   nssCryptokiObject *key
 );
 
@@ -797,7 +797,7 @@ NSS_EXTERN NSSItem *
 nssToken_SignRecover (
   NSSToken *tok,
   nssSession *session,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   nssCryptokiObject *key,
   NSSItem *data,
   NSSItem *rvOpt,
@@ -809,7 +809,7 @@ NSS_EXTERN PRStatus
 nssToken_Verify (
   NSSToken *token,
   nssSession *session,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   nssCryptokiObject *key,
   NSSItem *data,
   NSSItem *signature
@@ -819,7 +819,7 @@ NSS_EXTERN PRStatus
 nssToken_BeginVerify (
   NSSToken *token,
   nssSession *session,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   nssCryptokiObject *key
 );
 
@@ -841,7 +841,7 @@ NSS_EXTERN NSSItem *
 nssToken_VerifyRecover (
   NSSToken *tok,
   nssSession *session,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   nssCryptokiObject *key,
   NSSItem *signature,
   NSSItem *rvOpt,
@@ -852,7 +852,7 @@ NSS_EXTERN NSSItem *
 nssToken_Digest (
   NSSToken *tok,
   nssSession *session,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSItem *data,
   NSSItem *rvOpt,
   NSSArena *arenaOpt
@@ -862,7 +862,7 @@ NSS_EXTERN PRStatus
 nssToken_BeginDigest (
   NSSToken *tok,
   nssSession *session,
-  const NSSAlgorithmAndParameters *ap
+  const NSSAlgNParam *ap
 );
 
 NSS_EXTERN PRStatus
@@ -881,64 +881,64 @@ nssToken_FinishDigest (
 );
 
 /*
- * NSSAlgorithmAndParameters
+ * NSSAlgNParam
  */
 
-NSS_EXTERN NSSAlgorithmAndParameters *
-nssAlgorithmAndParameters_Create (
+NSS_EXTERN NSSAlgNParam *
+nssAlgNParam_Create (
   NSSArena *arenaOpt,
   const NSSOID *algorithm,
   NSSParameters *parametersOpt
 );
 
-NSS_EXTERN NSSAlgorithmAndParameters *
-nssAlgorithmAndParameters_CreateForKeyGen (
+NSS_EXTERN NSSAlgNParam *
+nssAlgNParam_CreateForKeyGen (
   NSSArena *arenaOpt,
   const NSSOID *algorithm,
   NSSParameters *parametersOpt
 );
 
-NSS_EXTERN NSSAlgorithmAndParameters *
-nssAlgorithmAndParameters_Decode (
+NSS_EXTERN NSSAlgNParam *
+nssAlgNParam_Decode (
   NSSArena *arenaOpt,
   NSSBER *algIDber
 );
 
 /* devf.h? */
-NSS_EXTERN NSSAlgorithmAndParameters *
-nssAlgorithmAndParameters_CreateSSLSessionKeyDerivation (
+NSS_EXTERN NSSAlgNParam *
+nssAlgNParam_CreateSSLSessionKeyDerivation (
   NSSArena *arenaOpt,
   NSSSSLSessionKeyParameters *parameters
 );
 
-NSS_EXTERN NSSAlgorithmAndParameters *
-nssAlgorithmAndParameters_Clone (
-  const NSSAlgorithmAndParameters *ap,
+NSS_EXTERN NSSAlgNParam *
+nssAlgNParam_Clone (
+  const NSSAlgNParam *ap,
   NSSArena *arenaOpt
 );
 
 NSS_EXTERN NSSBER *
-nssAlgorithmAndParameters_Encode (
-  NSSAlgorithmAndParameters *ap,
+nssAlgNParam_Encode (
+  NSSAlgNParam *ap,
   NSSBER *rvOpt,
   NSSArena *arenaOpt
 );
 
-NSS_EXTERN NSSAlgorithmAndParameters *
-nssAlgorithmAndParameters_ConvertPBEToCrypto (
-  const NSSAlgorithmAndParameters *ap,
+NSS_EXTERN NSSAlgNParam *
+nssAlgNParam_ConvertPBEToCrypto (
+  const NSSAlgNParam *ap,
   PRBool usePadding
 );
 
 NSS_EXTERN PRStatus
-nssAlgorithmAndParameters_SetPBEPassword (
-  NSSAlgorithmAndParameters *ap,
+nssAlgNParam_SetPBEPassword (
+  NSSAlgNParam *ap,
   NSSUTF8 *password
 );
 
 NSS_EXTERN void
-nssAlgorithmAndParameters_Destroy (
-  NSSAlgorithmAndParameters *ap
+nssAlgNParam_Destroy (
+  NSSAlgNParam *ap
 );
 
 /* nssSession
@@ -1167,7 +1167,7 @@ nssCryptokiObjectArray_Destroy (
  * nssSlotList_FindSlotByName
  * nssSlotList_FindTokenByName
  * nssSlotList_GetBestSlot
- * nssSlotList_GetBestSlotForAlgorithmAndParameters
+ * nssSlotList_GetBestSlotForAlgNParam
  * nssSlotList_GetBestSlotForAlgorithmsAndParameters
  */
 
@@ -1241,14 +1241,14 @@ nssSlotList_GetBestSlot (
   nssSlotList *slotList
 );
 
-/* nssSlotList_GetBestSlotForAlgorithmAndParameters
+/* nssSlotList_GetBestSlotForAlgNParam
  *
  * Highest-ranking slot than can handle algorithm/parameters.
  */
 NSS_EXTERN NSSSlot *
-nssSlotList_GetBestSlotForAlgorithmAndParameters (
+nssSlotList_GetBestSlotForAlgNParam (
   nssSlotList *slotList,
-  NSSAlgorithmAndParameters *ap
+  NSSAlgNParam *ap
 );
 
 /* nssSlotList_GetBestSlotForAlgorithmsAndParameters
@@ -1258,13 +1258,13 @@ nssSlotList_GetBestSlotForAlgorithmAndParameters (
 NSS_EXTERN NSSSlot *
 nssSlotList_GetBestSlotForAlgorithmsAndParameters (
   nssSlotList *slotList,
-  NSSAlgorithmAndParameters **ap
+  NSSAlgNParam **ap
 );
 
 NSS_EXTERN NSSToken *
 nssSlotList_GetBestTokenForAlgorithm (
   nssSlotList *slotList,
-  const NSSAlgorithmAndParameters *ap
+  const NSSAlgNParam *ap
 );
 
 NSS_EXTERN PRStatus
diff --git a/security/nss/lib/dev/devm.h b/security/nss/lib/dev/devm.h
index 644e4a85e..af39f0ad5 100644
--- a/security/nss/lib/dev/devm.h
+++ b/security/nss/lib/dev/devm.h
@@ -138,13 +138,13 @@ nssCryptokiObject_Create (
 );
 
 NSS_EXTERN CK_MECHANISM_PTR
-nssAlgorithmAndParameters_GetMechanism (
-  const NSSAlgorithmAndParameters *ap
+nssAlgNParam_GetMechanism (
+  const NSSAlgNParam *ap
 );
 
 NSS_EXTERN PRIntn
-nssAlgorithmAndParameters_SetTemplateValues (
-  const NSSAlgorithmAndParameters *ap,
+nssAlgNParam_SetTemplateValues (
+  const NSSAlgNParam *ap,
   CK_ATTRIBUTE_PTR aTemplate,
   CK_ULONG templateSize
 );
diff --git a/security/nss/lib/dev/devtoken.c b/security/nss/lib/dev/devtoken.c
index 5d7ad62b9..c687668f4 100644
--- a/security/nss/lib/dev/devtoken.c
+++ b/security/nss/lib/dev/devtoken.c
@@ -327,11 +327,11 @@ nssToken_IsReadOnly (
 NSS_IMPLEMENT PRBool
 nssToken_DoesAlgorithm (
   NSSToken *token,
-  const NSSAlgorithmAndParameters *ap
+  const NSSAlgNParam *ap
 )
 {
     CK_ULONG ul;
-    CK_MECHANISM_PTR pMech = nssAlgorithmAndParameters_GetMechanism(ap);
+    CK_MECHANISM_PTR pMech = nssAlgNParam_GetMechanism(ap);
     for (ul = 0; ul < token->numMechanisms; ul++) {
 	if (pMech->mechanism == token->mechanisms[ul]) {
 	    return PR_TRUE;
@@ -1501,7 +1501,7 @@ NSS_IMPLEMENT PRStatus
 nssToken_GenerateKeyPair (
   NSSToken *token,
   nssSession *session,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   PRBool asTokenObjects,
   const NSSUTF8 *labelOpt,
   NSSProperties properties,
@@ -1522,7 +1522,7 @@ nssToken_GenerateKeyPair (
     PRUint32 numBK = sizeof(bk_template) / sizeof(bk_template[0]);
     PRUint32 numVK = sizeof(vk_template) / sizeof(vk_template[0]);
 
-    mechanism = nssAlgorithmAndParameters_GetMechanism(ap);
+    mechanism = nssAlgNParam_GetMechanism(ap);
 
     /*
      * Construct the public key template
@@ -1548,7 +1548,7 @@ nssToken_GenerateKeyPair (
     }
     /* Set algorithm-dependent values in the template */
     numLeft = numBK - (attr - bk_template);
-    attr += nssAlgorithmAndParameters_SetTemplateValues(ap, attr, numLeft);
+    attr += nssAlgNParam_SetTemplateValues(ap, attr, numLeft);
     NSS_CK_TEMPLATE_FINISH(bk_template, attr, btsize);
 
     /*
@@ -1577,7 +1577,7 @@ nssToken_GenerateKeyPair (
 #if 0
     /* XXX */
     if (mechanism->mechanism == CKM_DH_PKCS_KEY_PAIR_GEN) {
-	nssDHParameters *dhp = nssAlgorithmAndParameters_GetDHParams(ap);
+	nssDHParameters *dhp = nssAlgNParam_GetDHParams(ap);
 	NSS_CK_SET_ATTRIBUTE_VAR(attr, CKA_VALUE_BITS, dhp->valueBits);
     }
 #endif
@@ -1613,7 +1613,7 @@ NSS_IMPLEMENT nssCryptokiObject *
 nssToken_GenerateSymmetricKey (
   NSSToken *token,
   nssSession *session,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   PRUint32 keysize,
   const NSSUTF8 *labelOpt,
   PRBool asTokenObject,
@@ -1659,7 +1659,7 @@ nssToken_GenerateSymmetricKey (
     NSS_CK_TEMPLATE_FINISH(keyTemplate, attr, tsize);
 
     /* Generate the key */
-    mechanism = nssAlgorithmAndParameters_GetMechanism(ap);
+    mechanism = nssAlgNParam_GetMechanism(ap);
 
     nssSession_EnterMonitor(session);
     ckrv = CKAPI(epv)->C_GenerateKey(session->handle, mechanism, 
@@ -1697,7 +1697,7 @@ static nssCryptokiObject *
 unwrap_key (
   NSSToken *token,
   nssSession *session,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   nssCryptokiObject *wrappingKey,
   NSSItem *wrappedKey,
   PRBool asTokenObject,
@@ -1718,7 +1718,7 @@ unwrap_key (
     PRUint32 numLeft;
     PRUint32 numkt = sizeof(keyTemplate) / sizeof(keyTemplate[0]);
 
-    mechanism = nssAlgorithmAndParameters_GetMechanism(ap);
+    mechanism = nssAlgNParam_GetMechanism(ap);
 
     /* set up the key template */
     NSS_CK_TEMPLATE_START(keyTemplate, attr, ktSize);
@@ -1759,7 +1759,7 @@ NSS_IMPLEMENT nssCryptokiObject *
 nssToken_UnwrapPrivateKey (
   NSSToken *token,
   nssSession *session,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   nssCryptokiObject *wrappingKey,
   NSSItem *wrappedKey,
   PRBool asTokenObject,
@@ -1778,7 +1778,7 @@ NSS_IMPLEMENT nssCryptokiObject *
 nssToken_UnwrapSymmetricKey (
   NSSToken *token,
   nssSession *session,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   nssCryptokiObject *wrappingKey,
   NSSItem *wrappedKey,
   PRBool asTokenObject,
@@ -1797,7 +1797,7 @@ NSS_IMPLEMENT NSSItem *
 nssToken_WrapKey (
   NSSToken *token,
   nssSession *session,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   nssCryptokiObject *wrappingKey,
   nssCryptokiObject *targetKey,
   NSSItem *rvOpt,
@@ -1811,7 +1811,7 @@ nssToken_WrapKey (
     nssArenaMark *mark = NULL;
     PRBool freeit = PR_FALSE;
 
-    mechanism = nssAlgorithmAndParameters_GetMechanism(ap);
+    mechanism = nssAlgNParam_GetMechanism(ap);
 
     nssSession_EnterMonitor(session);
     /* Get the length of the output buffer */
@@ -1865,7 +1865,7 @@ NSS_IMPLEMENT nssCryptokiObject *
 nssToken_DeriveKey (
   NSSToken *token,
   nssSession *session,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   nssCryptokiObject *baseKey,
   PRBool asTokenObject,
   NSSOperations operations,
@@ -1883,7 +1883,7 @@ nssToken_DeriveKey (
     PRUint32 numLeft;
     PRUint32 numkt = sizeof(keyTemplate) / sizeof(keyTemplate[0]);
 
-    mechanism = nssAlgorithmAndParameters_GetMechanism(ap);
+    mechanism = nssAlgNParam_GetMechanism(ap);
 
     /* set up the key template */
     NSS_CK_TEMPLATE_START(keyTemplate, attr, ktSize);
@@ -1922,7 +1922,7 @@ NSS_IMPLEMENT PRStatus
 nssToken_DeriveSSLSessionKeys (
   NSSToken *token,
   nssSession *session,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   nssCryptokiObject *masterSecret,
   NSSSymmetricKeyType bulkKeyType,
   NSSOperations operations,
@@ -1942,7 +1942,7 @@ nssToken_DeriveSSLSessionKeys (
     PRUint32 numLeft;
     PRUint32 numkt = sizeof(keyTemplate) / sizeof(keyTemplate[0]);
 
-    mechanism = nssAlgorithmAndParameters_GetMechanism(ap);
+    mechanism = nssAlgNParam_GetMechanism(ap);
 
     /* set up the key template */
     NSS_CK_TEMPLATE_START(keyTemplate, attr, ktSize);
@@ -2013,7 +2013,7 @@ NSS_IMPLEMENT NSSItem *
 nssToken_Encrypt (
   NSSToken *tok,
   nssSession *session,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   nssCryptokiObject *key,
   NSSItem *data,
   NSSItem *rvOpt,
@@ -2027,7 +2027,7 @@ nssToken_Encrypt (
     nssArenaMark *mark = NULL;
     PRBool freeit = PR_FALSE;
 
-    mechanism = nssAlgorithmAndParameters_GetMechanism(ap);
+    mechanism = nssAlgNParam_GetMechanism(ap);
 
     nssSession_EnterMonitor(session);
     ckrv = CKAPI(epv)->C_EncryptInit(session->handle, mechanism, key->handle);
@@ -2080,7 +2080,7 @@ NSS_IMPLEMENT PRStatus
 nssToken_BeginEncrypt (
   NSSToken *token,
   nssSession *session,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   nssCryptokiObject *key
 )
 {
@@ -2088,7 +2088,7 @@ nssToken_BeginEncrypt (
     CK_MECHANISM_PTR mechanism;
     void *epv = nssToken_GetCryptokiEPV(token);
 
-    mechanism = nssAlgorithmAndParameters_GetMechanism(ap);
+    mechanism = nssAlgNParam_GetMechanism(ap);
     nssSession_EnterMonitor(session);
     ckrv = CKAPI(epv)->C_EncryptInit(session->handle, mechanism, key->handle);
     nssSession_ExitMonitor(session);
@@ -2181,7 +2181,7 @@ NSS_IMPLEMENT NSSItem *
 nssToken_Decrypt (
   NSSToken *tok,
   nssSession *session,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   nssCryptokiObject *key,
   NSSItem *data,
   NSSItem *rvOpt,
@@ -2195,7 +2195,7 @@ nssToken_Decrypt (
     nssArenaMark *mark = NULL;
     PRBool freeit = PR_FALSE;
 
-    mechanism = nssAlgorithmAndParameters_GetMechanism(ap);
+    mechanism = nssAlgNParam_GetMechanism(ap);
 
     nssSession_EnterMonitor(session);
     ckrv = CKAPI(epv)->C_DecryptInit(session->handle, mechanism, key->handle);
@@ -2248,7 +2248,7 @@ NSS_IMPLEMENT PRStatus
 nssToken_BeginDecrypt (
   NSSToken *token,
   nssSession *session,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   nssCryptokiObject *key
 )
 {
@@ -2256,7 +2256,7 @@ nssToken_BeginDecrypt (
     CK_MECHANISM_PTR mechanism;
     void *epv = nssToken_GetCryptokiEPV(token);
 
-    mechanism = nssAlgorithmAndParameters_GetMechanism(ap);
+    mechanism = nssAlgNParam_GetMechanism(ap);
     nssSession_EnterMonitor(session);
     ckrv = CKAPI(epv)->C_DecryptInit(session->handle, mechanism, key->handle);
     nssSession_ExitMonitor(session);
@@ -2349,7 +2349,7 @@ NSS_IMPLEMENT NSSItem *
 nssToken_Sign (
   NSSToken *token,
   nssSession *session,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   nssCryptokiObject *key,
   NSSItem *data,
   NSSItem *rvOpt,
@@ -2363,7 +2363,7 @@ nssToken_Sign (
     nssArenaMark *mark = NULL;
     PRBool freeit = PR_FALSE;
 
-    mechanism = nssAlgorithmAndParameters_GetMechanism(ap);
+    mechanism = nssAlgNParam_GetMechanism(ap);
 
     nssSession_EnterMonitor(session);
     ckrv = CKAPI(epv)->C_SignInit(session->handle, mechanism, key->handle);
@@ -2416,7 +2416,7 @@ NSS_IMPLEMENT PRStatus
 nssToken_BeginSign (
   NSSToken *token,
   nssSession *session,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   nssCryptokiObject *key
 )
 {
@@ -2424,7 +2424,7 @@ nssToken_BeginSign (
     CK_MECHANISM_PTR mechanism;
     void *epv = nssToken_GetCryptokiEPV(token);
 
-    mechanism = nssAlgorithmAndParameters_GetMechanism(ap);
+    mechanism = nssAlgNParam_GetMechanism(ap);
     nssSession_EnterMonitor(session);
     ckrv = CKAPI(epv)->C_SignInit(session->handle, mechanism, key->handle);
     nssSession_ExitMonitor(session);
@@ -2492,7 +2492,7 @@ NSS_IMPLEMENT NSSItem *
 nssToken_SignRecover (
   NSSToken *tok,
   nssSession *session,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   nssCryptokiObject *key,
   NSSItem *data,
   NSSItem *rvOpt,
@@ -2506,7 +2506,7 @@ nssToken_SignRecover (
     nssArenaMark *mark = NULL;
     PRBool freeit = PR_FALSE;
 
-    mechanism = nssAlgorithmAndParameters_GetMechanism(ap);
+    mechanism = nssAlgNParam_GetMechanism(ap);
 
     nssSession_EnterMonitor(session);
     ckrv = CKAPI(epv)->C_SignRecoverInit(session->handle, mechanism, 
@@ -2560,7 +2560,7 @@ NSS_IMPLEMENT PRStatus
 nssToken_Verify (
   NSSToken *token,
   nssSession *session,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   nssCryptokiObject *key,
   NSSItem *data,
   NSSItem *signature
@@ -2570,7 +2570,7 @@ nssToken_Verify (
     CK_MECHANISM_PTR mechanism;
     void *epv = nssToken_GetCryptokiEPV(token);
 
-    mechanism = nssAlgorithmAndParameters_GetMechanism(ap);
+    mechanism = nssAlgNParam_GetMechanism(ap);
 
     nssSession_EnterMonitor(session);
     ckrv = CKAPI(epv)->C_VerifyInit(session->handle, mechanism, key->handle);
@@ -2619,7 +2619,7 @@ NSS_IMPLEMENT PRStatus
 nssToken_BeginVerify (
   NSSToken *token,
   nssSession *session,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   nssCryptokiObject *key
 )
 {
@@ -2627,7 +2627,7 @@ nssToken_BeginVerify (
     CK_MECHANISM_PTR mechanism;
     void *epv = nssToken_GetCryptokiEPV(token);
 
-    mechanism = nssAlgorithmAndParameters_GetMechanism(ap);
+    mechanism = nssAlgNParam_GetMechanism(ap);
     nssSession_EnterMonitor(session);
     ckrv = CKAPI(epv)->C_VerifyInit(session->handle, mechanism, key->handle);
     nssSession_ExitMonitor(session);
@@ -2688,7 +2688,7 @@ NSS_IMPLEMENT NSSItem *
 nssToken_VerifyRecover (
   NSSToken *tok,
   nssSession *session,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   nssCryptokiObject *key,
   NSSItem *signature,
   NSSItem *rvOpt,
@@ -2702,7 +2702,7 @@ nssToken_VerifyRecover (
     nssArenaMark *mark = NULL;
     PRBool freeit = PR_FALSE;
 
-    mechanism = nssAlgorithmAndParameters_GetMechanism(ap);
+    mechanism = nssAlgNParam_GetMechanism(ap);
 
     nssSession_EnterMonitor(session);
     ckrv = CKAPI(epv)->C_VerifyRecoverInit(session->handle, mechanism, 
@@ -2756,7 +2756,7 @@ NSS_IMPLEMENT NSSItem *
 nssToken_Digest (
   NSSToken *tok,
   nssSession *session,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSItem *data,
   NSSItem *rvOpt,
   NSSArena *arenaOpt
@@ -2769,7 +2769,7 @@ nssToken_Digest (
     nssArenaMark *mark = NULL;
     PRBool freeit = PR_FALSE;
 
-    mechanism = nssAlgorithmAndParameters_GetMechanism(ap);
+    mechanism = nssAlgNParam_GetMechanism(ap);
 
     nssSession_EnterMonitor(session);
     ckrv = CKAPI(epv)->C_DigestInit(session->handle, mechanism);
@@ -2822,14 +2822,14 @@ NSS_IMPLEMENT PRStatus
 nssToken_BeginDigest (
   NSSToken *tok,
   nssSession *session,
-  const NSSAlgorithmAndParameters *ap
+  const NSSAlgNParam *ap
 )
 {
     CK_RV ckrv;
     CK_MECHANISM_PTR mechanism;
     void *epv = nssToken_GetCryptokiEPV(tok);
 
-    mechanism = nssAlgorithmAndParameters_GetMechanism(ap);
+    mechanism = nssAlgNParam_GetMechanism(ap);
     nssSession_EnterMonitor(session);
     ckrv = CKAPI(epv)->C_DigestInit(session->handle, mechanism);
     nssSession_ExitMonitor(session);
diff --git a/security/nss/lib/dev/devutil.c b/security/nss/lib/dev/devutil.c
index 591ecad61..bd23eee9d 100644
--- a/security/nss/lib/dev/devutil.c
+++ b/security/nss/lib/dev/devutil.c
@@ -494,7 +494,7 @@ nssSlotList_GetSlots (
 NSS_IMPLEMENT NSSToken *
 nssSlotList_GetBestTokenForAlgorithm (
   nssSlotList *slotList,
-  const NSSAlgorithmAndParameters *ap
+  const NSSAlgNParam *ap
 )
 {
     PRCList *link;
diff --git a/security/nss/lib/dev/nssdev.h b/security/nss/lib/dev/nssdev.h
index aee7aa2fb..00e292bfb 100644
--- a/security/nss/lib/dev/nssdev.h
+++ b/security/nss/lib/dev/nssdev.h
@@ -181,60 +181,60 @@ NSSToken_GetInfo (
   NSSTokenInfo *tokenInfo
 );
 
-/* NSSAlgorithmAndParameters
+/* NSSAlgNParam
  *
  * 
  */
 
 #if 0
-NSS_EXTERN NSSAlgorithmAndParameters *
-NSSAlgorithmAndParameters_CreateMAC (
+NSS_EXTERN NSSAlgNParam *
+NSSAlgNParam_CreateMAC (
   NSSArena *arenaOpt,
   NSSAlgorithmType blockCipher,
   NSSParameters *cipherParameters,
   PRUint32 macLength /* in bytes, 0 means maximum for block cipher */
 );
 
-NSS_EXTERN NSSAlgorithmAndParameters *
-NSSAlgorithmAndParameters_CreateHMAC (
+NSS_EXTERN NSSAlgNParam *
+NSSAlgNParam_CreateHMAC (
   NSSArena *arenaOpt,
   NSSAlgorithmType hashAlgorithm,
   PRUint32 hmacLength /* in bytes, 0 means maximum for hash algorithm */
 );
 
-/* NSSAlgorithmAndParameters_GetParameters
+/* NSSAlgNParam_GetParameters
  *
  * Return the parameters, properly encoded for the algorithm OID.  The
  * returned item must be freed.
  */
 NSS_EXTERN NSSItem *
-NSSAlgorithmAndParameters_GetParameters (
-  NSSAlgorithmAndParameters *ap
+NSSAlgNParam_GetParameters (
+  NSSAlgNParam *ap
 );
 #endif
 
-NSS_EXTERN NSSAlgorithmAndParameters *
-NSSAlgorithmAndParameters_Decode (
+NSS_EXTERN NSSAlgNParam *
+NSSAlgNParam_Decode (
   NSSBER *algIDber,
   NSSArena *arenaOpt
 );
 
-/* NSSAlgorithmAndParameters_Destroy
+/* NSSAlgNParam_Destroy
  *
  */
 NSS_EXTERN void
-NSSAlgorithmAndParameters_Destroy (
-  NSSAlgorithmAndParameters *ap
+NSSAlgNParam_Destroy (
+  NSSAlgNParam *ap
 );
 
 NSS_EXTERN const NSSOID *
-NSSAlgorithmAndParameters_GetAlgorithm (
-  const NSSAlgorithmAndParameters *ap
+NSSAlgNParam_GetAlgorithm (
+  const NSSAlgNParam *ap
 );
 
 NSS_EXTERN NSSBER *
-NSSAlgorithmAndParameters_Encode (
-  NSSAlgorithmAndParameters *ap,
+NSSAlgNParam_Encode (
+  NSSAlgNParam *ap,
   NSSBER *rvOpt,
   NSSArena *arenaOpt
 );
diff --git a/security/nss/lib/dev/nssdevt.h b/security/nss/lib/dev/nssdevt.h
index 27b02c3fa..a70a5f594 100644
--- a/security/nss/lib/dev/nssdevt.h
+++ b/security/nss/lib/dev/nssdevt.h
@@ -57,13 +57,13 @@ typedef struct NSSSlotStr NSSSlot;
 typedef struct NSSTokenStr NSSToken;
 
 /*
- * NSSAlgorithmAndParameters
+ * NSSAlgNParam
  *
  * Algorithm is an OID
  * Parameters depend on the algorithm
  */
 
-typedef struct NSSAlgorithmAndParametersStr NSSAlgorithmAndParameters;
+typedef struct NSSAlgNParamStr NSSAlgNParam;
 
 /*
  * NSSCallback
diff --git a/security/nss/lib/nss/nss.def b/security/nss/lib/nss/nss.def
index 294dbb21f..2f1197dc8 100644
--- a/security/nss/lib/nss/nss.def
+++ b/security/nss/lib/nss/nss.def
@@ -80,8 +80,8 @@ NSSBase64Encoder_Destroy;
 NSSBase64_EncodeItem;
 NSSOID_Create;
 NSSOID_CreateFromTag;
-NSSOID_CreateAlgorithmAndParameters;
-NSSOID_CreateAlgorithmAndParametersForKeyGen;
+NSSOID_CreateAlgNParam;
+NSSOID_CreateAlgNParamForKeyGen;
 NSSOID_IsTag;
 NSSTime_Now;
 NSSTime_CreateFromUTCTime;
@@ -96,10 +96,10 @@ NSSSlot_SetPassword;
 NSSToken_Destroy;
 NSSToken_GetInfo;
 NSSToken_GetSlot;
-NSSAlgorithmAndParameters_Encode;
-NSSAlgorithmAndParameters_Decode;
-NSSAlgorithmAndParameters_Destroy;
-NSSAlgorithmAndParameters_GetAlgorithm;
+NSSAlgNParam_Encode;
+NSSAlgNParam_Decode;
+NSSAlgNParam_Destroy;
+NSSAlgNParam_GetAlgorithm;
 NSSCertificate_Destroy;
 NSSCertificate_DeleteStoredObject;
 NSSCertificate_Validate;
@@ -233,7 +233,7 @@ NSSTrustDomain_GenerateSymmetricKey;
 ;+#NSSTrustDomain_FindSymmetricKeyByAlgorithmAndKeyID;
 NSSTrustDomain_CreateCryptoContext;
 ;+#NSSTrustDomain_CreateCryptoContextForAlgorithm;
-;+#NSSTrustDomain_CreateCryptoContextForAlgorithmAndParameters;
+;+#NSSTrustDomain_CreateCryptoContextForAlgNParam;
 NSSTrustDomain_CreateVolatileDomain;
 NSSCryptoContext_Destroy;
 ;+#NSSCryptoContext_SetDefaultCallback;
@@ -326,7 +326,7 @@ nss_ZRealloc;
 nssArena_Mark;
 nssArena_Release;
 nssArena_Unmark;
-nssAlgorithmAndParameters_CreateSSLSessionKeyDerivation;
+nssAlgNParam_CreateSSLSessionKeyDerivation;
 ;+    local:
 ;+       *;
 ;+};
diff --git a/security/nss/lib/pki/asymmkey.c b/security/nss/lib/pki/asymmkey.c
index ac12949e2..25bd7cf68 100644
--- a/security/nss/lib/pki/asymmkey.c
+++ b/security/nss/lib/pki/asymmkey.c
@@ -198,7 +198,7 @@ nssPrivateKey_GetInstance (
 NSS_IMPLEMENT nssCryptokiObject *
 nssPrivateKey_FindInstanceForAlgorithm (
   NSSPrivateKey *vk,
-  const NSSAlgorithmAndParameters *ap
+  const NSSAlgNParam *ap
 )
 {
     return nssPKIObject_FindInstanceForAlgorithm(&vk->object, ap);
@@ -284,7 +284,7 @@ static const NSSASN1Template encrypted_private_key_info_tmpl[] =
 NSS_IMPLEMENT NSSItem *
 nssPrivateKey_Encode (
   NSSPrivateKey *vk,
-  NSSAlgorithmAndParameters *ap,
+  NSSAlgNParam *ap,
   NSSUTF8 *passwordOpt,
   NSSCallback *uhhOpt,
   NSSItem *rvOpt,
@@ -294,7 +294,7 @@ nssPrivateKey_Encode (
     PRStatus status;
     nssCryptokiObject *pbeKey;
     nssCryptokiObject *vkey;
-    NSSAlgorithmAndParameters *wrapAP;
+    NSSAlgNParam *wrapAP;
     NSSItem *wrap;
     EPKI epki;
     NSSBER *pbeAlgBER;
@@ -313,7 +313,7 @@ nssPrivateKey_Encode (
 	    return (NSSItem *)NULL;
 	}
     }
-    (void)nssAlgorithmAndParameters_SetPBEPassword(ap, password);
+    (void)nssAlgNParam_SetPBEPassword(ap, password);
 
     vkey = nssPrivateKey_FindInstanceForAlgorithm(vk, ap);
     if (!vkey) {
@@ -332,7 +332,7 @@ nssPrivateKey_Encode (
     }
 
     /* convert the PBE alg/param to a corresponding encryption alg/param */
-    wrapAP = nssAlgorithmAndParameters_ConvertPBEToCrypto(ap, PR_TRUE);
+    wrapAP = nssAlgNParam_ConvertPBEToCrypto(ap, PR_TRUE);
     if (!wrapAP) {
 	return (NSSItem *)NULL;
     }
@@ -341,7 +341,7 @@ nssPrivateKey_Encode (
     wrap = nssToken_WrapKey(vkey->token, vkey->session, wrapAP, 
                             pbeKey, vkey, 
                             rvOpt, arenaOpt);
-    nssAlgorithmAndParameters_Destroy(wrapAP);
+    nssAlgNParam_Destroy(wrapAP);
     nssCryptokiObject_Destroy(pbeKey);
     nssCryptokiObject_Destroy(vkey);
     if (!wrap) {
@@ -349,7 +349,7 @@ nssPrivateKey_Encode (
     }
 
     /* encode result in PKCS#8 format */
-    pbeAlgBER = nssAlgorithmAndParameters_Encode(ap, &epki.encAlg, arenaOpt);
+    pbeAlgBER = nssAlgNParam_Encode(ap, &epki.encAlg, arenaOpt);
     if (!pbeAlgBER) {
 	return (NSSItem *)NULL;
     }
@@ -364,7 +364,7 @@ nssPrivateKey_Encode (
 NSS_IMPLEMENT NSSItem *
 NSSPrivateKey_Encode (
   NSSPrivateKey *vk,
-  NSSAlgorithmAndParameters *ap,
+  NSSAlgNParam *ap,
   NSSUTF8 *passwordOpt,
   NSSCallback *uhhOpt,
   NSSItem *rvOpt,
@@ -414,8 +414,8 @@ nssPrivateKey_Decode (
     PRStatus status;
     nssCryptokiObject *pbeKey = NULL;
     nssCryptokiObject *vkey = NULL;
-    NSSAlgorithmAndParameters *wrapAP = NULL;
-    NSSAlgorithmAndParameters *pbeAP = NULL;
+    NSSAlgNParam *wrapAP = NULL;
+    NSSAlgNParam *pbeAP = NULL;
     EPKI epki = { 0 };
     NSSItem *epkiData = NULL;
     NSSUTF8 *password = NULL;
@@ -436,7 +436,7 @@ nssPrivateKey_Decode (
     if (status == PR_FAILURE) {
 	goto cleanup;
     }
-    pbeAP = nssAlgorithmAndParameters_Decode(NULL, &epki.encAlg);
+    pbeAP = nssAlgNParam_Decode(NULL, &epki.encAlg);
     if (!pbeAP) {
 	goto cleanup;
     }
@@ -452,7 +452,7 @@ nssPrivateKey_Decode (
 	    goto cleanup;
 	}
     }
-    (void)nssAlgorithmAndParameters_SetPBEPassword(pbeAP, password);
+    (void)nssAlgNParam_SetPBEPassword(pbeAP, password);
 
     session = nssToken_CreateSession(destination, PR_TRUE);
     if (!session) {
@@ -469,7 +469,7 @@ nssPrivateKey_Decode (
     }
 
     /* convert the PBE alg/param to a corresponding encryption alg/param */
-    wrapAP = nssAlgorithmAndParameters_ConvertPBEToCrypto(pbeAP, PR_TRUE);
+    wrapAP = nssAlgNParam_ConvertPBEToCrypto(pbeAP, PR_TRUE);
     if (!wrapAP) {
 	goto cleanup;
     }
@@ -498,10 +498,10 @@ cleanup:
 	nssSession_Destroy(session);
     }
     if (pbeAP) {
-	nssAlgorithmAndParameters_Destroy(pbeAP);
+	nssAlgNParam_Destroy(pbeAP);
     }
     if (wrapAP) {
-	nssAlgorithmAndParameters_Destroy(wrapAP);
+	nssAlgNParam_Destroy(wrapAP);
     }
     if (pbeKey) {
 	nssCryptokiObject_Destroy(pbeKey);
@@ -567,7 +567,7 @@ NSSPrivateKey_GetModule (
 NSS_IMPLEMENT NSSItem *
 NSSPrivateKey_Decrypt (
   NSSPrivateKey *vk,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *encryptedData,
   NSSCallback *uhh,
   NSSItem *rvOpt,
@@ -583,7 +583,7 @@ NSSPrivateKey_Decrypt (
 NSS_IMPLEMENT NSSItem *
 NSSPrivateKey_Sign (
   NSSPrivateKey *vk,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *data,
   NSSCallback *uhh,
   NSSItem *rvOpt,
@@ -597,7 +597,7 @@ NSSPrivateKey_Sign (
 NSS_IMPLEMENT NSSItem *
 NSSPrivateKey_SignRecover (
   NSSPrivateKey *vk,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *data,
   NSSCallback *uhh,
   NSSItem *rvOpt,
@@ -611,7 +611,7 @@ NSSPrivateKey_SignRecover (
 NSS_IMPLEMENT NSSSymmetricKey *
 NSSPrivateKey_UnwrapSymmetricKey (
   NSSPrivateKey *vk,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *wrappedKey,
   NSSCallback *uhh
 )
@@ -624,7 +624,7 @@ NSS_IMPLEMENT NSSSymmetricKey *
 NSSPrivateKey_DeriveSymmetricKey (
   NSSPrivateKey *vk,
   NSSPublicKey *bk,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSOID *target,
   PRUint32 keySizeOpt, /* zero for best allowed */
   NSSOperations operations,
@@ -703,7 +703,7 @@ NSSPrivateKey_FindPublicKey (
 NSS_IMPLEMENT NSSCryptoContext *
 NSSPrivateKey_CreateCryptoContext (
   NSSPrivateKey *vk,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSCallback *uhh
 )
 {
@@ -969,7 +969,7 @@ nssPublicKey_GetInstance (
 NSS_IMPLEMENT nssCryptokiObject *
 nssPublicKey_FindInstanceForAlgorithm (
   NSSPublicKey *bk,
-  const NSSAlgorithmAndParameters *ap
+  const NSSAlgNParam *ap
 )
 {
     return nssPKIObject_FindInstanceForAlgorithm(&bk->object, ap);
@@ -1022,7 +1022,7 @@ nssPublicKey_CopyToToken (
 NSS_IMPLEMENT NSSItem *
 NSSPublicKey_Encode (
   NSSPublicKey *bk,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSCallback *uhhOpt,
   NSSItem *rvOpt,
   NSSArena *arenaOpt
@@ -1099,7 +1099,7 @@ NSSPublicKey_GetInfo (
 NSS_IMPLEMENT NSSItem *
 NSSPublicKey_Encrypt (
   NSSPublicKey *bk,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *data,
   NSSCallback *uhh,
   NSSItem *rvOpt,
@@ -1113,7 +1113,7 @@ NSSPublicKey_Encrypt (
 NSS_IMPLEMENT PRStatus
 nssPublicKey_Verify (
   NSSPublicKey *bk,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *data,
   NSSItem *signature,
   NSSCallback *uhh
@@ -1144,7 +1144,7 @@ nssPublicKey_Verify (
 NSS_IMPLEMENT PRStatus
 NSSPublicKey_Verify (
   NSSPublicKey *bk,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *data,
   NSSItem *signature,
   NSSCallback *uhh
@@ -1156,7 +1156,7 @@ NSSPublicKey_Verify (
 NSS_IMPLEMENT NSSItem *
 NSSPublicKey_VerifyRecover (
   NSSPublicKey *bk,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *signature,
   NSSCallback *uhh,
   NSSItem *rvOpt,
@@ -1174,7 +1174,7 @@ NSSPublicKey_VerifyRecover (
 static nssCryptokiObject *
 nssPublicKey_GetInstanceForAlgorithmAndObject (
   NSSPublicKey *bk,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   void *ob,
   nssCryptokiObject **targetInstance
 )
@@ -1218,7 +1218,7 @@ nssPublicKey_GetInstanceForAlgorithmAndObject (
 NSS_IMPLEMENT NSSItem *
 nssPublicKey_WrapSymmetricKey (
   NSSPublicKey *bk,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSSymmetricKey *keyToWrap,
   NSSCallback *uhh,
   NSSItem *rvOpt,
@@ -1242,7 +1242,7 @@ nssPublicKey_WrapSymmetricKey (
 NSS_IMPLEMENT NSSItem *
 NSSPublicKey_WrapSymmetricKey (
   NSSPublicKey *bk,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSSymmetricKey *keyToWrap,
   NSSCallback *uhh,
   NSSItem *rvOpt,
@@ -1256,7 +1256,7 @@ NSSPublicKey_WrapSymmetricKey (
 NSS_IMPLEMENT NSSCryptoContext *
 NSSPublicKey_CreateCryptoContext (
   NSSPublicKey *bk,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSCallback *uhh
 )
 {
diff --git a/security/nss/lib/pki/certificate.c b/security/nss/lib/pki/certificate.c
index 14343efb5..b2357d92b 100644
--- a/security/nss/lib/pki/certificate.c
+++ b/security/nss/lib/pki/certificate.c
@@ -566,7 +566,7 @@ NSSCertificate_GetModule (
 NSS_IMPLEMENT nssCryptokiObject *
 nssCertificate_FindInstanceForAlgorithm (
   NSSCertificate *c,
-  NSSAlgorithmAndParameters *ap
+  NSSAlgNParam *ap
 )
 {
     return nssPKIObject_FindInstanceForAlgorithm(&c->object, ap);
@@ -1270,7 +1270,7 @@ NSSCertificate_BuildChain (
 NSS_IMPLEMENT NSSItem *
 NSSCertificate_Encrypt (
   NSSCertificate *c,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *data,
   NSSTime time,
   NSSUsages *usages,
@@ -1287,7 +1287,7 @@ NSSCertificate_Encrypt (
 NSS_IMPLEMENT PRStatus
 NSSCertificate_Verify (
   NSSCertificate *c,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *data,
   NSSItem *signature,
   NSSTime time,
@@ -1303,7 +1303,7 @@ NSSCertificate_Verify (
 NSS_IMPLEMENT NSSItem *
 NSSCertificate_VerifyRecover (
   NSSCertificate *c,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *signature,
   NSSTime time,
   NSSUsages *usages,
@@ -1320,7 +1320,7 @@ NSSCertificate_VerifyRecover (
 NSS_IMPLEMENT NSSItem *
 nssCertificate_WrapSymmetricKey (
   NSSCertificate *c,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSSymmetricKey *keyToWrap,
   NSSTime time,
   NSSUsages *usages,
@@ -1349,7 +1349,7 @@ nssCertificate_WrapSymmetricKey (
 NSS_IMPLEMENT NSSItem *
 NSSCertificate_WrapSymmetricKey (
   NSSCertificate *c,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSSymmetricKey *keyToWrap,
   NSSTime time,
   NSSUsages *usages,
@@ -1367,7 +1367,7 @@ NSSCertificate_WrapSymmetricKey (
 NSS_IMPLEMENT NSSCryptoContext *
 NSSCertificate_CreateCryptoContext (
   NSSCertificate *c,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSTime time,
   NSSUsages *usages,
   NSSPolicies *policiesOpt,
@@ -1574,7 +1574,7 @@ NSSUserCertificate_IsStillPresent (
 NSS_IMPLEMENT NSSItem *
 NSSUserCertificate_Decrypt (
   NSSUserCertificate *uc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *data,
   NSSTime time,
   NSSUsages *usages,
@@ -1591,7 +1591,7 @@ NSSUserCertificate_Decrypt (
 NSS_IMPLEMENT NSSItem *
 NSSUserCertificate_Sign (
   NSSUserCertificate *uc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *data,
   NSSTime time,
   NSSUsages *usages,
@@ -1608,7 +1608,7 @@ NSSUserCertificate_Sign (
 NSS_IMPLEMENT NSSItem *
 NSSUserCertificate_SignRecover (
   NSSUserCertificate *uc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *data,
   NSSTime time,
   NSSUsages *usages,
@@ -1625,7 +1625,7 @@ NSSUserCertificate_SignRecover (
 NSS_IMPLEMENT NSSSymmetricKey *
 NSSUserCertificate_UnwrapSymmetricKey (
   NSSUserCertificate *uc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *wrappedKey,
   NSSTime time,
   NSSUsages *usages,
@@ -1643,7 +1643,7 @@ NSS_IMPLEMENT NSSSymmetricKey *
 NSSUserCertificate_DeriveSymmetricKey (
   NSSUserCertificate *uc, /* provides private key */
   NSSCertificate *c, /* provides public key */
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSOID *target,
   PRUint32 keySizeOpt, /* zero for best allowed */
   NSSOperations operations,
diff --git a/security/nss/lib/pki/cryptocontext.c b/security/nss/lib/pki/cryptocontext.c
index fc85215de..72ccd8a55 100644
--- a/security/nss/lib/pki/cryptocontext.c
+++ b/security/nss/lib/pki/cryptocontext.c
@@ -67,7 +67,7 @@ struct NSSCryptoContextStr
   /* these are set when the context is used for an operation */
   NSSToken *token;
   nssSession *session;
-  NSSAlgorithmAndParameters *ap; /* this can be overriden */
+  NSSAlgNParam *ap; /* this can be overriden */
   nssCryptokiObject *key; /* key used for crypto */
   nssCryptokiObject *bkey; /* public key of user cert */
   union {
@@ -88,7 +88,7 @@ struct NSSCryptoContextMarkStr
 NSS_IMPLEMENT NSSCryptoContext *
 nssCryptoContext_Create (
   NSSTrustDomain *td,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSCallback *uhhOpt
 )
 {
@@ -106,7 +106,7 @@ nssCryptoContext_Create (
     rvCC->td = td;
     rvCC->arena = arena;
     if (apOpt) {
-	rvCC->ap = nssAlgorithmAndParameters_Clone(apOpt, rvCC->arena);
+	rvCC->ap = nssAlgNParam_Clone(apOpt, rvCC->arena);
 	if (!rvCC->ap) {
 	    nssArena_Destroy(arena);
 	    return (NSSCryptoContext *)NULL;
@@ -118,7 +118,7 @@ nssCryptoContext_Create (
 NSS_IMPLEMENT NSSCryptoContext *
 nssCryptoContext_CreateForSymmetricKey (
   NSSSymmetricKey *mkey,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSCallback *uhhOpt
 )
 {
@@ -239,7 +239,7 @@ NSSCryptoContext_GetTrustDomain (
 static PRStatus
 prepare_context_for_operation (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *ap
+  const NSSAlgNParam *ap
 )
 {
     if (cc->token) {
@@ -250,7 +250,7 @@ prepare_context_for_operation (
 	}
     } else {
 	/* Set the token where the operation will take place */
-	cc->token = nssTrustDomain_FindTokenForAlgorithmAndParameters(cc->td, 
+	cc->token = nssTrustDomain_FindTokenForAlgNParam(cc->td, 
 	                                                              ap);
 	if (!cc->token) {
 	    /*nss_SetError(NSS_ERROR_NO_TOKEN_FOR_OPERATION);*/
@@ -273,7 +273,7 @@ loser:
 static PRStatus
 prepare_context_symmetric_key (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *ap
+  const NSSAlgNParam *ap
 )
 {
     if (cc->token) {
@@ -296,7 +296,7 @@ prepare_context_symmetric_key (
 	    cc->token = nssToken_AddRef(cc->key->token);
 	} else {
 	    /* find any token in the trust domain that can */
-	    cc->token = nssTrustDomain_FindTokenForAlgorithmAndParameters(cc->td, ap);
+	    cc->token = nssTrustDomain_FindTokenForAlgNParam(cc->td, ap);
 	    if (!cc->token) {
 		/*nss_SetError(NSS_ERROR_NO_TOKEN_FOR_OPERATION);*/
 		goto loser;
@@ -329,7 +329,7 @@ loser:
 static PRStatus
 prepare_context_private_key (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *ap
+  const NSSAlgNParam *ap
 )
 {
     NSSPrivateKey *vkey = NULL;
@@ -362,7 +362,7 @@ prepare_context_private_key (
 	    cc->token = nssToken_AddRef(cc->key->token);
 	} else {
 	    /* find any token in the trust domain that can */
-	    cc->token = nssTrustDomain_FindTokenForAlgorithmAndParameters(cc->td, ap);
+	    cc->token = nssTrustDomain_FindTokenForAlgNParam(cc->td, ap);
 	    if (!cc->token) {
 		/*nss_SetError(NSS_ERROR_NO_TOKEN_FOR_OPERATION);*/
 		goto loser;
@@ -400,7 +400,7 @@ loser:
 static PRStatus
 prepare_context_public_key (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *ap
+  const NSSAlgNParam *ap
 )
 {
     /* when the dist. object is a cert, both keys may be available,
@@ -437,7 +437,7 @@ prepare_context_public_key (
 	    cc->token = nssToken_AddRef(cc->key->token);
 	} else {
 	    /* find any token in the trust domain that can */
-	    cc->token = nssTrustDomain_FindTokenForAlgorithmAndParameters(cc->td, ap);
+	    cc->token = nssTrustDomain_FindTokenForAlgNParam(cc->td, ap);
 	    if (!cc->token) {
 		/*nss_SetError(NSS_ERROR_NO_TOKEN_FOR_OPERATION);*/
 		goto loser;
@@ -475,7 +475,7 @@ loser:
 NSS_IMPLEMENT NSSItem *
 nssCryptoContext_Encrypt (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *data,
   NSSCallback *uhhOpt,
   NSSItem *rvOpt,
@@ -483,7 +483,7 @@ nssCryptoContext_Encrypt (
 )
 {
     nssCryptokiObject *key;
-    const NSSAlgorithmAndParameters *ap = apOpt ? apOpt : cc->ap;
+    const NSSAlgNParam *ap = apOpt ? apOpt : cc->ap;
     if (!ap) {
 	nss_SetError(NSS_ERROR_INVALID_CRYPTO_CONTEXT);
 	return (NSSItem *)NULL;
@@ -506,7 +506,7 @@ nssCryptoContext_Encrypt (
 NSS_IMPLEMENT NSSItem *
 NSSCryptoContext_Encrypt (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *data,
   NSSCallback *uhhOpt,
   NSSItem *rvOpt,
@@ -524,12 +524,12 @@ NSSCryptoContext_Encrypt (
 NSS_IMPLEMENT PRStatus
 nssCryptoContext_BeginEncrypt (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSCallback *uhhOpt
 )
 {
     nssCryptokiObject *key;
-    const NSSAlgorithmAndParameters *ap = apOpt ? apOpt : cc->ap;
+    const NSSAlgNParam *ap = apOpt ? apOpt : cc->ap;
     if (!ap) {
 	nss_SetError(NSS_ERROR_INVALID_CRYPTO_CONTEXT);
 	return PR_FAILURE;
@@ -551,7 +551,7 @@ nssCryptoContext_BeginEncrypt (
 NSS_IMPLEMENT PRStatus
 NSSCryptoContext_BeginEncrypt (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSCallback *uhhOpt
 )
 {
@@ -610,14 +610,14 @@ NSSCryptoContext_FinishEncrypt (
 NSS_IMPLEMENT NSSItem *
 nssCryptoContext_Decrypt (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *encryptedData,
   NSSCallback *uhhOpt,
   NSSItem *rvOpt,
   NSSArena *arenaOpt
 )
 {
-    const NSSAlgorithmAndParameters *ap = apOpt ? apOpt : cc->ap;
+    const NSSAlgNParam *ap = apOpt ? apOpt : cc->ap;
     if (!ap) {
 	nss_SetError(NSS_ERROR_INVALID_CRYPTO_CONTEXT);
 	return (NSSItem *)NULL;
@@ -638,7 +638,7 @@ nssCryptoContext_Decrypt (
 NSS_IMPLEMENT NSSItem *
 NSSCryptoContext_Decrypt (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *encryptedData,
   NSSCallback *uhhOpt,
   NSSItem *rvOpt,
@@ -656,11 +656,11 @@ NSSCryptoContext_Decrypt (
 NSS_IMPLEMENT PRStatus
 nssCryptoContext_BeginDecrypt (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSCallback *uhhOpt
 )
 {
-    const NSSAlgorithmAndParameters *ap = apOpt ? apOpt : cc->ap;
+    const NSSAlgNParam *ap = apOpt ? apOpt : cc->ap;
     if (!ap) {
 	nss_SetError(NSS_ERROR_INVALID_CRYPTO_CONTEXT);
 	return PR_FAILURE;
@@ -680,7 +680,7 @@ nssCryptoContext_BeginDecrypt (
 NSS_IMPLEMENT PRStatus
 NSSCryptoContext_BeginDecrypt (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSCallback *uhhOpt
 )
 {
@@ -739,14 +739,14 @@ NSSCryptoContext_FinishDecrypt (
 NSS_IMPLEMENT NSSItem *
 nssCryptoContext_Sign (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *data,
   NSSCallback *uhhOpt,
   NSSItem *rvOpt,
   NSSArena *arenaOpt
 )
 {
-    const NSSAlgorithmAndParameters *ap = apOpt ? apOpt : cc->ap;
+    const NSSAlgNParam *ap = apOpt ? apOpt : cc->ap;
     if (!ap) {
 	nss_SetError(NSS_ERROR_INVALID_CRYPTO_CONTEXT);
 	return (NSSItem *)NULL;
@@ -761,7 +761,7 @@ nssCryptoContext_Sign (
 NSS_IMPLEMENT NSSItem *
 NSSCryptoContext_Sign (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *data,
   NSSCallback *uhhOpt,
   NSSItem *rvOpt,
@@ -779,11 +779,11 @@ NSSCryptoContext_Sign (
 NSS_IMPLEMENT PRStatus
 nssCryptoContext_BeginSign (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSCallback *uhhOpt
 )
 {
-    const NSSAlgorithmAndParameters *ap = apOpt ? apOpt : cc->ap;
+    const NSSAlgNParam *ap = apOpt ? apOpt : cc->ap;
     if (!ap) {
 	nss_SetError(NSS_ERROR_INVALID_CRYPTO_CONTEXT);
 	return PR_FAILURE;
@@ -797,7 +797,7 @@ nssCryptoContext_BeginSign (
 NSS_IMPLEMENT PRStatus
 NSSCryptoContext_BeginSign (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSCallback *uhhOpt
 )
 {
@@ -852,14 +852,14 @@ NSSCryptoContext_FinishSign (
 NSS_IMPLEMENT NSSItem *
 nssCryptoContext_SignRecover (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *data,
   NSSCallback *uhhOpt,
   NSSItem *rvOpt,
   NSSArena *arenaOpt
 )
 {
-    const NSSAlgorithmAndParameters *ap = apOpt ? apOpt : cc->ap;
+    const NSSAlgNParam *ap = apOpt ? apOpt : cc->ap;
     if (!ap) {
 	nss_SetError(NSS_ERROR_INVALID_CRYPTO_CONTEXT);
 	return (NSSItem *)NULL;
@@ -874,7 +874,7 @@ nssCryptoContext_SignRecover (
 NSS_IMPLEMENT NSSItem *
 NSSCryptoContext_SignRecover (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *data,
   NSSCallback *uhhOpt,
   NSSItem *rvOpt,
@@ -894,14 +894,14 @@ NSSCryptoContext_SignRecover (
 NSS_IMPLEMENT NSSSymmetricKey *
 nssCryptoContext_UnwrapSymmetricKey (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *wrappedKey,
   NSSCallback *uhhOpt,
   NSSOperations operations,
   NSSProperties properties
 )
 {
-    const NSSAlgorithmAndParameters *ap = apOpt ? apOpt : cc->ap;
+    const NSSAlgNParam *ap = apOpt ? apOpt : cc->ap;
     if (!ap) {
 	nss_SetError(NSS_ERROR_INVALID_CRYPTO_CONTEXT);
 	return (NSSSymmetricKey *)NULL;
@@ -940,7 +940,7 @@ loser:
 NSS_IMPLEMENT NSSSymmetricKey *
 NSSCryptoContext_UnwrapSymmetricKey (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *wrappedKey,
   NSSCallback *uhhOpt,
   NSSOperations operations,
@@ -960,14 +960,14 @@ NSSCryptoContext_UnwrapSymmetricKey (
 NSS_IMPLEMENT PRStatus
 nssCryptoContext_Verify (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *data,
   NSSItem *signature,
   NSSCallback *uhhOpt
 )
 {
     nssCryptokiObject *key;
-    const NSSAlgorithmAndParameters *ap = apOpt ? apOpt : cc->ap;
+    const NSSAlgNParam *ap = apOpt ? apOpt : cc->ap;
     if (!ap) {
 	nss_SetError(NSS_ERROR_INVALID_CRYPTO_CONTEXT);
 	return PR_FAILURE;
@@ -983,7 +983,7 @@ nssCryptoContext_Verify (
 NSS_IMPLEMENT PRStatus
 NSSCryptoContext_Verify (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *data,
   NSSItem *signature,
   NSSCallback *uhhOpt
@@ -1000,12 +1000,12 @@ NSSCryptoContext_Verify (
 NSS_IMPLEMENT PRStatus
 nssCryptoContext_BeginVerify (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSCallback *uhhOpt
 )
 {
     nssCryptokiObject *key;
-    const NSSAlgorithmAndParameters *ap = apOpt ? apOpt : cc->ap;
+    const NSSAlgNParam *ap = apOpt ? apOpt : cc->ap;
     if (!ap) {
 	nss_SetError(NSS_ERROR_INVALID_CRYPTO_CONTEXT);
 	return PR_FAILURE;
@@ -1020,7 +1020,7 @@ nssCryptoContext_BeginVerify (
 NSS_IMPLEMENT PRStatus
 NSSCryptoContext_BeginVerify (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSCallback *uhhOpt
 )
 {
@@ -1073,7 +1073,7 @@ NSSCryptoContext_FinishVerify (
 NSS_IMPLEMENT NSSItem *
 nssCryptoContext_VerifyRecover (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *signature,
   NSSCallback *uhhOpt,
   NSSItem *rvOpt,
@@ -1081,7 +1081,7 @@ nssCryptoContext_VerifyRecover (
 )
 {
     nssCryptokiObject *key;
-    const NSSAlgorithmAndParameters *ap = apOpt ? apOpt : cc->ap;
+    const NSSAlgNParam *ap = apOpt ? apOpt : cc->ap;
     if (!ap) {
 	nss_SetError(NSS_ERROR_INVALID_CRYPTO_CONTEXT);
 	return (NSSItem *)NULL;
@@ -1097,7 +1097,7 @@ nssCryptoContext_VerifyRecover (
 NSS_IMPLEMENT NSSItem *
 NSSCryptoContext_VerifyRecover (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *signature,
   NSSCallback *uhhOpt,
   NSSItem *rvOpt,
@@ -1117,14 +1117,14 @@ NSSCryptoContext_VerifyRecover (
 NSS_IMPLEMENT NSSItem *
 nssCryptoContext_WrapSymmetricKey (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSSymmetricKey *keyToWrap,
   NSSCallback *uhhOpt,
   NSSItem *rvOpt,
   NSSArena *arenaOpt
 )
 {
-    const NSSAlgorithmAndParameters *ap = apOpt ? apOpt : cc->ap;
+    const NSSAlgNParam *ap = apOpt ? apOpt : cc->ap;
     if (!ap || cc->mk) {
 	nss_SetError(NSS_ERROR_INVALID_CRYPTO_CONTEXT);
 	return (NSSItem *)NULL;
@@ -1149,7 +1149,7 @@ nssCryptoContext_WrapSymmetricKey (
 NSS_IMPLEMENT NSSItem *
 NSSCryptoContext_WrapSymmetricKey (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSSymmetricKey *keyToWrap,
   NSSCallback *uhhOpt,
   NSSItem *rvOpt,
@@ -1168,14 +1168,14 @@ NSSCryptoContext_WrapSymmetricKey (
 NSS_IMPLEMENT NSSItem *
 nssCryptoContext_Digest (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *data,
   NSSCallback *uhhOpt,
   NSSItem *rvOpt,
   NSSArena *arenaOpt
 )
 {
-    const NSSAlgorithmAndParameters *ap = apOpt ? apOpt : cc->ap;
+    const NSSAlgNParam *ap = apOpt ? apOpt : cc->ap;
     if (!ap) {
 	nss_SetError(NSS_ERROR_INVALID_CRYPTO_CONTEXT);
 	return (NSSItem *)NULL;
@@ -1190,7 +1190,7 @@ nssCryptoContext_Digest (
 NSS_IMPLEMENT NSSItem *
 NSSCryptoContext_Digest (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *data,
   NSSCallback *uhhOpt,
   NSSItem *rvOpt,
@@ -1204,11 +1204,11 @@ NSSCryptoContext_Digest (
 NSS_IMPLEMENT PRStatus
 nssCryptoContext_BeginDigest (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSCallback *uhhOpt
 )
 {
-    const NSSAlgorithmAndParameters *ap = apOpt ? apOpt : cc->ap;
+    const NSSAlgNParam *ap = apOpt ? apOpt : cc->ap;
     if (!ap) {
 	nss_SetError(NSS_ERROR_INVALID_CRYPTO_CONTEXT);
 	return PR_FAILURE;
@@ -1222,7 +1222,7 @@ nssCryptoContext_BeginDigest (
 NSS_IMPLEMENT PRStatus
 NSSCryptoContext_BeginDigest (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSCallback *uhhOpt
 )
 {
diff --git a/security/nss/lib/pki/nsspki.h b/security/nss/lib/pki/nsspki.h
index 98a8b9f23..519fdeaba 100644
--- a/security/nss/lib/pki/nsspki.h
+++ b/security/nss/lib/pki/nsspki.h
@@ -322,7 +322,7 @@ NSSCertificate_GetType (
 NSS_EXTERN NSSItem *
 NSSCertificate_Encrypt (
   NSSCertificate *c,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *data,
   NSSTime time,
   NSSUsages *usages,
@@ -340,7 +340,7 @@ NSSCertificate_Encrypt (
 NSS_EXTERN PRStatus
 NSSCertificate_Verify (
   NSSCertificate *c,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *data,
   NSSItem *signature,
   NSSTime time,
@@ -357,7 +357,7 @@ NSSCertificate_Verify (
 NSS_EXTERN NSSItem *
 NSSCertificate_VerifyRecover (
   NSSCertificate *c,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *signature,
   NSSTime time,
   NSSUsages *usages,
@@ -378,7 +378,7 @@ NSSCertificate_VerifyRecover (
 NSS_EXTERN NSSItem *
 NSSCertificate_WrapSymmetricKey (
   NSSCertificate *c,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSSymmetricKey *keyToWrap,
   NSSTime time,
   NSSUsages *usages,
@@ -398,7 +398,7 @@ NSSCertificate_WrapSymmetricKey (
 NSS_EXTERN NSSCryptoContext *
 NSSCertificate_CreateCryptoContext (
   NSSCertificate *c,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSTime time,
   NSSUsages *usages,
   NSSPolicies *policiesOpt,
@@ -492,7 +492,7 @@ NSSUserCertificate_IsStillPresent (
 NSS_EXTERN NSSItem *
 NSSUserCertificate_Decrypt (
   NSSUserCertificate *uc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *data,
   NSSTime time,
   NSSUsages *usages,
@@ -510,7 +510,7 @@ NSSUserCertificate_Decrypt (
 NSS_EXTERN NSSItem *
 NSSUserCertificate_Sign (
   NSSUserCertificate *uc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *data,
   NSSTime time,
   NSSUsages *usages,
@@ -528,7 +528,7 @@ NSSUserCertificate_Sign (
 NSS_EXTERN NSSItem *
 NSSUserCertificate_SignRecover (
   NSSUserCertificate *uc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *data,
   NSSTime time,
   NSSUsages *usages,
@@ -546,7 +546,7 @@ NSSUserCertificate_SignRecover (
 NSS_EXTERN NSSSymmetricKey *
 NSSUserCertificate_UnwrapSymmetricKey (
   NSSUserCertificate *uc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *wrappedKey,
   NSSTime time,
   NSSUsages *usages,
@@ -565,7 +565,7 @@ NSS_EXTERN NSSSymmetricKey *
 NSSUserCertificate_DeriveSymmetricKey (
   NSSUserCertificate *uc, /* provides private key */
   NSSCertificate *c, /* provides public key */
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSOID *target,
   PRUint32 keySizeOpt, /* zero for best allowed */
   NSSOperations operations,
@@ -651,7 +651,7 @@ NSSPrivateKey_IsStillPresent (
 NSS_EXTERN NSSItem *
 NSSPrivateKey_Encode (
   NSSPrivateKey *vk,
-  NSSAlgorithmAndParameters *ap,
+  NSSAlgNParam *ap,
   NSSUTF8 *passwordOpt, /* NULL means prompt */
   NSSCallback *uhhOpt,
   NSSItem *rvOpt,
@@ -708,7 +708,7 @@ NSSPrivateKey_GetModule (
 NSS_EXTERN NSSItem *
 NSSPrivateKey_Decrypt (
   NSSPrivateKey *vk,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *encryptedData,
   NSSCallback *uhh,
   NSSItem *rvOpt,
@@ -723,7 +723,7 @@ NSSPrivateKey_Decrypt (
 NSS_EXTERN NSSItem *
 NSSPrivateKey_Sign (
   NSSPrivateKey *vk,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *data,
   NSSCallback *uhh,
   NSSItem *rvOpt,
@@ -738,7 +738,7 @@ NSSPrivateKey_Sign (
 NSS_EXTERN NSSItem *
 NSSPrivateKey_SignRecover (
   NSSPrivateKey *vk,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *data,
   NSSCallback *uhh,
   NSSItem *rvOpt,
@@ -753,7 +753,7 @@ NSSPrivateKey_SignRecover (
 NSS_EXTERN NSSSymmetricKey *
 NSSPrivateKey_UnwrapSymmetricKey (
   NSSPrivateKey *vk,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *wrappedKey,
   NSSCallback *uhh
 );
@@ -767,7 +767,7 @@ NSS_EXTERN NSSSymmetricKey *
 NSSPrivateKey_DeriveSymmetricKey (
   NSSPrivateKey *vk,
   NSSPublicKey *bk,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSOID *target,
   PRUint32 keySizeOpt, /* zero for best allowed */
   NSSOperations operations,
@@ -795,7 +795,7 @@ NSSPrivateKey_FindPublicKey (
 NSS_EXTERN NSSCryptoContext *
 NSSPrivateKey_CreateCryptoContext (
   NSSPrivateKey *vk,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSCallback *uhh
 );
 
@@ -871,7 +871,7 @@ NSSPublicKey_DeleteStoredObject (
 NSS_EXTERN NSSItem *
 NSSPublicKey_Encode (
   NSSPublicKey *bk,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSCallback *uhhOpt,
   NSSItem *rvOpt,
   NSSArena *arenaOpt
@@ -935,7 +935,7 @@ NSSPublicKey_GetModule (
 NSS_EXTERN NSSItem *
 NSSPublicKey_Encrypt (
   NSSPublicKey *bk,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *data,
   NSSCallback *uhh,
   NSSItem *rvOpt,
@@ -950,7 +950,7 @@ NSSPublicKey_Encrypt (
 NSS_EXTERN PRStatus
 NSSPublicKey_Verify (
   NSSPublicKey *bk,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *data,
   NSSItem *signature,
   NSSCallback *uhh
@@ -964,7 +964,7 @@ NSSPublicKey_Verify (
 NSS_EXTERN NSSItem *
 NSSPublicKey_VerifyRecover (
   NSSPublicKey *bk,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *signature,
   NSSCallback *uhh,
   NSSItem *rvOpt,
@@ -979,7 +979,7 @@ NSSPublicKey_VerifyRecover (
 NSS_EXTERN NSSItem *
 NSSPublicKey_WrapSymmetricKey (
   NSSPublicKey *bk,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSSymmetricKey *keyToWrap,
   NSSCallback *uhh,
   NSSItem *rvOpt,
@@ -996,7 +996,7 @@ NSSPublicKey_WrapSymmetricKey (
 NSS_EXTERN NSSCryptoContext *
 NSSPublicKey_CreateCryptoContext (
   NSSPublicKey *bk,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSCallback *uhh
 );
 
@@ -1159,7 +1159,7 @@ NSSSymmetricKey_GetModule (
 NSS_EXTERN NSSItem *
 NSSSymmetricKey_Encrypt (
   NSSSymmetricKey *mk,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSItem *data,
   NSSCallback *uhh,
   NSSItem *rvOpt,
@@ -1174,7 +1174,7 @@ NSSSymmetricKey_Encrypt (
 NSS_EXTERN NSSItem *
 NSSSymmetricKey_Decrypt (
   NSSSymmetricKey *mk,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSItem *encryptedData,
   NSSCallback *uhh,
   NSSItem *rvOpt,
@@ -1189,7 +1189,7 @@ NSSSymmetricKey_Decrypt (
 NSS_EXTERN NSSItem *
 NSSSymmetricKey_Sign (
   NSSSymmetricKey *mk,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSItem *data,
   NSSCallback *uhh,
   NSSItem *rvOpt,
@@ -1204,7 +1204,7 @@ NSSSymmetricKey_Sign (
 NSS_EXTERN PRStatus
 NSSSymmetricKey_Verify (
   NSSSymmetricKey *mk,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSItem *data,
   NSSItem *signature,
   NSSCallback *uhh
@@ -1218,7 +1218,7 @@ NSSSymmetricKey_Verify (
 NSS_EXTERN NSSItem *
 NSSSymmetricKey_WrapSymmetricKey (
   NSSSymmetricKey *wrappingKey,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSSymmetricKey *keyToWrap,
   NSSCallback *uhh,
   NSSItem *rvOpt,
@@ -1233,7 +1233,7 @@ NSSSymmetricKey_WrapSymmetricKey (
 NSS_EXTERN NSSItem *
 NSSSymmetricKey_WrapPrivateKey (
   NSSSymmetricKey *wrappingKey,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSPrivateKey *keyToWrap,
   NSSCallback *uhh,
   NSSItem *rvOpt,
@@ -1248,7 +1248,7 @@ NSSSymmetricKey_WrapPrivateKey (
 NSS_EXTERN NSSSymmetricKey *
 NSSSymmetricKey_UnwrapSymmetricKey (
   NSSSymmetricKey *wrappingKey,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSItem *wrappedKey,
   NSSOID *target,
   PRUint32 keySizeOpt,
@@ -1264,7 +1264,7 @@ NSSSymmetricKey_UnwrapSymmetricKey (
 NSS_EXTERN NSSPrivateKey *
 NSSSymmetricKey_UnwrapPrivateKey (
   NSSSymmetricKey *wrappingKey,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSItem *wrappedKey,
   NSSUTF8 *labelOpt,
   NSSItem *keyIDOpt,
@@ -1282,7 +1282,7 @@ NSSSymmetricKey_UnwrapPrivateKey (
 NSS_EXTERN NSSSymmetricKey *
 NSSSymmetricKey_DeriveSymmetricKey (
   NSSSymmetricKey *originalKey,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSSymmetricKeyType target,
   PRUint32 keySizeOpt,
   NSSOperations operations,
@@ -1299,7 +1299,7 @@ NSSSymmetricKey_DeriveSymmetricKey (
 NSS_EXTERN NSSCryptoContext *
 NSSSymmetricKey_CreateCryptoContext (
   NSSSymmetricKey *mk,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSCallback *uhh
 );
 
@@ -1845,7 +1845,7 @@ NSSTrustDomain_FindBestUserCertificateForSSLClientAuth (
   NSSUTF8 *sslHostOpt,
   NSSDER *rootCAsOpt[], /* null pointer for none */
   PRUint32 rootCAsMaxOpt, /* zero means list is null-terminated */
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSPolicies *policiesOpt
 );
 
@@ -1860,7 +1860,7 @@ NSSTrustDomain_FindUserCertificatesForSSLClientAuth (
   NSSUTF8 *sslHostOpt,
   NSSDER *rootCAsOpt[], /* null pointer for none */
   PRUint32 rootCAsMaxOpt, /* zero means list is null-terminated */
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSPolicies *policiesOpt,
   NSSCertificate **rvOpt,
   PRUint32 rvLimit, /* zero for no limit */
@@ -1878,7 +1878,7 @@ NSSTrustDomain_FindBestUserCertificateForEmailSigning (
   NSSASCII7 *signerOpt,
   NSSASCII7 *recipientOpt,
   /* anything more here? */
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSPolicies *policiesOpt
 );
 
@@ -1893,7 +1893,7 @@ NSSTrustDomain_FindUserCertificatesForEmailSigning (
   NSSASCII7 *signerOpt,
   NSSASCII7 *recipientOpt,
   /* anything more here? */
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSPolicies *policiesOpt,
   NSSCertificate **rvOpt,
   PRUint32 rvLimit, /* zero for no limit */
@@ -1920,7 +1920,7 @@ NSSTrustDomain_FindUserCertificatesForEmailSigning (
 NSS_EXTERN PRStatus
 NSSTrustDomain_GenerateKeyPair (
   NSSTrustDomain *td,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSPublicKey **pbkOpt,
   NSSPrivateKey **pvkOpt,
   NSSUTF8 *nicknameOpt,
@@ -1953,7 +1953,7 @@ NSSTrustDomain_TraversePrivateKeys (
 NSS_EXTERN NSSSymmetricKey *
 NSSTrustDomain_GenerateSymmetricKey (
   NSSTrustDomain *td,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   PRUint32 keysize,
   NSSToken *destination,
   NSSCallback *uhhOpt
@@ -1967,7 +1967,7 @@ NSSTrustDomain_GenerateSymmetricKey (
 NSS_EXTERN NSSSymmetricKey *
 NSSTrustDomain_GenerateSymmetricKeyFromPassword (
   NSSTrustDomain *td,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSUTF8 *passwordOpt, /* if null, prompt */
   NSSToken *destinationOpt,
   NSSCallback *uhhOpt
@@ -2040,7 +2040,7 @@ NSSTrustDomain_CreateVolatileDomain (
 NSS_EXTERN NSSCryptoContext *
 NSSTrustDomain_CreateCryptoContext (
   NSSTrustDomain *td,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSCallback *uhhOpt
 );
 
@@ -2230,7 +2230,7 @@ NSSVolatileDomain_FindBestUserCertificateForSSLClientAuth (
   NSSUTF8 *sslHostOpt,
   NSSDER *rootCAsOpt[], /* null pointer for none */
   PRUint32 rootCAsMaxOpt, /* zero means list is null-terminated */
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSPolicies *policiesOpt
 );
 
@@ -2245,7 +2245,7 @@ NSSVolatileDomain_FindUserCertificatesForSSLClientAuth (
   NSSUTF8 *sslHostOpt,
   NSSDER *rootCAsOpt[], /* null pointer for none */
   PRUint32 rootCAsMaxOpt, /* zero means list is null-terminated */
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSPolicies *policiesOpt,
   NSSCertificate **rvOpt,
   PRUint32 rvLimit, /* zero for no limit */
@@ -2263,7 +2263,7 @@ NSSVolatileDomain_FindBestUserCertificateForEmailSigning (
   NSSASCII7 *signerOpt,
   NSSASCII7 *recipientOpt,
   /* anything more here? */
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSPolicies *policiesOpt
 );
 
@@ -2278,7 +2278,7 @@ NSSVolatileDomain_FindUserCertificatesForEmailSigning (
   NSSASCII7 *signerOpt, /* fgmr or a more general name? */
   NSSASCII7 *recipientOpt,
   /* anything more here? */
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSPolicies *policiesOpt,
   NSSCertificate **rvOpt,
   PRUint32 rvLimit, /* zero for no limit */
@@ -2357,7 +2357,7 @@ NSSVolatileDomain_ImportEncodedPrivateKey (
 NSS_EXTERN PRStatus
 NSSVolatileDomain_GenerateKeyPair (
   NSSVolatileDomain *vd,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSPrivateKey **pvkOpt,
   NSSPublicKey **pbkOpt,
   PRBool privateKeyIsSensitive,
@@ -2388,7 +2388,7 @@ NSSVolatileDomain_GenerateKeyPair (
 NSS_EXTERN NSSSymmetricKey *
 NSSVolatileDomain_GenerateSymmetricKey (
   NSSVolatileDomain *vd,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   PRUint32 keysize,
   const NSSUTF8 *labelOpt,
   NSSOperations operations,
@@ -2405,7 +2405,7 @@ NSSVolatileDomain_GenerateSymmetricKey (
 NSS_EXTERN NSSSymmetricKey *
 NSSVolatileDomain_GenerateSymmetricKeyFromPassword (
   NSSVolatileDomain *vd,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSUTF8 *passwordOpt, /* if null, prompt */
   NSSToken *destinationOpt,
   NSSCallback *uhhOpt
@@ -2445,7 +2445,7 @@ NSSVolatileDomain_FindSymmetricKeyByAlgorithmAndKeyID (
 NSS_EXTERN NSSSymmetricKey *
 NSSVolatileDomain_UnwrapSymmetricKey (
   NSSVolatileDomain *vd,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSPrivateKey *wrapKey,
   NSSItem *wrappedKey,
   const NSSOID *targetKeyAlg,
@@ -2476,7 +2476,7 @@ NSS_EXTERN NSSSymmetricKey *
 NSSVolatileDomain_DeriveSymmetricKey (
   NSSVolatileDomain *vd,
   NSSPublicKey *bkOpt,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSOID *target,
   PRUint32 keySizeOpt, /* zero for best allowed */
   NSSOperations operations,
@@ -2589,7 +2589,7 @@ NSSCryptoContext_GetTrustDomain (
 NSS_EXTERN NSSItem *
 NSSCryptoContext_Encrypt (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *data,
   NSSCallback *uhhOpt,
   NSSItem *rvOpt,
@@ -2604,7 +2604,7 @@ NSSCryptoContext_Encrypt (
 NSS_EXTERN PRStatus
 NSSCryptoContext_BeginEncrypt (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSCallback *uhhOpt
 );
 
@@ -2642,7 +2642,7 @@ NSSCryptoContext_FinishEncrypt (
 NSS_EXTERN NSSItem *
 NSSCryptoContext_Decrypt (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *encryptedData,
   NSSCallback *uhhOpt,
   NSSItem *rvOpt,
@@ -2657,7 +2657,7 @@ NSSCryptoContext_Decrypt (
 NSS_EXTERN PRStatus
 NSSCryptoContext_BeginDecrypt (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSCallback *uhhOpt
 );
 
@@ -2694,7 +2694,7 @@ NSSCryptoContext_FinishDecrypt (
 NSS_EXTERN NSSItem *
 NSSCryptoContext_Sign (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *data,
   NSSCallback *uhhOpt,
   NSSItem *rvOpt,
@@ -2709,7 +2709,7 @@ NSSCryptoContext_Sign (
 NSS_EXTERN PRStatus
 NSSCryptoContext_BeginSign (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSCallback *uhhOpt
 );
 
@@ -2744,7 +2744,7 @@ NSSCryptoContext_FinishSign (
 NSS_EXTERN NSSItem *
 NSSCryptoContext_SignRecover (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *data,
   NSSCallback *uhhOpt,
   NSSItem *rvOpt,
@@ -2759,7 +2759,7 @@ NSSCryptoContext_SignRecover (
 NSS_EXTERN PRStatus
 NSSCryptoContext_Verify (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *data,
   NSSItem *signature,
   NSSCallback *uhhOpt
@@ -2773,7 +2773,7 @@ NSSCryptoContext_Verify (
 NSS_EXTERN PRStatus
 NSSCryptoContext_BeginVerify (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSCallback *uhhOpt
 );
 
@@ -2807,7 +2807,7 @@ NSSCryptoContext_FinishVerify (
 NSS_EXTERN NSSItem *
 NSSCryptoContext_VerifyRecover (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *signature,
   NSSCallback *uhhOpt,
   NSSItem *rvOpt,
@@ -2822,7 +2822,7 @@ NSSCryptoContext_VerifyRecover (
 NSS_EXTERN NSSItem *
 NSSCryptoContext_WrapSymmetricKey (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSSymmetricKey *keyToWrap,
   NSSCallback *uhhOpt,
   NSSItem *rvOpt,
@@ -2838,7 +2838,7 @@ NSSCryptoContext_WrapSymmetricKey (
 NSS_EXTERN NSSItem *
 NSSCryptoContext_Digest (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSItem *data,
   NSSCallback *uhhOpt,
   NSSItem *rvOpt,
@@ -2853,7 +2853,7 @@ NSSCryptoContext_Digest (
 NSS_EXTERN PRStatus
 NSSCryptoContext_BeginDigest (
   NSSCryptoContext *cc,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSCallback *uhhOpt
 );
 
diff --git a/security/nss/lib/pki/pki.h b/security/nss/lib/pki/pki.h
index 9c0c40424..8c602d643 100644
--- a/security/nss/lib/pki/pki.h
+++ b/security/nss/lib/pki/pki.h
@@ -53,9 +53,9 @@ static const char PKI_CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$ $Name$";
 PR_BEGIN_EXTERN_C
 
 NSS_EXTERN NSSToken *
-nssTrustDomain_FindTokenForAlgorithmAndParameters (
+nssTrustDomain_FindTokenForAlgNParam (
   NSSTrustDomain *td,
-  const NSSAlgorithmAndParameters *ap
+  const NSSAlgNParam *ap
 );
 
 NSS_EXTERN NSSToken *
@@ -284,7 +284,7 @@ nssPublicKey_GetID (
 NSS_EXTERN NSSItem *
 nssPublicKey_WrapSymmetricKey (
   NSSPublicKey *bk,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSSymmetricKey *keyToWrap,
   NSSCallback *uhh,
   NSSItem *rvOpt,
@@ -299,7 +299,7 @@ nssSymmetricKey_AddRef (
 NSS_EXTERN PRStatus
 nssSymmetricKey_DeriveSSLSessionKeys (
   NSSSymmetricKey *masterSecret,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSSymmetricKeyType bulkKeyType,
   NSSOperations operations,
   NSSProperties properties,
diff --git a/security/nss/lib/pki/pkibase.c b/security/nss/lib/pki/pkibase.c
index ebdc701fe..e294a6096 100644
--- a/security/nss/lib/pki/pkibase.c
+++ b/security/nss/lib/pki/pkibase.c
@@ -407,7 +407,7 @@ nssPKIObject_GetInstance (
 NSS_IMPLEMENT nssCryptokiObject *
 nssPKIObject_FindInstanceForAlgorithm (
   nssPKIObject *object,
-  const NSSAlgorithmAndParameters *ap
+  const NSSAlgNParam *ap
 )
 {
     nssCryptokiObject *instance = NULL;
diff --git a/security/nss/lib/pki/pkim.h b/security/nss/lib/pki/pkim.h
index 2bfe7735f..72cf56dc8 100644
--- a/security/nss/lib/pki/pkim.h
+++ b/security/nss/lib/pki/pkim.h
@@ -214,13 +214,13 @@ nssPKIObject_GetInstances (
 NSS_EXTERN nssCryptokiObject *
 nssPKIObject_FindInstanceForAlgorithm (
   nssPKIObject *object,
-  const NSSAlgorithmAndParameters *ap
+  const NSSAlgNParam *ap
 );
 
 NSS_EXTERN NSSToken *
 nssTrustDomain_FindSourceToken (
   NSSTrustDomain *td,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSToken *candidate
 );
 
@@ -244,14 +244,14 @@ nssTrustDomain_FindCRLsBySubject (
 NSS_EXTERN NSSCryptoContext *
 nssCryptoContext_Create (
   NSSTrustDomain *td,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSCallback *uhhOpt
 );
 
 NSS_EXTERN NSSCryptoContext *
 nssCryptoContext_CreateForSymmetricKey (
   NSSSymmetricKey *mk,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSCallback *uhh
 );
 
@@ -266,7 +266,7 @@ nssCertificate_Create (
 NSS_EXTERN nssCryptokiObject *
 nssCertificate_FindInstanceForAlgorithm (
   NSSCertificate *c,
-  NSSAlgorithmAndParameters *ap
+  NSSAlgNParam *ap
 );
 
 NSS_EXTERN void
@@ -359,7 +359,7 @@ nssSymmetricKey_GetInstance (
 NSS_EXTERN nssCryptokiObject *
 nssSymmetricKey_FindInstanceForAlgorithm (
   NSSSymmetricKey *mk,
-  const NSSAlgorithmAndParameters *ap
+  const NSSAlgNParam *ap
 );
 
 NSS_EXTERN NSSDER *
@@ -403,7 +403,7 @@ nssPublicKey_GetInstance (
 NSS_EXTERN nssCryptokiObject *
 nssPublicKey_FindInstanceForAlgorithm (
   NSSPublicKey *bk,
-  const NSSAlgorithmAndParameters *ap
+  const NSSAlgNParam *ap
 );
 
 NSS_EXTERN nssCryptokiObject *
@@ -433,7 +433,7 @@ nssPrivateKey_GetInstance (
 NSS_EXTERN nssCryptokiObject *
 nssPrivateKey_FindInstanceForAlgorithm (
   NSSPrivateKey *vk,
-  const NSSAlgorithmAndParameters *ap
+  const NSSAlgNParam *ap
 );
 
 NSS_EXTERN nssCryptokiObject *
diff --git a/security/nss/lib/pki/pkitm.h b/security/nss/lib/pki/pkitm.h
index 138bdbf13..c8d2da5bf 100644
--- a/security/nss/lib/pki/pkitm.h
+++ b/security/nss/lib/pki/pkitm.h
@@ -139,7 +139,7 @@ typedef struct nssPKIObjectCreatorStr
   NSSToken *destination;
   nssSession *session;
   PRBool persistent;
-  const NSSAlgorithmAndParameters *ap;
+  const NSSAlgNParam *ap;
   NSSCallback *uhh;
   const NSSUTF8 *nickname;
   NSSProperties properties;
diff --git a/security/nss/lib/pki/symmkey.c b/security/nss/lib/pki/symmkey.c
index c4675f0b7..fd89bddb6 100644
--- a/security/nss/lib/pki/symmkey.c
+++ b/security/nss/lib/pki/symmkey.c
@@ -143,7 +143,7 @@ nssSymmetricKey_GetInstance (
 NSS_IMPLEMENT nssCryptokiObject *
 nssSymmetricKey_FindInstanceForAlgorithm (
   NSSSymmetricKey *mk,
-  const NSSAlgorithmAndParameters *ap
+  const NSSAlgNParam *ap
 )
 {
     return nssPKIObject_FindInstanceForAlgorithm(&mk->object, ap);
@@ -305,7 +305,7 @@ NSSSymmetricKey_GetModule (
 NSS_IMPLEMENT NSSItem *
 nssSymmetricKey_Encrypt (
   NSSSymmetricKey *mk,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSItem *data,
   NSSCallback *uhh,
   NSSItem *rvOpt,
@@ -337,7 +337,7 @@ nssSymmetricKey_Encrypt (
 NSS_IMPLEMENT NSSItem *
 NSSSymmetricKey_Encrypt (
   NSSSymmetricKey *mk,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSItem *data,
   NSSCallback *uhh,
   NSSItem *rvOpt,
@@ -350,7 +350,7 @@ NSSSymmetricKey_Encrypt (
 NSS_IMPLEMENT NSSItem *
 nssSymmetricKey_Decrypt (
   NSSSymmetricKey *mk,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSItem *encryptedData,
   NSSCallback *uhh,
   NSSItem *rvOpt,
@@ -382,7 +382,7 @@ nssSymmetricKey_Decrypt (
 NSS_IMPLEMENT NSSItem *
 NSSSymmetricKey_Decrypt (
   NSSSymmetricKey *mk,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSItem *encryptedData,
   NSSCallback *uhh,
   NSSItem *rvOpt,
@@ -396,7 +396,7 @@ NSSSymmetricKey_Decrypt (
 NSS_IMPLEMENT NSSItem *
 nssSymmetricKey_Sign (
   NSSSymmetricKey *mk,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSItem *data,
   NSSCallback *uhh,
   NSSItem *rvOpt,
@@ -428,7 +428,7 @@ nssSymmetricKey_Sign (
 NSS_IMPLEMENT NSSItem *
 NSSSymmetricKey_Sign (
   NSSSymmetricKey *mk,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSItem *data,
   NSSCallback *uhh,
   NSSItem *rvOpt,
@@ -441,7 +441,7 @@ NSSSymmetricKey_Sign (
 NSS_IMPLEMENT PRStatus
 nssSymmetricKey_Verify (
   NSSSymmetricKey *mk,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSItem *data,
   NSSItem *signature,
   NSSCallback *uhh
@@ -480,7 +480,7 @@ nssSymmetricKey_Verify (
 NSS_IMPLEMENT PRStatus
 NSSSymmetricKey_Verify (
   NSSSymmetricKey *mk,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSItem *data,
   NSSItem *signature,
   NSSCallback *uhh
@@ -492,7 +492,7 @@ NSSSymmetricKey_Verify (
 NSS_IMPLEMENT NSSItem *
 NSSSymmetricKey_WrapSymmetricKey (
   NSSSymmetricKey *wrappingKey,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSSymmetricKey *keyToWrap,
   NSSCallback *uhh,
   NSSItem *rvOpt,
@@ -506,7 +506,7 @@ NSSSymmetricKey_WrapSymmetricKey (
 NSS_IMPLEMENT NSSItem *
 NSSSymmetricKey_WrapPrivateKey (
   NSSSymmetricKey *wrappingKey,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSPrivateKey *keyToWrap,
   NSSCallback *uhh,
   NSSItem *rvOpt,
@@ -520,7 +520,7 @@ NSSSymmetricKey_WrapPrivateKey (
 NSS_IMPLEMENT NSSSymmetricKey *
 NSSSymmetricKey_UnwrapSymmetricKey (
   NSSSymmetricKey *wrappingKey,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSItem *wrappedKey,
   NSSOID *target,
   PRUint32 keySizeOpt,
@@ -535,7 +535,7 @@ NSSSymmetricKey_UnwrapSymmetricKey (
 NSS_IMPLEMENT NSSPrivateKey *
 NSSSymmetricKey_UnwrapPrivateKey (
   NSSSymmetricKey *wrappingKey,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSItem *wrappedKey,
   NSSUTF8 *labelOpt,
   NSSItem *keyIDOpt,
@@ -552,7 +552,7 @@ NSSSymmetricKey_UnwrapPrivateKey (
 NSS_IMPLEMENT NSSSymmetricKey *
 nssSymmetricKey_DeriveSymmetricKey (
   NSSSymmetricKey *originalKey,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSSymmetricKeyType target,
   PRUint32 keySizeOpt,
   NSSOperations operations,
@@ -566,7 +566,7 @@ nssSymmetricKey_DeriveSymmetricKey (
 NSS_IMPLEMENT NSSSymmetricKey *
 NSSSymmetricKey_DeriveSymmetricKey (
   NSSSymmetricKey *originalKey,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSSymmetricKeyType target,
   PRUint32 keySizeOpt,
   NSSOperations operations,
@@ -580,7 +580,7 @@ NSSSymmetricKey_DeriveSymmetricKey (
 NSS_IMPLEMENT NSSCryptoContext *
 nssSymmetricKey_CreateCryptoContext (
   NSSSymmetricKey *mk,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSCallback *uhh
 )
 {
@@ -592,7 +592,7 @@ nssSymmetricKey_CreateCryptoContext (
 NSS_IMPLEMENT NSSCryptoContext *
 NSSSymmetricKey_CreateCryptoContext (
   NSSSymmetricKey *mk,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSCallback *uhh
 )
 {
@@ -602,7 +602,7 @@ NSSSymmetricKey_CreateCryptoContext (
 NSS_IMPLEMENT PRStatus
 nssSymmetricKey_DeriveSSLSessionKeys (
   NSSSymmetricKey *masterSecret,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSSymmetricKeyType bulkKeyType,
   NSSOperations operations,
   NSSProperties properties,
diff --git a/security/nss/lib/pki/trustdomain.c b/security/nss/lib/pki/trustdomain.c
index b06697b59..bd1f451a3 100644
--- a/security/nss/lib/pki/trustdomain.c
+++ b/security/nss/lib/pki/trustdomain.c
@@ -323,9 +323,9 @@ NSSTrustDomain_FindTokenBySlotName (
 }
 
 NSS_IMPLEMENT NSSToken *
-nssTrustDomain_FindTokenForAlgorithmAndParameters (
+nssTrustDomain_FindTokenForAlgNParam (
   NSSTrustDomain *td,
-  const NSSAlgorithmAndParameters *ap
+  const NSSAlgNParam *ap
 )
 {
     return nssSlotList_GetBestTokenForAlgorithm(td->slots.forCerts, ap);
@@ -337,13 +337,13 @@ nssTrustDomain_FindTokenForAlgorithm (
   const NSSOID *algorithm
 )
 {
-    NSSAlgorithmAndParameters *ap;
+    NSSAlgNParam *ap;
     NSSToken *token = NULL;
 
-    ap = nssOID_CreateAlgorithmAndParameters(algorithm, NULL, NULL);
+    ap = nssOID_CreateAlgNParam(algorithm, NULL, NULL);
     if (ap) {
-	token = nssTrustDomain_FindTokenForAlgorithmAndParameters(td, ap);
-	nssAlgorithmAndParameters_Destroy(ap);
+	token = nssTrustDomain_FindTokenForAlgNParam(td, ap);
+	nssAlgNParam_Destroy(ap);
     }
     return token;
 }
@@ -1222,7 +1222,7 @@ NSSTrustDomain_FindBestUserCertificateForSSLClientAuth (
   NSSUTF8 *sslHostOpt,
   NSSDER *rootCAsOpt[], /* null pointer for none */
   PRUint32 rootCAsMaxOpt, /* zero means list is null-terminated */
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSPolicies *policiesOpt
 )
 {
@@ -1236,7 +1236,7 @@ NSSTrustDomain_FindUserCertificatesForSSLClientAuth (
   NSSUTF8 *sslHostOpt,
   NSSDER *rootCAsOpt[], /* null pointer for none */
   PRUint32 rootCAsMaxOpt, /* zero means list is null-terminated */
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSPolicies *policiesOpt,
   NSSCertificate **rvOpt,
   PRUint32 rvLimit, /* zero for no limit */
@@ -1253,7 +1253,7 @@ NSSTrustDomain_FindBestUserCertificateForEmailSigning (
   NSSASCII7 *signerOpt,
   NSSASCII7 *recipientOpt,
   /* anything more here? */
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSPolicies *policiesOpt
 )
 {
@@ -1267,7 +1267,7 @@ NSSTrustDomain_FindUserCertificatesForEmailSigning (
   NSSASCII7 *signerOpt,
   NSSASCII7 *recipientOpt,
   /* anything more here? */
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSPolicies *policiesOpt,
   NSSCertificate **rvOpt,
   PRUint32 rvLimit, /* zero for no limit */
@@ -1497,7 +1497,7 @@ loser:
 NSS_IMPLEMENT PRStatus
 nssTrustDomain_GenerateKeyPair (
   NSSTrustDomain *td,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSPublicKey **pbkOpt,
   NSSPrivateKey **pvkOpt,
   NSSUTF8 *nicknameOpt,
@@ -1525,7 +1525,7 @@ nssTrustDomain_GenerateKeyPair (
 NSS_IMPLEMENT PRStatus
 NSSTrustDomain_GenerateKeyPair (
   NSSTrustDomain *td,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSPublicKey **pbkOpt,
   NSSPrivateKey **pvkOpt,
   NSSUTF8 *nicknameOpt,
@@ -1545,7 +1545,7 @@ NSSTrustDomain_GenerateKeyPair (
 NSS_IMPLEMENT NSSToken *
 nssTrustDomain_FindSourceToken (
   NSSTrustDomain *td,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSToken *candidate
 )
 {
@@ -1557,7 +1557,7 @@ nssTrustDomain_FindSourceToken (
 	/* We can't do the math on the destination token, find one
 	 * that is capable of doing it
 	 */
-	source = nssTrustDomain_FindTokenForAlgorithmAndParameters(td, ap);
+	source = nssTrustDomain_FindTokenForAlgNParam(td, ap);
     }
     return source;
 }
@@ -1565,7 +1565,7 @@ nssTrustDomain_FindSourceToken (
 NSS_IMPLEMENT NSSSymmetricKey *
 nssTrustDomain_GenerateSymmetricKey (
   NSSTrustDomain *td,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   PRUint32 keysize,
   NSSToken *destination,
   NSSCallback *uhhOpt
@@ -1589,7 +1589,7 @@ nssTrustDomain_GenerateSymmetricKey (
 NSS_IMPLEMENT NSSSymmetricKey *
 NSSTrustDomain_GenerateSymmetricKey (
   NSSTrustDomain *td,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   PRUint32 keysize,
   NSSToken *destination,
   NSSCallback *uhhOpt
@@ -1602,7 +1602,7 @@ NSSTrustDomain_GenerateSymmetricKey (
 NSS_IMPLEMENT NSSSymmetricKey *
 NSSTrustDomain_GenerateSymmetricKeyFromPassword (
   NSSTrustDomain *td,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSUTF8 *passwordOpt, /* if null, prompt */
   NSSToken *destinationOpt,
   NSSCallback *uhhOpt
@@ -1715,7 +1715,7 @@ NSSTrustDomain_CreateVolatileDomain (
 NSS_IMPLEMENT NSSCryptoContext *
 nssTrustDomain_CreateCryptoContext (
   NSSTrustDomain *td,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSCallback *uhhOpt
 )
 {
@@ -1731,7 +1731,7 @@ nssTrustDomain_CreateCryptoContext (
 NSS_IMPLEMENT NSSCryptoContext *
 NSSTrustDomain_CreateCryptoContext (
   NSSTrustDomain *td,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSCallback *uhhOpt
 )
 {
diff --git a/security/nss/lib/pki/volatiledomain.c b/security/nss/lib/pki/volatiledomain.c
index 046f89807..1e674ec2f 100644
--- a/security/nss/lib/pki/volatiledomain.c
+++ b/security/nss/lib/pki/volatiledomain.c
@@ -795,7 +795,7 @@ NSSVolatileDomain_FindBestUserCertificateForSSLClientAuth (
   NSSUTF8 *sslHostOpt,
   NSSDER *rootCAsOpt[], /* null pointer for none */
   PRUint32 rootCAsMaxOpt, /* zero means list is null-terminated */
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSPolicies *policiesOpt
 )
 {
@@ -809,7 +809,7 @@ NSSVolatileDomain_FindUserCertificatesForSSLClientAuth (
   NSSUTF8 *sslHostOpt,
   NSSDER *rootCAsOpt[], /* null pointer for none */
   PRUint32 rootCAsMaxOpt, /* zero means list is null-terminated */
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSPolicies *policiesOpt,
   NSSCertificate **rvOpt,
   PRUint32 rvLimit, /* zero for no limit */
@@ -826,7 +826,7 @@ NSSVolatileDomain_FindBestUserCertificateForEmailSigning (
   NSSASCII7 *signerOpt,
   NSSASCII7 *recipientOpt,
   /* anything more here? */
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSPolicies *policiesOpt
 )
 {
@@ -840,7 +840,7 @@ NSSVolatileDomain_FindUserCertificatesForEmailSigning (
   NSSASCII7 *signerOpt, /* fgmr or a more general name? */
   NSSASCII7 *recipientOpt,
   /* anything more here? */
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSPolicies *policiesOpt,
   NSSCertificate **rvOpt,
   PRUint32 rvLimit, /* zero for no limit */
@@ -854,7 +854,7 @@ NSSVolatileDomain_FindUserCertificatesForEmailSigning (
 NSS_IMPLEMENT PRStatus
 nssVolatileDomain_GenerateKeyPair (
   NSSVolatileDomain *vd,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSPrivateKey **pvkOpt,
   NSSPublicKey **pbkOpt,
   PRBool privateKeyIsSensitive,
@@ -884,7 +884,7 @@ nssVolatileDomain_GenerateKeyPair (
 NSS_IMPLEMENT PRStatus
 NSSVolatileDomain_GenerateKeyPair (
   NSSVolatileDomain *vd,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSPrivateKey **pvkOpt,
   NSSPublicKey **pbkOpt,
   PRBool privateKeyIsSensitive,
@@ -900,7 +900,7 @@ NSSVolatileDomain_GenerateKeyPair (
 NSS_IMPLEMENT NSSSymmetricKey *
 nssVolatileDomain_GenerateSymmetricKey (
   NSSVolatileDomain *vd,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   PRUint32 keysize,
   const NSSUTF8 *nicknameOpt,
   NSSOperations operations,
@@ -931,7 +931,7 @@ nssVolatileDomain_GenerateSymmetricKey (
 NSS_IMPLEMENT NSSSymmetricKey *
 NSSVolatileDomain_GenerateSymmetricKey (
   NSSVolatileDomain *vd,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   PRUint32 keysize,
   const NSSUTF8 *labelOpt,
   NSSOperations operations,
@@ -949,7 +949,7 @@ NSSVolatileDomain_GenerateSymmetricKey (
 NSS_IMPLEMENT NSSSymmetricKey *
 NSSVolatileDomain_GenerateSymmetricKeyFromPassword (
   NSSVolatileDomain *vd,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSUTF8 *passwordOpt, /* if null, prompt */
   NSSToken *destinationOpt,
   NSSCallback *uhhOpt
@@ -994,7 +994,7 @@ get_sym_key_type(const NSSOID *symKeyAlg)
 NSS_IMPLEMENT NSSSymmetricKey *
 nssVolatileDomain_UnwrapSymmetricKey (
   NSSVolatileDomain *vd,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSPrivateKey *wrapKey,
   NSSItem *wrappedKey,
   const NSSOID *targetKeyAlg,
@@ -1031,7 +1031,7 @@ nssVolatileDomain_UnwrapSymmetricKey (
 NSS_IMPLEMENT NSSSymmetricKey *
 NSSVolatileDomain_UnwrapSymmetricKey (
   NSSVolatileDomain *vd,
-  const NSSAlgorithmAndParameters *ap,
+  const NSSAlgNParam *ap,
   NSSPrivateKey *wrapKey,
   NSSItem *wrappedKey,
   const NSSOID *targetKeyAlg,
@@ -1050,7 +1050,7 @@ NSS_IMPLEMENT NSSSymmetricKey *
 NSSVolatileDomain_DeriveSymmetricKey (
   NSSVolatileDomain *vd,
   NSSPublicKey *bk,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSOID *target,
   PRUint32 keySizeOpt, /* zero for best allowed */
   NSSOperations operations,
@@ -1065,14 +1065,14 @@ NSSVolatileDomain_DeriveSymmetricKey (
 NSS_IMPLEMENT NSSItem *
 nssVolatileDomain_WrapSymmetricKey (
   NSSVolatileDomain *vd,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSSymmetricKey *keyToWrap,
   NSSCallback *uhhOpt,
   NSSItem *rvOpt,
   NSSArena *arenaOpt
 )
 {
-    const NSSAlgorithmAndParameters *ap = apOpt ? apOpt : vd->ap;
+    const NSSAlgNParam *ap = apOpt ? apOpt : vd->ap;
     if (!ap || vd->mk) {
 	nss_SetError(NSS_ERROR_INVALID_CRYPTO_CONTEXT);
 	return (NSSItem *)NULL;
@@ -1097,7 +1097,7 @@ nssVolatileDomain_WrapSymmetricKey (
 NSS_IMPLEMENT NSSItem *
 NSSVolatileDomain_WrapSymmetricKey (
   NSSVolatileDomain *vd,
-  const NSSAlgorithmAndParameters *apOpt,
+  const NSSAlgNParam *apOpt,
   NSSSymmetricKey *keyToWrap,
   NSSCallback *uhhOpt,
   NSSItem *rvOpt,
diff --git a/security/nss/lib/pki1/nsspki1.h b/security/nss/lib/pki1/nsspki1.h
index c0b9632dd..7464c681e 100644
--- a/security/nss/lib/pki1/nsspki1.h
+++ b/security/nss/lib/pki1/nsspki1.h
@@ -191,18 +191,18 @@ NSSOID_GetUTF8Encoding (
 
 
 /*
- * NSSOID_GetAlgorithmAndParameters
+ * NSSOID_GetAlgNParam
  */
 
-NSS_EXTERN NSSAlgorithmAndParameters *
-NSSOID_CreateAlgorithmAndParameters (
+NSS_EXTERN NSSAlgNParam *
+NSSOID_CreateAlgNParam (
   const NSSOID *oid,
   NSSParameters *parameters,
   NSSArena *arenaOpt
 );
 
-NSS_EXTERN NSSAlgorithmAndParameters *
-NSSOID_CreateAlgorithmAndParametersForKeyGen (
+NSS_EXTERN NSSAlgNParam *
+NSSOID_CreateAlgNParamForKeyGen (
   const NSSOID *oid,
   NSSParameters *parameters,
   NSSArena *arenaOpt
diff --git a/security/nss/lib/pki1/oid.c b/security/nss/lib/pki1/oid.c
index 91996b342..cf2820357 100644
--- a/security/nss/lib/pki1/oid.c
+++ b/security/nss/lib/pki1/oid.c
@@ -149,56 +149,56 @@ NSSOID_IsTag (
     return nssOID_IsTag(oid, tag);
 }
 
-NSS_IMPLEMENT NSSAlgorithmAndParameters *
-nssOID_CreateAlgorithmAndParameters (
+NSS_IMPLEMENT NSSAlgNParam *
+nssOID_CreateAlgNParam (
   const NSSOID *oid,
   NSSParameters *parameters,
   NSSArena *arenaOpt
 )
 {
     if (oid->mechanism != CKM_INVALID_MECHANISM) {
-	return nssAlgorithmAndParameters_Create(arenaOpt, oid, 
+	return nssAlgNParam_Create(arenaOpt, oid, 
 	                                        parameters);
     } else {
 	nss_SetError(NSS_ERROR_INVALID_NSSOID);
     }
-    return (NSSAlgorithmAndParameters *)NULL;
+    return (NSSAlgNParam *)NULL;
 }
 
-NSS_IMPLEMENT NSSAlgorithmAndParameters *
-NSSOID_CreateAlgorithmAndParameters (
+NSS_IMPLEMENT NSSAlgNParam *
+NSSOID_CreateAlgNParam (
   const NSSOID *oid,
   NSSParameters *parameters,
   NSSArena *arenaOpt
 )
 {
-    return nssOID_CreateAlgorithmAndParameters(oid, parameters, arenaOpt);
+    return nssOID_CreateAlgNParam(oid, parameters, arenaOpt);
 }
 
-NSS_IMPLEMENT NSSAlgorithmAndParameters *
-nssOID_CreateAlgorithmAndParametersForKeyGen (
+NSS_IMPLEMENT NSSAlgNParam *
+nssOID_CreateAlgNParamForKeyGen (
   const NSSOID *oid,
   NSSParameters *parameters,
   NSSArena *arenaOpt
 )
 {
     if (oid->mechanism != CKM_INVALID_MECHANISM) {
-	return nssAlgorithmAndParameters_CreateForKeyGen(arenaOpt, oid, 
+	return nssAlgNParam_CreateForKeyGen(arenaOpt, oid, 
 	                                                 parameters);
     } else {
 	nss_SetError(NSS_ERROR_INVALID_NSSOID);
     }
-    return (NSSAlgorithmAndParameters *)NULL;
+    return (NSSAlgNParam *)NULL;
 }
 
-NSS_IMPLEMENT NSSAlgorithmAndParameters *
-NSSOID_CreateAlgorithmAndParametersForKeyGen (
+NSS_IMPLEMENT NSSAlgNParam *
+NSSOID_CreateAlgNParamForKeyGen (
   const NSSOID *oid,
   NSSParameters *parameters,
   NSSArena *arenaOpt
 )
 {
-    return nssOID_CreateAlgorithmAndParametersForKeyGen(oid, parameters, 
+    return nssOID_CreateAlgNParamForKeyGen(oid, parameters, 
                                                         arenaOpt);
 }
 
diff --git a/security/nss/lib/pki1/pki1.h b/security/nss/lib/pki1/pki1.h
index c131ca2e5..0db9f7553 100644
--- a/security/nss/lib/pki1/pki1.h
+++ b/security/nss/lib/pki1/pki1.h
@@ -133,8 +133,8 @@ nssOID_GetTag (
   const NSSOID *oid
 );
 
-NSS_EXTERN NSSAlgorithmAndParameters *
-nssOID_CreateAlgorithmAndParameters (
+NSS_EXTERN NSSAlgNParam *
+nssOID_CreateAlgNParam (
   const NSSOID *oid,
   NSSParameters *parameters,
   NSSArena *arenaOpt
diff --git a/security/nss/lib/pkix/src/pkiglue.c b/security/nss/lib/pkix/src/pkiglue.c
index 95b215070..4f358a067 100644
--- a/security/nss/lib/pkix/src/pkiglue.c
+++ b/security/nss/lib/pkix/src/pkiglue.c
@@ -715,7 +715,7 @@ verify_signature (
     NSSPKIXTBSCertificate *tbsCert;
     NSSDER *tbsDER;
     NSSPublicKey *verifyKey;
-    NSSAlgorithmAndParameters *ap;
+    NSSAlgNParam *ap;
     NSSOID *alg;
     NSSItem *params;
 
@@ -755,7 +755,7 @@ verify_signature (
 	return PR_FAILURE;
     }
 
-    ap = NSSOID_CreateAlgorithmAndParameters(alg, params, NULL);
+    ap = NSSOID_CreateAlgNParam(alg, params, NULL);
     if (!ap) {
 	NSSPublicKey_Destroy(verifyKey);
 	return PR_FAILURE;
@@ -765,7 +765,7 @@ verify_signature (
 
     status = NSSPublicKey_Verify(verifyKey, ap, tbsDER, sig, NULL);
 
-    NSSAlgorithmAndParameters_Destroy(ap);
+    NSSAlgNParam_Destroy(ap);
     NSSPublicKey_Destroy(verifyKey);
     
     return status;
diff --git a/security/nss/lib/ssl/prelib.c b/security/nss/lib/ssl/prelib.c
index e86a0d247..5a3005c78 100644
--- a/security/nss/lib/ssl/prelib.c
+++ b/security/nss/lib/ssl/prelib.c
@@ -64,7 +64,7 @@ PEHeader *SSL_PreencryptedStreamToFile(PRFileDesc *fd, PEHeader *inHeader,
     NSSToken **tokens;
     NSSToken *token;
     NSSOID *skipjack;
-    NSSAlgorithmAndParameters *skipjackWrap;
+    NSSAlgNParam *skipjackWrap;
     int oldHeaderSize;
     PEHeader *header;
     SECStatus rv;
@@ -153,7 +153,7 @@ PEHeader *SSL_PreencryptedStreamToFile(PRFileDesc *fd, PEHeader *inHeader,
 	    NSSSymmetricKey_Destroy(Ks);
 	    return NULL;
 	}
-	skipjackWrap = NSSAlgorithmAndParameters_CreateWrap(NULL,
+	skipjackWrap = NSSAlgNParam_CreateWrap(NULL,
 	                             NSSAlgorithmType_Skipjack, NULL);
 	if (!skipjackWrap) {
 	    PORT_Free(header);
@@ -176,7 +176,7 @@ PEHeader *SSL_PreencryptedStreamToFile(PRFileDesc *fd, PEHeader *inHeader,
 	if (key == NULL) {
 	    PORT_Free(header);
 	    NSSSymmetricKey_Destroy(Ks);
-	    NSSAlgorithmAndParameters_Destroy(skipjackWrap);
+	    NSSAlgNParam_Destroy(skipjackWrap);
 	    return NULL;
 	}
 
@@ -190,7 +190,7 @@ PEHeader *SSL_PreencryptedStreamToFile(PRFileDesc *fd, PEHeader *inHeader,
 #endif
 	NSSSymmetricKey_Destroy(Ks);
 	NSSSymmetricKey_Destroy(key);
-	NSSAlgorithmAndParameters_Destroy(skipjackWrap);
+	NSSAlgNParam_Destroy(skipjackWrap);
 	if (rv != SECSuccess) {
 	    PORT_Free(header);
 	    return NULL;
@@ -223,7 +223,7 @@ PEHeader *SSL_PreencryptedFileToStream(PRFileDesc *fd, PEHeader *header,
     NSSToken **tokens;
     NSSToken *token;
     NSSOID *skipjack;
-    NSSAlgorithmAndParameters *skipjackWrap;
+    NSSAlgNParam *skipjackWrap;
     PRStatus rv;
     NSSItem item;
     
@@ -270,7 +270,7 @@ PEHeader *SSL_PreencryptedFileToStream(PRFileDesc *fd, PEHeader *header,
 	NSSSymmetricKey_Destroy(Ks);
 	return NULL;
     }
-    skipjackWrap = NSSAlgorithmAndParameters_CreateWrap(NULL,
+    skipjackWrap = NSSAlgNParam_CreateWrap(NULL,
                                               NSSAlgorithmType_Skipjack, NULL);
     if (!skipjackWrap) {
 	NSSSymmetricKey_Destroy(Ks);
diff --git a/security/nss/lib/ssl/ssl3con.c b/security/nss/lib/ssl/ssl3con.c
index c90c92650..14ddcf132 100644
--- a/security/nss/lib/ssl/ssl3con.c
+++ b/security/nss/lib/ssl/ssl3con.c
@@ -332,10 +332,10 @@ static const ssl3KEADef kea_defs[] = { /* indexed by SSL3KeyExchangeAlgorithm */
 };
 
 /* set by call_once or initialization? */
-static const NSSAlgorithmAndParameters *s_mac_md5_ap = NULL;
-static const NSSAlgorithmAndParameters *s_mac_sha_ap = NULL;
-static const NSSAlgorithmAndParameters *s_hmac_md5_ap = NULL;
-static const NSSAlgorithmAndParameters *s_hmac_sha_ap = NULL;
+static const NSSAlgNParam *s_mac_md5_ap = NULL;
+static const NSSAlgNParam *s_mac_sha_ap = NULL;
+static const NSSAlgNParam *s_hmac_md5_ap = NULL;
+static const NSSAlgNParam *s_hmac_sha_ap = NULL;
 
 /*
  * Number of bytes each hash algorithm produces
@@ -354,8 +354,8 @@ static const ssl3MACDef mac_defs[] = { /* indexed by SSL3MACAlgorithm */
     {  ssl_hmac_sha,/*  s_hmac_sha_ap,*/       40,  SHA1_LENGTH },
 };
 
-static const NSSAlgorithmAndParameters *s_ssl3PMSGen = NULL;
-static const NSSAlgorithmAndParameters *s_tlsPMSGen = NULL;
+static const NSSAlgNParam *s_ssl3PMSGen = NULL;
+static const NSSAlgNParam *s_tlsPMSGen = NULL;
 
 /* indexed by SSL3BulkCipher */
 const char * const ssl3_cipherName[] = {
@@ -812,7 +812,7 @@ ssl3_ComputeExportRSAKeyHash(NSSItem modulus, NSSItem publicExponent,
     unsigned int  bufLen;
     NSSItem     * it = NULL;
     PRUint8       buf[2*SSL3_RANDOM_LENGTH + 2 + 4096/8 + 2 + 4096/8];
-    NSSAlgorithmAndParameters *ap;
+    NSSAlgNParam *ap;
 
     bufLen = 2*SSL3_RANDOM_LENGTH + 2 + modulus.size + 2 + publicExponent.size;
     if (bufLen <= sizeof buf) {
@@ -848,7 +848,7 @@ ssl3_ComputeExportRSAKeyHash(NSSItem modulus, NSSItem publicExponent,
 	goto done;
     }
 
-    ap = NSSOID_CreateAlgorithmAndParameters(NSSOID_CreateFromTag(NSS_OID_MD5),
+    ap = NSSOID_CreateAlgNParam(NSSOID_CreateFromTag(NSS_OID_MD5),
                                              NULL, NULL);
     if (!ap) {
 	ssl_MapLowLevelError(SSL_ERROR_MD5_DIGEST_FAILURE);
@@ -859,7 +859,7 @@ ssl3_ComputeExportRSAKeyHash(NSSItem modulus, NSSItem publicExponent,
     hashData.data = hashes->md5;
     hashData.size = sizeof hashes->md5;
     it = NSSCryptoContext_Digest(hash, ap, &hashIt, NULL, &hashData, NULL);
-    NSSAlgorithmAndParameters_Destroy(ap);
+    NSSAlgNParam_Destroy(ap);
     PORT_Assert(it != NULL || it->size == MD5_LENGTH);
     if (it == NULL) {
 	ssl_MapLowLevelError(SSL_ERROR_MD5_DIGEST_FAILURE);
@@ -867,7 +867,7 @@ ssl3_ComputeExportRSAKeyHash(NSSItem modulus, NSSItem publicExponent,
 	goto done;
     }
 
-    ap = NSSOID_CreateAlgorithmAndParameters(NSSOID_CreateFromTag(NSS_OID_SHA1),
+    ap = NSSOID_CreateAlgNParam(NSSOID_CreateFromTag(NSS_OID_SHA1),
                                              NULL, NULL);
     if (!ap) {
 	ssl_MapLowLevelError(SSL_ERROR_SHA_DIGEST_FAILURE);
@@ -878,7 +878,7 @@ ssl3_ComputeExportRSAKeyHash(NSSItem modulus, NSSItem publicExponent,
     hashData.data = hashes->sha;
     hashData.size = sizeof hashes->sha;
     it = NSSCryptoContext_Digest(hash, ap, &hashIt, NULL, &hashData, NULL);
-    NSSAlgorithmAndParameters_Destroy(ap);
+    NSSAlgNParam_Destroy(ap);
     PORT_Assert(it != NULL || it->size == SHA1_LENGTH);
     if (it == NULL) {
 	ssl_MapLowLevelError(SSL_ERROR_SHA_DIGEST_FAILURE);
@@ -912,7 +912,7 @@ ssl3_ComputeDHKeyHash(NSSItem dh_p, NSSItem dh_g, NSSItem dh_Ys,
     unsigned int  bufLen;
     NSSItem     * it = NULL;
     PRUint8       buf[2*SSL3_RANDOM_LENGTH + 2 + 4096/8 + 2 + 4096/8];
-    NSSAlgorithmAndParameters *ap;
+    NSSAlgNParam *ap;
 
     bufLen = 2*SSL3_RANDOM_LENGTH + 2 + dh_p.size + 2 + dh_g.size + 2 + dh_Ys.size;
     if (bufLen <= sizeof buf) {
@@ -953,7 +953,7 @@ ssl3_ComputeDHKeyHash(NSSItem dh_p, NSSItem dh_g, NSSItem dh_Ys,
 	goto done;
     }
 
-    ap = NSSOID_CreateAlgorithmAndParameters(NSSOID_CreateFromTag(NSS_OID_MD5),
+    ap = NSSOID_CreateAlgNParam(NSSOID_CreateFromTag(NSS_OID_MD5),
                                              NULL, NULL);
     if (!ap) {
 	ssl_MapLowLevelError(SSL_ERROR_MD5_DIGEST_FAILURE);
@@ -964,7 +964,7 @@ ssl3_ComputeDHKeyHash(NSSItem dh_p, NSSItem dh_g, NSSItem dh_Ys,
     hashData.data = hashes->md5;
     hashData.size = sizeof hashes->md5;
     it = NSSCryptoContext_Digest(hash, ap, &hashIt, NULL, &hashData, NULL);
-    NSSAlgorithmAndParameters_Destroy(ap);
+    NSSAlgNParam_Destroy(ap);
     PORT_Assert(it != NULL || it->size == MD5_LENGTH);
     if (it == NULL) {
 	ssl_MapLowLevelError(SSL_ERROR_MD5_DIGEST_FAILURE);
@@ -972,7 +972,7 @@ ssl3_ComputeDHKeyHash(NSSItem dh_p, NSSItem dh_g, NSSItem dh_Ys,
 	goto done;
     }
 
-    ap = NSSOID_CreateAlgorithmAndParameters(NSSOID_CreateFromTag(NSS_OID_SHA1),
+    ap = NSSOID_CreateAlgNParam(NSSOID_CreateFromTag(NSS_OID_SHA1),
                                              NULL, NULL);
     if (!ap) {
 	ssl_MapLowLevelError(SSL_ERROR_SHA_DIGEST_FAILURE);
@@ -981,7 +981,7 @@ ssl3_ComputeDHKeyHash(NSSItem dh_p, NSSItem dh_g, NSSItem dh_Ys,
     }
 
     it = NSSCryptoContext_Digest(hash, ap, &hashIt, NULL, &hashData, NULL);
-    NSSAlgorithmAndParameters_Destroy(ap);
+    NSSAlgNParam_Destroy(ap);
     PORT_Assert(it != NULL || it->size == SHA1_LENGTH);
     if (it == NULL) {
 	ssl_MapLowLevelError(SSL_ERROR_SHA_DIGEST_FAILURE);
@@ -1973,7 +1973,7 @@ ssl3_DeriveMasterSecret(sslSocket *ss, NSSSymmetricKey *pmsOpt);
     PRBool isTLS  = (PRBool)(kea_def->tls_keygen ||
                              (pwSpec->version > SSL_LIBRARY_VERSION_3_0));
     PRBool isDH = (PRBool) (ss->ssl3->hs.kea_def->exchKeyType == ssl_kea_dh);
-    NSSAlgorithmAndParameters *msDerive = NULL;
+    NSSAlgNParam *msDerive = NULL;
     NSSSymmetricKey *ms = ssl->ssl3->pwSpec->master_secret;
     NSSSymmetricKey *fpms = NULL;
     NSSSSLMSParameters msParams;
@@ -1984,7 +1984,7 @@ ssl3_DeriveMasterSecret(sslSocket *ss, NSSSymmetricKey *pmsOpt);
     msParams.isDH = isDH;
     NSSITEM_INIT_BUF(&msParams.clientRandom, ss->ssl3->hs.client_random);
     NSSITEM_INIT_BUF(&msParams.serverRandom, ss->ssl3->hs.server_random);
-    msDerive = nssAlgorithmAndParameters_CreateSSLMSDerive(NULL, &msParams);
+    msDerive = nssAlgNParam_CreateSSLMSDerive(NULL, &msParams);
     if (!msDerive) {
 	goto loser;
     }
@@ -2048,7 +2048,7 @@ ssl3_DeriveMasterSecret(sslSocket *ss, NSSSymmetricKey *pmsOpt);
     return PR_SUCCESS;
 loser:
     if (msDerive) {
-	NSSAlgorithmAndParameters_Destroy(msDerive);
+	NSSAlgNParam_Destroy(msDerive);
     }
     return PR_FAILURE;
 }
@@ -2079,7 +2079,7 @@ ssl3_GenerateSessionKeys(sslSocket *ss, NSSSymmetricKey *pmsOpt)
     SSLCipherAlgorithm calg;
     NSSSymmetricKeyType bulkKeyType;
     NSSSSLSessionKeyParameters skParams = { 0 };
-    NSSAlgorithmAndParameters *skDerive = NULL;
+    NSSAlgNParam *skDerive = NULL;
     NSSOperations keyOps;
     NSSSymmetricKey *sessionKeys[4];
 
@@ -2115,7 +2115,7 @@ ssl3_GenerateSessionKeys(sslSocket *ss, NSSSymmetricKey *pmsOpt)
 	keySize = 0;
     }
 
-    skDerive = nssAlgorithmAndParameters_CreateSSLSessionKeyDerivation(NULL,
+    skDerive = nssAlgNParam_CreateSSLSessionKeyDerivation(NULL,
                                                                    &skParams);
     if (!skDerive) {
 	goto loser;
@@ -2142,13 +2142,13 @@ ssl3_GenerateSessionKeys(sslSocket *ss, NSSSymmetricKey *pmsOpt)
     pwSpec->server.write_cx     = 
       NSSSymmetricKey_CreateCryptoContext(sessionKeys[3], , );
 
-    NSSAlgorithmAndParameters_Destroy(skDerive);
+    NSSAlgNParam_Destroy(skDerive);
 
     return PR_SUCCESS;
 
 loser:
     if (skDerive) {
-	NSSAlgorithmAndParameters_Destroy(skDerive);
+	NSSAlgNParam_Destroy(skDerive);
     }
     ssl_MapLowLevelError(SSL_ERROR_SESSION_KEY_GEN_FAILURE);
     return PR_FAILURE;
@@ -6128,7 +6128,7 @@ ssl3_GenerateRSAPMS(sslSocket *ss, ssl3CipherSpec *spec,
 {
     NSSSymmetricKey * pms   = NULL;
     NSSToken *        token = serverKeyToken;
-    const NSSAlgorithmAndParameters *pmsAlg = ssl3_GetPMSAlg(ss->clientHelloVersion);
+    const NSSAlgNParam *pmsAlg = ssl3_GetPMSAlg(ss->clientHelloVersion);
 
     PORT_Assert( ssl_HaveSSL3HandshakeLock(ss) );
 
diff --git a/security/nss/lib/ssl/sslimpl.h b/security/nss/lib/ssl/sslimpl.h
index 690056f37..2f5164ec8 100644
--- a/security/nss/lib/ssl/sslimpl.h
+++ b/security/nss/lib/ssl/sslimpl.h
@@ -567,7 +567,7 @@ struct ssl3BulkCipherDefStr {
 struct ssl3MACDefStr {
     SSLMACAlgorithm  mac;
     /* XXX
-    const NSSAlgorithmAndParameters *ap;
+    const NSSAlgNParam *ap;
     */
     int              pad_size;
     int              mac_size;
author	ian.mcgreer%sun.com <devnull@localhost>	2003-01-09 20:00:19 +0000
committer	ian.mcgreer%sun.com <devnull@localhost>	2003-01-09 20:00:19 +0000
commit	7ccdb0f2f5f01ceaacea9ac60b5b8b2dd7ffa5f2 (patch)
tree	2a9f2e82ad770938c79d49d7254955dfb4c99541
parent	511ba17fce9770e9bb9a8b53eeb08e60691a6847 (diff)
download	nss-hg-7ccdb0f2f5f01ceaacea9ac60b5b8b2dd7ffa5f2.tar.gz