diff options
| author | julien.pierre.boogz%sun.com <devnull@localhost> | 2009-03-31 23:49:06 +0000 |
|---|---|---|
| committer | julien.pierre.boogz%sun.com <devnull@localhost> | 2009-03-31 23:49:06 +0000 |
| commit | a2b2ea09804534f4bada5a9448ed0ee45b4e2853 (patch) | |
| tree | 8a188b6ea634e57d9733e01cacaec2e23776ac32 | |
| parent | 42047c9a9b60e6d6ed2387d47ac4c3059c507424 (diff) | |
| download | nss-hg-a2b2ea09804534f4bada5a9448ed0ee45b4e2853.tar.gz | |
Fix for bug 480280 . Fix broken Windows build. r=nelson
| -rw-r--r-- | security/nss/lib/pk11wrap/pk11akey.c | 7 | ||||
| -rw-r--r-- | security/nss/lib/pk11wrap/pk11skey.c | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/security/nss/lib/pk11wrap/pk11akey.c b/security/nss/lib/pk11wrap/pk11akey.c index 5095b2ae5..47f48d63b 100644 --- a/security/nss/lib/pk11wrap/pk11akey.c +++ b/security/nss/lib/pk11wrap/pk11akey.c @@ -210,7 +210,8 @@ PK11_ImportPublicKey(PK11SlotInfo *slot, SECKEYPublicKey *pubKey, pubKey->u.ec.publicValue.len); attrs++; } else { pubValue = SEC_ASN1EncodeItem(NULL, NULL, - &pubKey->u.ec.publicValue, SEC_OctetStringTemplate); + &pubKey->u.ec.publicValue, + SEC_ASN1_GET(SEC_OctetStringTemplate)); if (pubValue == NULL) { if (ckaId) { SECITEM_FreeItem(ckaId,PR_TRUE); @@ -293,7 +294,7 @@ pk11_get_EC_PointLenInBytes(PRArenaPool *arena, const SECItem *ecParams) /* decode the OID tag */ rv = SEC_QuickDERDecodeItem(arena, &oid, - SEC_ObjectIDTemplate, ecParams); + SEC_ASN1_GET(SEC_ObjectIDTemplate), ecParams); if (rv != SECSuccess) { /* could be explict curves, allow them to work if the * PKCS #11 module support them. If we try to parse the @@ -444,7 +445,7 @@ pk11_get_Decoded_ECPoint(PRArenaPool *arena, const SECItem *ecParams, encodedPublicValue.data = ecPoint->pValue; encodedPublicValue.len = ecPoint->ulValueLen; rv = SEC_QuickDERDecodeItem(arena, publicKeyValue, - SEC_OctetStringTemplate, &encodedPublicValue); + SEC_ASN1_GET(SEC_OctetStringTemplate), &encodedPublicValue); /* it coded correctly & we know the key length (and they match) * then we are done, return the results. */ diff --git a/security/nss/lib/pk11wrap/pk11skey.c b/security/nss/lib/pk11wrap/pk11skey.c index 20e155e5b..7f80a0680 100644 --- a/security/nss/lib/pk11wrap/pk11skey.c +++ b/security/nss/lib/pk11wrap/pk11skey.c @@ -1668,7 +1668,8 @@ PK11_PubDerive(SECKEYPrivateKey *privKey, SECKEYPublicKey *pubKey, mechParams->pPublicData = pubKey->u.ec.publicValue.data; } else { pubValue = SEC_ASN1EncodeItem(NULL, NULL, - &pubKey->u.ec.publicValue, SEC_OctetStringTemplate); + &pubKey->u.ec.publicValue, + SEC_ASN1_GET(SEC_OctetStringTemplate)); if (pubValue == NULL) { PORT_ZFree(mechParams, sizeof(CK_ECDH1_DERIVE_PARAMS)); break; @@ -1771,7 +1772,8 @@ pk11_PubDeriveECKeyWithKDF( mechParams->pPublicData = pubKey->u.ec.publicValue.data; } else { pubValue = SEC_ASN1EncodeItem(NULL, NULL, - &pubKey->u.ec.publicValue, SEC_OctetStringTemplate); + &pubKey->u.ec.publicValue, + SEC_ASN1_GET(SEC_OctetStringTemplate)); if (pubValue == NULL) { PORT_ZFree(mechParams, sizeof(CK_ECDH1_DERIVE_PARAMS)); PK11_FreeSymKey(symKey); |