mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bugzilla Bug 305835: removed NSS_ENABLE_ECC ifdefs under nss/lib except 

nss/lib/{freebl,softoken,ssl}. r=nelsonb.
Modified Files:
	cryptohi/keyhi.h cryptohi/manifest.mn cryptohi/seckey.c
	cryptohi/secsign.c freebl/ec.c pk11wrap/manifest.mn
	pk11wrap/pk11akey.c pk11wrap/pk11cert.c pk11wrap/pk11mech.c
	pk11wrap/pk11obj.c pk11wrap/pk11skey.c pkcs12/manifest.mn
	pkcs12/p12d.c pkcs7/config.mk pkcs7/p7decode.c
	pkcs7/p7encode.c smime/cmssiginfo.c smime/cmsutil.c
	smime/config.mk
This commit is contained in:
wtchang%redhat.com 2005-09-02 01:24:57 +00:00
Родитель 16635b2e9e
Коммит 184d7ab678
19 изменённых файлов: 8 добавлений и 112 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
security/nss/lib/cryptohi/keyhi.h
Просмотреть файл

@ -35,7 +35,7 @@
* the terms of any one of the MPL, the GPL or the LGPL. * the terms of any one of the MPL, the GPL or the LGPL.
* *
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
/* $Id: keyhi.h,v 1.12 2005/02/24 00:35:51 julien.pierre.bugs%sun.com Exp $ */ /* $Id: keyhi.h,v 1.13 2005/09/02 01:24:42 wtchang%redhat.com Exp $ */
#ifndef _KEYHI_H_ #ifndef _KEYHI_H_
#define _KEYHI_H_ #define _KEYHI_H_
@ -283,9 +283,7 @@ SECKEY_AddPublicKeyToListTail( SECKEYPublicKeyList *list,
#define PUBKEY_LIST_NEXT(n) ((SECKEYPublicKeyListNode *)n->links.next) #define PUBKEY_LIST_NEXT(n) ((SECKEYPublicKeyListNode *)n->links.next)
#define PUBKEY_LIST_END(n,l) (((void *)n) == ((void *)&l->list)) #define PUBKEY_LIST_END(n,l) (((void *)n) == ((void *)&l->list))
#ifdef NSS_ENABLE_ECC
extern int SECKEY_ECParamsToKeySize(const SECItem *params); extern int SECKEY_ECParamsToKeySize(const SECItem *params);
#endif /* NSS_ENABLE_ECC */
SEC_END_PROTOS SEC_END_PROTOS

5
security/nss/lib/cryptohi/manifest.mn
Просмотреть файл

@ -65,8 +65,3 @@ LIBSRCS = \
$(NULL) $(NULL)
CSRCS = $(LIBSRCS) CSRCS = $(LIBSRCS)
ifdef NSS_ENABLE_ECC
DEFINES += -DNSS_ENABLE_ECC
endif

14
security/nss/lib/cryptohi/seckey.c
Просмотреть файл

@ -243,7 +243,6 @@ SECKEY_CreateDHPrivateKey(SECKEYDHParams *param, SECKEYPublicKey **pubk, void *c
SECKEYPrivateKey * SECKEYPrivateKey *
SECKEY_CreateECPrivateKey(SECKEYECParams *param, SECKEYPublicKey **pubk, void *cx) SECKEY_CreateECPrivateKey(SECKEYECParams *param, SECKEYPublicKey **pubk, void *cx)
{ {
#ifdef NSS_ENABLE_ECC
SECKEYPrivateKey *privk; SECKEYPrivateKey *privk;
PK11SlotInfo *slot = PK11_GetBestSlot(CKM_EC_KEY_PAIR_GEN,cx); PK11SlotInfo *slot = PK11_GetBestSlot(CKM_EC_KEY_PAIR_GEN,cx);
@ -255,9 +254,6 @@ SECKEY_CreateECPrivateKey(SECKEYECParams *param, SECKEYPublicKey **pubk, void *c
PK11_FreeSlot(slot); PK11_FreeSlot(slot);
return(privk); return(privk);
#else
return NULL;
#endif /* NSS_ENABLE_ECC */
} }
void void
@ -1105,7 +1101,6 @@ seckey_ExtractPublicKey(CERTSubjectPublicKeyInfo *spki)
break; break;
#ifdef NSS_ENABLE_ECC
case SEC_OID_ANSIX962_EC_PUBLIC_KEY: case SEC_OID_ANSIX962_EC_PUBLIC_KEY:
pubk->keyType = ecKey; pubk->keyType = ecKey;
pubk->u.ec.size = 0; pubk->u.ec.size = 0;
@ -1120,7 +1115,6 @@ seckey_ExtractPublicKey(CERTSubjectPublicKeyInfo *spki)
rv = SECITEM_CopyItem(arena, &pubk->u.ec.publicValue, &newOs); rv = SECITEM_CopyItem(arena, &pubk->u.ec.publicValue, &newOs);
if (rv == SECSuccess) return pubk; if (rv == SECSuccess) return pubk;
break; break;
#endif /* NSS_ENABLE_ECC */
default: default:
rv = SECFailure; rv = SECFailure;
@ -1317,7 +1311,6 @@ SECKEY_PublicKeyStrength(SECKEYPublicKey *pubk)
pubk->u.dh.publicValue.len - 1; pubk->u.dh.publicValue.len - 1;
case fortezzaKey: case fortezzaKey:
return PR_MAX(pubk->u.fortezza.KEAKey.len, pubk->u.fortezza.DSSKey.len); return PR_MAX(pubk->u.fortezza.KEAKey.len, pubk->u.fortezza.DSSKey.len);
#ifdef NSS_ENABLE_ECC
case ecKey: case ecKey:
/* Get the key size in bits and adjust */ /* Get the key size in bits and adjust */
if (pubk->u.ec.size == 0) { if (pubk->u.ec.size == 0) {
@ -1325,7 +1318,6 @@ SECKEY_PublicKeyStrength(SECKEYPublicKey *pubk)
SECKEY_ECParamsToKeySize(&pubk->u.ec.DEREncodedParams); SECKEY_ECParamsToKeySize(&pubk->u.ec.DEREncodedParams);
} }
return (pubk->u.ec.size + 7)/8; return (pubk->u.ec.size + 7)/8;
#endif /* NSS_ENABLE_ECC */
default: default:
break; break;
} }
@ -1342,14 +1334,12 @@ SECKEY_PublicKeyStrengthInBits(SECKEYPublicKey *pubk)
case dhKey: case dhKey:
case fortezzaKey: case fortezzaKey:
return SECKEY_PublicKeyStrength(pubk) * 8; /* 1 byte = 8 bits */ return SECKEY_PublicKeyStrength(pubk) * 8; /* 1 byte = 8 bits */
#ifdef NSS_ENABLE_ECC
case ecKey: case ecKey:
if (pubk->u.ec.size == 0) { if (pubk->u.ec.size == 0) {
pubk->u.ec.size = pubk->u.ec.size =
SECKEY_ECParamsToKeySize(&pubk->u.ec.DEREncodedParams); SECKEY_ECParamsToKeySize(&pubk->u.ec.DEREncodedParams);
} }
return pubk->u.ec.size; return pubk->u.ec.size;
#endif /* NSS_ENABLE_ECC */
default: default:
break; break;
} }
@ -1505,7 +1495,6 @@ SECKEY_CopyPublicKey(SECKEYPublicKey *pubk)
rv = SECITEM_CopyItem(arena, &copyk->u.dh.publicValue, rv = SECITEM_CopyItem(arena, &copyk->u.dh.publicValue,
&pubk->u.dh.publicValue); &pubk->u.dh.publicValue);
break; break;
#ifdef NSS_ENABLE_ECC
case ecKey: case ecKey:
copyk->u.ec.size = pubk->u.ec.size; copyk->u.ec.size = pubk->u.ec.size;
rv = SECITEM_CopyItem(arena,&copyk->u.ec.DEREncodedParams, rv = SECITEM_CopyItem(arena,&copyk->u.ec.DEREncodedParams,
@ -1514,7 +1503,6 @@ SECKEY_CopyPublicKey(SECKEYPublicKey *pubk)
rv = SECITEM_CopyItem(arena,&copyk->u.ec.publicValue, rv = SECITEM_CopyItem(arena,&copyk->u.ec.publicValue,
&pubk->u.ec.publicValue); &pubk->u.ec.publicValue);
break; break;
#endif /* NSS_ENABLE_ECC */
case nullKey: case nullKey:
return copyk; return copyk;
default: default:
@ -1673,7 +1661,6 @@ SECKEY_CreateSubjectPublicKeyInfo(SECKEYPublicKey *pubk)
} }
SECITEM_FreeItem(&params, PR_FALSE); SECITEM_FreeItem(&params, PR_FALSE);
break; break;
#ifdef NSS_ENABLE_ECC
case ecKey: case ecKey:
rv = SECITEM_CopyItem(arena, &params, rv = SECITEM_CopyItem(arena, &params,
&pubk->u.ec.DEREncodedParams); &pubk->u.ec.DEREncodedParams);
@ -1699,7 +1686,6 @@ SECKEY_CreateSubjectPublicKeyInfo(SECKEYPublicKey *pubk)
return spki; return spki;
} }
break; break;
#endif /* NSS_ENABLE_ECC */
case keaKey: case keaKey:
case dhKey: /* later... */ case dhKey: /* later... */

8
security/nss/lib/cryptohi/secsign.c
Просмотреть файл

@ -37,7 +37,7 @@
* the terms of any one of the MPL, the GPL or the LGPL. * the terms of any one of the MPL, the GPL or the LGPL.
* *
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
/* $Id: secsign.c,v 1.13 2005/08/16 01:52:17 wtchang%redhat.com Exp $ */ /* $Id: secsign.c,v 1.14 2005/09/02 01:24:44 wtchang%redhat.com Exp $ */
#include <stdio.h> #include <stdio.h>
#include "cryptohi.h" #include "cryptohi.h"
@ -121,13 +121,11 @@ SGN_NewContext(SECOidTag alg, SECKEYPrivateKey *key)
signalg = SEC_OID_MISSI_DSS; /* XXX Is there a better algid? */ signalg = SEC_OID_MISSI_DSS; /* XXX Is there a better algid? */
keyType = fortezzaKey; keyType = fortezzaKey;
break; break;
#ifdef NSS_ENABLE_ECC
case SEC_OID_ANSIX962_ECDSA_SIGNATURE_WITH_SHA1_DIGEST: case SEC_OID_ANSIX962_ECDSA_SIGNATURE_WITH_SHA1_DIGEST:
hashalg = SEC_OID_SHA1; hashalg = SEC_OID_SHA1;
signalg = SEC_OID_ANSIX962_EC_PUBLIC_KEY; signalg = SEC_OID_ANSIX962_EC_PUBLIC_KEY;
keyType = ecKey; keyType = ecKey;
break; break;
#endif /* NSS_ENABLE_ECC */
/* we don't implement MD4 hashes. /* we don't implement MD4 hashes.
* we *CERTAINLY* don't want to sign one! */ * we *CERTAINLY* don't want to sign one! */
case SEC_OID_PKCS1_MD4_WITH_RSA_ENCRYPTION: case SEC_OID_PKCS1_MD4_WITH_RSA_ENCRYPTION:
@ -374,11 +372,9 @@ SEC_DerSignData(PRArenaPool *arena, SECItem *result,
case dsaKey: case dsaKey:
algID = SEC_OID_ANSIX9_DSA_SIGNATURE_WITH_SHA1_DIGEST; algID = SEC_OID_ANSIX9_DSA_SIGNATURE_WITH_SHA1_DIGEST;
break; break;
#ifdef NSS_ENABLE_ECC
case ecKey: case ecKey:
algID = SEC_OID_ANSIX962_ECDSA_SIGNATURE_WITH_SHA1_DIGEST; algID = SEC_OID_ANSIX962_ECDSA_SIGNATURE_WITH_SHA1_DIGEST;
break; break;
#endif /* NSS_ENABLE_ECC */
default: default:
PORT_SetError(SEC_ERROR_INVALID_KEY); PORT_SetError(SEC_ERROR_INVALID_KEY);
return SECFailure; return SECFailure;
@ -506,12 +502,10 @@ SEC_GetSignatureAlgorithmOidTag(KeyType keyType, SECOidTag hashAlgTag)
break; break;
} }
break; break;
#ifdef NSS_ENABLE_ECC
case ecKey: case ecKey:
/* XXX For now only ECDSA with SHA1 is supported */ /* XXX For now only ECDSA with SHA1 is supported */
sigTag = SEC_OID_ANSIX962_ECDSA_SIGNATURE_WITH_SHA1_DIGEST; sigTag = SEC_OID_ANSIX962_ECDSA_SIGNATURE_WITH_SHA1_DIGEST;
break; break;
#endif /* NSS_ENABLE_ECC */
default: default:
break; break;
} }

4
security/nss/lib/freebl/ec.c
Просмотреть файл

@ -405,10 +405,10 @@ EC_ValidatePublicKey(ECParams *ecParams, SECItem *publicValue)
/* NOTE: We only support uncompressed points for now */ /* NOTE: We only support uncompressed points for now */
len = (ecParams->fieldID.size + 7) >> 3; len = (ecParams->fieldID.size + 7) >> 3;
if (publicValue->data[0] != EC_POINT_FORM_UNCOMPRESSED) { if (publicValue->data[0] != EC_POINT_FORM_UNCOMPRESSED) {
PORT_SetError(SEC_ERROR_UNSUPPORTED_EC_POINT_FORM); PORT_SetError(SEC_ERROR_UNSUPPORTED_EC_POINT_FORM);
return SECFailure; return SECFailure;
} else if (publicValue->len != (2 * len + 1)) { } else if (publicValue->len != (2 * len + 1)) {
PORT_SetError(SEC_ERROR_INPUT_LEN); PORT_SetError(SEC_ERROR_INPUT_LEN);
return SECFailure; return SECFailure;
}; };

5
security/nss/lib/pk11wrap/manifest.mn
Просмотреть файл

@ -86,8 +86,3 @@ LIBRARY_NAME = pk11wrap
ifdef DEBUG_PKCS11 ifdef DEBUG_PKCS11
DEFINES += -DDEBUG_MODULE DEFINES += -DDEBUG_MODULE
endif endif
ifdef NSS_ENABLE_ECC
DEFINES += -DNSS_ENABLE_ECC
endif

28
security/nss/lib/pk11wrap/pk11akey.c
Просмотреть файл

@ -152,7 +152,6 @@ PK11_ImportPublicKey(PK11SlotInfo *slot, SECKEYPublicKey *pubKey,
PK11_SETATTRS(attrs, CKA_VALUE, pubKey->u.dh.publicValue.data, PK11_SETATTRS(attrs, CKA_VALUE, pubKey->u.dh.publicValue.data,
pubKey->u.dh.publicValue.len); attrs++; pubKey->u.dh.publicValue.len); attrs++;
break; break;
#ifdef NSS_ENABLE_ECC
case ecKey: case ecKey:
keyType = CKK_EC; keyType = CKK_EC;
PK11_SETATTRS(attrs, CKA_VERIFY, &cktrue, sizeof(CK_BBOOL));attrs++; PK11_SETATTRS(attrs, CKA_VERIFY, &cktrue, sizeof(CK_BBOOL));attrs++;
@ -164,7 +163,6 @@ PK11_ImportPublicKey(PK11SlotInfo *slot, SECKEYPublicKey *pubKey,
PK11_SETATTRS(attrs, CKA_EC_POINT, pubKey->u.ec.publicValue.data, PK11_SETATTRS(attrs, CKA_EC_POINT, pubKey->u.ec.publicValue.data,
pubKey->u.ec.publicValue.len); attrs++; pubKey->u.ec.publicValue.len); attrs++;
break; break;
#endif /* NSS_ENABLE_ECC */
default: default:
PORT_SetError( SEC_ERROR_BAD_KEY ); PORT_SetError( SEC_ERROR_BAD_KEY );
return CK_INVALID_HANDLE; return CK_INVALID_HANDLE;
@ -221,9 +219,7 @@ PK11_ExtractPublicKey(PK11SlotInfo *slot,KeyType keyType,CK_OBJECT_HANDLE id)
CK_ATTRIBUTE template[8]; CK_ATTRIBUTE template[8];
CK_ATTRIBUTE *attrs= template; CK_ATTRIBUTE *attrs= template;
CK_ATTRIBUTE *modulus,*exponent,*base,*prime,*subprime,*value; CK_ATTRIBUTE *modulus,*exponent,*base,*prime,*subprime,*value;
#ifdef NSS_ENABLE_ECC
CK_ATTRIBUTE *ecparams; CK_ATTRIBUTE *ecparams;
#endif /* NSS_ENABLE_ECC */
/* if we didn't know the key type, get it */ /* if we didn't know the key type, get it */
if (keyType== nullKey) { if (keyType== nullKey) {
@ -242,11 +238,9 @@ PK11_ExtractPublicKey(PK11SlotInfo *slot,KeyType keyType,CK_OBJECT_HANDLE id)
case CKK_DH: case CKK_DH:
keyType = dhKey; keyType = dhKey;
break; break;
#ifdef NSS_ENABLE_ECC
case CKK_EC: case CKK_EC:
keyType = ecKey; keyType = ecKey;
break; break;
#endif /* NSS_ENABLE_ECC */
default: default:
PORT_SetError( SEC_ERROR_BAD_KEY ); PORT_SetError( SEC_ERROR_BAD_KEY );
return NULL; return NULL;
@ -351,7 +345,6 @@ PK11_ExtractPublicKey(PK11SlotInfo *slot,KeyType keyType,CK_OBJECT_HANDLE id)
crv = pk11_Attr2SecItem(arena,value,&pubKey->u.dh.publicValue); crv = pk11_Attr2SecItem(arena,value,&pubKey->u.dh.publicValue);
if (crv != CKR_OK) break; if (crv != CKR_OK) break;
break; break;
#ifdef NSS_ENABLE_ECC
case ecKey: case ecKey:
pubKey->u.ec.size = 0; pubKey->u.ec.size = 0;
ecparams = attrs; ecparams = attrs;
@ -374,7 +367,6 @@ PK11_ExtractPublicKey(PK11SlotInfo *slot,KeyType keyType,CK_OBJECT_HANDLE id)
crv = pk11_Attr2SecItem(arena,value,&pubKey->u.ec.publicValue); crv = pk11_Attr2SecItem(arena,value,&pubKey->u.ec.publicValue);
if (crv != CKR_OK) break; if (crv != CKR_OK) break;
break; break;
#endif /* NSS_ENABLE_ECC */
case fortezzaKey: case fortezzaKey:
case nullKey: case nullKey:
default: default:
@ -417,9 +409,7 @@ PK11_MakePrivKey(PK11SlotInfo *slot, KeyType keyType,
case CKK_DSA: keyType = dsaKey; break; case CKK_DSA: keyType = dsaKey; break;
case CKK_DH: keyType = dhKey; break; case CKK_DH: keyType = dhKey; break;
case CKK_KEA: keyType = fortezzaKey; break; case CKK_KEA: keyType = fortezzaKey; break;
#ifdef NSS_ENABLE_ECC
case CKK_EC: keyType = ecKey; break; case CKK_EC: keyType = ecKey; break;
#endif /* NSS_ENABLE_ECC */
default: default:
break; break;
} }
@ -578,12 +568,10 @@ pk11_loadPrivKey(PK11SlotInfo *slot,SECKEYPrivateKey *privKey,
ap->type = CKA_BASE; ap++; count++; extra_count++; ap->type = CKA_BASE; ap++; count++; extra_count++;
ap->type = CKA_VALUE; ap++; count++; extra_count++; ap->type = CKA_VALUE; ap++; count++; extra_count++;
break; break;
#ifdef NSS_ENABLE_ECC
case ecKey: case ecKey:
ap->type = CKA_EC_PARAMS; ap++; count++; extra_count++; ap->type = CKA_EC_PARAMS; ap++; count++; extra_count++;
ap->type = CKA_VALUE; ap++; count++; extra_count++; ap->type = CKA_VALUE; ap++; count++; extra_count++;
break; break;
#endif /* NSS_ENABLE_ECC */
default: default:
count = 0; count = 0;
extra_count = 0; extra_count = 0;
@ -710,7 +698,6 @@ PK11_GenerateKeyPair(PK11SlotInfo *slot,CK_MECHANISM_TYPE type,
{ CKA_VERIFY_RECOVER, NULL, 0}, { CKA_VERIFY_RECOVER, NULL, 0},
{ CKA_ENCRYPT, NULL, 0}, { CKA_ENCRYPT, NULL, 0},
}; };
#ifdef NSS_ENABLE_ECC
CK_ATTRIBUTE ecPubTemplate[] = { CK_ATTRIBUTE ecPubTemplate[] = {
{ CKA_EC_PARAMS, NULL, 0 }, { CKA_EC_PARAMS, NULL, 0 },
{ CKA_TOKEN, NULL, 0}, { CKA_TOKEN, NULL, 0},
@ -722,7 +709,6 @@ PK11_GenerateKeyPair(PK11SlotInfo *slot,CK_MECHANISM_TYPE type,
}; };
int ecPubCount = sizeof(ecPubTemplate)/sizeof(ecPubTemplate[0]); int ecPubCount = sizeof(ecPubTemplate)/sizeof(ecPubTemplate[0]);
SECKEYECParams * ecParams; SECKEYECParams * ecParams;
#endif /* NSS_ENABLE_ECC */
int dsaPubCount = sizeof(dsaPubTemplate)/sizeof(dsaPubTemplate[0]); int dsaPubCount = sizeof(dsaPubTemplate)/sizeof(dsaPubTemplate[0]);
/*CK_ULONG key_size = 0;*/ /*CK_ULONG key_size = 0;*/
@ -870,7 +856,6 @@ PK11_GenerateKeyPair(PK11SlotInfo *slot,CK_MECHANISM_TYPE type,
keyType = dhKey; keyType = dhKey;
test_mech.mechanism = CKM_DH_PKCS_DERIVE; test_mech.mechanism = CKM_DH_PKCS_DERIVE;
break; break;
#ifdef NSS_ENABLE_ECC
case CKM_EC_KEY_PAIR_GEN: case CKM_EC_KEY_PAIR_GEN:
ecParams = (SECKEYECParams *)param; ecParams = (SECKEYECParams *)param;
attrs = ecPubTemplate; attrs = ecPubTemplate;
@ -886,7 +871,6 @@ PK11_GenerateKeyPair(PK11SlotInfo *slot,CK_MECHANISM_TYPE type,
*/ */
test_mech.mechanism = CKM_ECDH1_DERIVE; test_mech.mechanism = CKM_ECDH1_DERIVE;
break; break;
#endif /* NSS_ENABLE_ECC */
default: default:
PORT_SetError( SEC_ERROR_BAD_KEY ); PORT_SetError( SEC_ERROR_BAD_KEY );
return NULL; return NULL;
@ -910,7 +894,6 @@ PK11_GenerateKeyPair(PK11SlotInfo *slot,CK_MECHANISM_TYPE type,
case CKM_DH_PKCS_DERIVE: case CKM_DH_PKCS_DERIVE:
mechanism_info.flags = CKF_DERIVE; mechanism_info.flags = CKF_DERIVE;
break; break;
#ifdef NSS_ENABLE_ECC
case CKM_ECDH1_DERIVE: case CKM_ECDH1_DERIVE:
mechanism_info.flags = CKF_DERIVE; mechanism_info.flags = CKF_DERIVE;
break; break;
@ -918,7 +901,6 @@ PK11_GenerateKeyPair(PK11SlotInfo *slot,CK_MECHANISM_TYPE type,
case CKM_ECDSA_SHA1: case CKM_ECDSA_SHA1:
mechanism_info.flags = CKF_SIGN | CKF_VERIFY; mechanism_info.flags = CKF_SIGN | CKF_VERIFY;
break; break;
#endif /* NSS_ENABLE_ECC */
default: default:
break; break;
} }
@ -1019,11 +1001,9 @@ PK11_GenerateKeyPair(PK11SlotInfo *slot,CK_MECHANISM_TYPE type,
case CKM_DH_PKCS_KEY_PAIR_GEN: case CKM_DH_PKCS_KEY_PAIR_GEN:
pubKeyIndex = &(*pubKey)->u.dh.publicValue; pubKeyIndex = &(*pubKey)->u.dh.publicValue;
break; break;
#ifdef NSS_ENABLE_ECC
case CKM_EC_KEY_PAIR_GEN: case CKM_EC_KEY_PAIR_GEN:
pubKeyIndex = &(*pubKey)->u.ec.publicValue; pubKeyIndex = &(*pubKey)->u.ec.publicValue;
break; break;
#endif /* NSS_ENABLE_ECC */
} }
PORT_Assert(pubKeyIndex != NULL); PORT_Assert(pubKeyIndex != NULL);
@ -1125,9 +1105,7 @@ PK11_ImportEncryptedPrivateKeyInfo(PK11SlotInfo *slot,
CKA_UNWRAP, CKA_DECRYPT, CKA_SIGN, CKA_SIGN_RECOVER }; CKA_UNWRAP, CKA_DECRYPT, CKA_SIGN, CKA_SIGN_RECOVER };
CK_ATTRIBUTE_TYPE dsaUsage[] = { CKA_SIGN }; CK_ATTRIBUTE_TYPE dsaUsage[] = { CKA_SIGN };
CK_ATTRIBUTE_TYPE dhUsage[] = { CKA_DERIVE }; CK_ATTRIBUTE_TYPE dhUsage[] = { CKA_DERIVE };
#ifdef NSS_ENABLE_ECC
CK_ATTRIBUTE_TYPE ecUsage[] = { CKA_SIGN, CKA_DERIVE }; CK_ATTRIBUTE_TYPE ecUsage[] = { CKA_SIGN, CKA_DERIVE };
#endif /* NSS_ENABLE_ECC */
if((epki == NULL) || (pwitem == NULL)) if((epki == NULL) || (pwitem == NULL))
return SECFailure; return SECFailure;
@ -1166,7 +1144,6 @@ PK11_ImportEncryptedPrivateKeyInfo(PK11SlotInfo *slot,
usage = dsaUsage; usage = dsaUsage;
usageCount = sizeof(dsaUsage)/sizeof(dsaUsage[0]); usageCount = sizeof(dsaUsage)/sizeof(dsaUsage[0]);
break; break;
#ifdef NSS_ENABLE_ECC
case ecKey: case ecKey:
key_type = CKK_EC; key_type = CKK_EC;
switch (keyUsage & (KU_DIGITAL_SIGNATURE|KU_KEY_AGREEMENT)) { switch (keyUsage & (KU_DIGITAL_SIGNATURE|KU_KEY_AGREEMENT)) {
@ -1185,7 +1162,6 @@ PK11_ImportEncryptedPrivateKeyInfo(PK11SlotInfo *slot,
break; break;
} }
break; break;
#endif /* NSS_ENABLE_ECC */
} }
try_faulty_3des: try_faulty_3des:
@ -1286,7 +1262,6 @@ pk11_private_key_encrypt_buffer_length(SECKEYPrivateKey *key)
{ {
CK_ATTRIBUTE rsaTemplate = { CKA_MODULUS, NULL, 0 }; CK_ATTRIBUTE rsaTemplate = { CKA_MODULUS, NULL, 0 };
CK_ATTRIBUTE dsaTemplate = { CKA_PRIME, NULL, 0 }; CK_ATTRIBUTE dsaTemplate = { CKA_PRIME, NULL, 0 };
#ifdef NSS_ENABLE_ECC
/* XXX We should normally choose an attribute such that /* XXX We should normally choose an attribute such that
* factor times its size is enough to hold the private key. * factor times its size is enough to hold the private key.
* For EC keys, we have no choice but to use CKA_EC_PARAMS, * For EC keys, we have no choice but to use CKA_EC_PARAMS,
@ -1295,7 +1270,6 @@ pk11_private_key_encrypt_buffer_length(SECKEYPrivateKey *key)
* is quite small so we bump up factor from 10 to 15. * is quite small so we bump up factor from 10 to 15.
*/ */
CK_ATTRIBUTE ecTemplate = { CKA_EC_PARAMS, NULL, 0 }; CK_ATTRIBUTE ecTemplate = { CKA_EC_PARAMS, NULL, 0 };
#endif /* NSS_ENABLE_ECC */
CK_ATTRIBUTE_PTR pTemplate; CK_ATTRIBUTE_PTR pTemplate;
CK_RV crv; CK_RV crv;
int length; int length;
@ -1313,12 +1287,10 @@ pk11_private_key_encrypt_buffer_length(SECKEYPrivateKey *key)
case dhKey: case dhKey:
pTemplate = &dsaTemplate; pTemplate = &dsaTemplate;
break; break;
#ifdef NSS_ENABLE_ECC
case ecKey: case ecKey:
pTemplate = &ecTemplate; pTemplate = &ecTemplate;
factor = 15; factor = 15;
break; break;
#endif /* NSS_ENABLE_ECC */
case fortezzaKey: case fortezzaKey:
default: default:
pTemplate = NULL; pTemplate = NULL;

4
security/nss/lib/pk11wrap/pk11cert.c
Просмотреть файл

@ -191,11 +191,9 @@ PK11_IsUserCert(PK11SlotInfo *slot, CERTCertificate *cert,
pubKey->u.dh.publicValue.len); pubKey->u.dh.publicValue.len);
break; break;
case ecKey: case ecKey:
#ifdef NSS_ENABLE_ECC
PK11_SETATTRS(&theTemplate,CKA_EC_POINT, PK11_SETATTRS(&theTemplate,CKA_EC_POINT,
pubKey->u.ec.publicValue.data, pubKey->u.ec.publicValue.data,
pubKey->u.ec.publicValue.len); pubKey->u.ec.publicValue.len);
#endif /* NSS_ENABLE_ECC */
break; break;
case keaKey: case keaKey:
case fortezzaKey: case fortezzaKey:
@ -759,9 +757,7 @@ PK11_GetPubIndexKeyID(CERTCertificate *cert) {
newItem = SECITEM_DupItem(&pubk->u.dh.publicValue); newItem = SECITEM_DupItem(&pubk->u.dh.publicValue);
break; break;
case ecKey: case ecKey:
#ifdef NSS_ENABLE_ECC
newItem = SECITEM_DupItem(&pubk->u.ec.publicValue); newItem = SECITEM_DupItem(&pubk->u.ec.publicValue);
#endif /* NSS_ENABLE_ECC */
break; break;
case fortezzaKey: case fortezzaKey:
default: default:

2
security/nss/lib/pk11wrap/pk11mech.c
Просмотреть файл

@ -1749,10 +1749,8 @@ pk11_mapSignKeyType(KeyType keyType)
case fortezzaKey: case fortezzaKey:
case dsaKey: case dsaKey:
return CKM_DSA; return CKM_DSA;
#ifdef NSS_ENABLE_ECC
case ecKey: case ecKey:
return CKM_ECDSA; return CKM_ECDSA;
#endif /* NSS_ENABLE_ECC */
case dhKey: case dhKey:
default: default:
break; break;

4
security/nss/lib/pk11wrap/pk11obj.c
Просмотреть файл

@ -505,11 +505,9 @@ int
PK11_SignatureLen(SECKEYPrivateKey *key) PK11_SignatureLen(SECKEYPrivateKey *key)
{ {
int val; int val;
#ifdef NSS_ENABLE_ECC
CK_ATTRIBUTE theTemplate = { CKA_EC_PARAMS, NULL, 0 }; CK_ATTRIBUTE theTemplate = { CKA_EC_PARAMS, NULL, 0 };
SECItem params = {siBuffer, NULL, 0}; SECItem params = {siBuffer, NULL, 0};
int length; int length;
#endif /* NSS_ENABLE_ECC */
switch (key->keyType) { switch (key->keyType) {
case rsaKey: case rsaKey:
@ -522,7 +520,6 @@ PK11_SignatureLen(SECKEYPrivateKey *key)
case fortezzaKey: case fortezzaKey:
case dsaKey: case dsaKey:
return 40; return 40;
#ifdef NSS_ENABLE_ECC
case ecKey: case ecKey:
if (PK11_GetAttributes(NULL, key->pkcs11Slot, key->pkcs11ID, if (PK11_GetAttributes(NULL, key->pkcs11Slot, key->pkcs11ID,
&theTemplate, 1) == CKR_OK) { &theTemplate, 1) == CKR_OK) {
@ -536,7 +533,6 @@ PK11_SignatureLen(SECKEYPrivateKey *key)
return length; return length;
} }
break; break;
#endif /* NSS_ENABLE_ECC */
default: default:
break; break;
} }

12
security/nss/lib/pk11wrap/pk11skey.c
Просмотреть файл

@ -1471,7 +1471,6 @@ PK11_PubDerive(SECKEYPrivateKey *privKey, SECKEYPublicKey *pubKey,
PORT_SetError( PK11_MapError(crv) ); PORT_SetError( PK11_MapError(crv) );
} }
break; break;
#ifdef NSS_ENABLE_ECC
case ecKey: case ecKey:
{ {
CK_BBOOL cktrue = CK_TRUE; CK_BBOOL cktrue = CK_TRUE;
@ -1525,10 +1524,6 @@ PK11_PubDerive(SECKEYPrivateKey *privKey, SECKEYPublicKey *pubKey,
if (crv == CKR_OK) return symKey; if (crv == CKR_OK) return symKey;
PORT_SetError( PK11_MapError(crv) ); PORT_SetError( PK11_MapError(crv) );
} }
#else
case ecKey:
break;
#endif /* NSS_ENABLE_ECC */
} }
PK11_FreeSymKey(symKey); PK11_FreeSymKey(symKey);
@ -1544,10 +1539,8 @@ PK11_PubDeriveWithKDF(SECKEYPrivateKey *privKey, SECKEYPublicKey *pubKey,
{ {
PK11SlotInfo *slot = privKey->pkcs11Slot; PK11SlotInfo *slot = privKey->pkcs11Slot;
PK11SymKey *symKey; PK11SymKey *symKey;
#ifdef NSS_ENABLE_ECC
CK_MECHANISM mechanism; CK_MECHANISM mechanism;
CK_RV crv; CK_RV crv;
#endif
/* get our key Structure */ /* get our key Structure */
symKey = pk11_CreateSymKey(slot,target,PR_TRUE,wincx); symKey = pk11_CreateSymKey(slot,target,PR_TRUE,wincx);
@ -1567,7 +1560,6 @@ PK11_PubDeriveWithKDF(SECKEYPrivateKey *privKey, SECKEYPublicKey *pubKey,
PK11_FreeSymKey(symKey); PK11_FreeSymKey(symKey);
return PK11_PubDerive(privKey, pubKey, isSender, randomA, randomB, return PK11_PubDerive(privKey, pubKey, isSender, randomA, randomB,
derive, target, operation, keySize, wincx); derive, target, operation, keySize, wincx);
#ifdef NSS_ENABLE_ECC
case ecKey: case ecKey:
{ {
CK_BBOOL cktrue = CK_TRUE; CK_BBOOL cktrue = CK_TRUE;
@ -1630,10 +1622,6 @@ PK11_PubDeriveWithKDF(SECKEYPrivateKey *privKey, SECKEYPublicKey *pubKey,
if (crv == CKR_OK) return symKey; if (crv == CKR_OK) return symKey;
PORT_SetError( PK11_MapError(crv) ); PORT_SetError( PK11_MapError(crv) );
} }
#else
case ecKey:
break;
#endif /* NSS_ENABLE_ECC */
} }
PK11_FreeSymKey(symKey); PK11_FreeSymKey(symKey);

4
security/nss/lib/pkcs12/manifest.mn
Просмотреть файл

@ -59,8 +59,4 @@ CSRCS = \
REQUIRES = dbm REQUIRES = dbm
ifdef NSS_ENABLE_ECC
DEFINES += -DNSS_ENABLE_ECC
endif
LIBRARY_NAME = pkcs12 LIBRARY_NAME = pkcs12

2
security/nss/lib/pkcs12/p12d.c
Просмотреть файл

@ -2793,11 +2793,9 @@ sec_pkcs12_get_public_value_and_type(sec_PKCS12SafeBag *certBag,
case rsaKey: case rsaKey:
pubValue = SECITEM_DupItem(&pubKey->u.rsa.modulus); pubValue = SECITEM_DupItem(&pubKey->u.rsa.modulus);
break; break;
#ifdef NSS_ENABLE_ECC
case ecKey: case ecKey:
pubValue = SECITEM_DupItem(&pubKey->u.ec.publicValue); pubValue = SECITEM_DupItem(&pubKey->u.ec.publicValue);
break; break;
#endif /* NSS_ENABLE_ECC */
default: default:
pubValue = NULL; pubValue = NULL;
} }

4
security/nss/lib/pkcs7/config.mk
Просмотреть файл

@ -44,7 +44,3 @@ TARGETS = $(LIBRARY)
SHARED_LIBRARY = SHARED_LIBRARY =
IMPORT_LIBRARY = IMPORT_LIBRARY =
PROGRAM = PROGRAM =
ifdef NSS_ENABLE_ECC
DEFINES += -DNSS_ENABLE_ECC
endif

4
security/nss/lib/pkcs7/p7decode.c
Просмотреть файл

@ -38,7 +38,7 @@
/* /*
* PKCS7 decoding, verification. * PKCS7 decoding, verification.
* *
* $Id: p7decode.c,v 1.18 2005/08/12 23:26:38 wtchang%redhat.com Exp $ * $Id: p7decode.c,v 1.19 2005/09/02 01:24:56 wtchang%redhat.com Exp $
*/ */
#include "nssrenam.h" #include "nssrenam.h"
@ -1675,9 +1675,7 @@ sec_pkcs7_verify_signature(SEC_PKCS7ContentInfo *cinfo,
algiddata = SECOID_FindOID (&(signerinfo->digestEncAlg.algorithm)); algiddata = SECOID_FindOID (&(signerinfo->digestEncAlg.algorithm));
if (algiddata == NULL || if (algiddata == NULL ||
((algiddata->offset != SEC_OID_PKCS1_RSA_ENCRYPTION) && ((algiddata->offset != SEC_OID_PKCS1_RSA_ENCRYPTION) &&
#ifdef NSS_ENABLE_ECC
(algiddata->offset != SEC_OID_ANSIX962_EC_PUBLIC_KEY) && (algiddata->offset != SEC_OID_ANSIX962_EC_PUBLIC_KEY) &&
#endif /* NSS_ENABLE_ECC */
(algiddata->offset != SEC_OID_ANSIX9_DSA_SIGNATURE))) { (algiddata->offset != SEC_OID_ANSIX9_DSA_SIGNATURE))) {
PORT_SetError (SEC_ERROR_PKCS7_BAD_SIGNATURE); PORT_SetError (SEC_ERROR_PKCS7_BAD_SIGNATURE);
goto done; goto done;

4
security/nss/lib/pkcs7/p7encode.c
Просмотреть файл

@ -38,7 +38,7 @@
/* /*
* PKCS7 encoding. * PKCS7 encoding.
* *
* $Id: p7encode.c,v 1.10 2005/08/11 23:11:38 wtchang%redhat.com Exp $ * $Id: p7encode.c,v 1.11 2005/09/02 01:24:56 wtchang%redhat.com Exp $
*/ */
#include "nssrenam.h" #include "nssrenam.h"
@ -870,7 +870,6 @@ sec_pkcs7_pick_sign_alg (SECOidTag hashalg, SECOidTag encalg)
default: default:
return SEC_OID_UNKNOWN; return SEC_OID_UNKNOWN;
} }
#ifdef NSS_ENABLE_ECC
case SEC_OID_ANSIX962_EC_PUBLIC_KEY: case SEC_OID_ANSIX962_EC_PUBLIC_KEY:
switch (hashalg) { switch (hashalg) {
case SEC_OID_SHA1: case SEC_OID_SHA1:
@ -878,7 +877,6 @@ sec_pkcs7_pick_sign_alg (SECOidTag hashalg, SECOidTag encalg)
default: default:
return SEC_OID_UNKNOWN; return SEC_OID_UNKNOWN;
} }
#endif /* NSS_ENABLE_ECC */
default: default:
break; break;
} }

4
security/nss/lib/smime/cmssiginfo.c
Просмотреть файл

@ -38,7 +38,7 @@
/* /*
* CMS signerInfo methods. * CMS signerInfo methods.
* *
* $Id: cmssiginfo.c,v 1.28 2005/08/12 23:26:38 wtchang%redhat.com Exp $ * $Id: cmssiginfo.c,v 1.29 2005/09/02 01:24:56 wtchang%redhat.com Exp $
*/ */
#include "cmslocal.h" #include "cmslocal.h"
@ -386,9 +386,7 @@ NSS_CMSSignerInfo_Verify(NSSCMSSignerInfo *signerinfo,
case SEC_OID_ANSIX9_DSA_SIGNATURE_WITH_SHA1_DIGEST: case SEC_OID_ANSIX9_DSA_SIGNATURE_WITH_SHA1_DIGEST:
case SEC_OID_PKCS1_SHA1_WITH_RSA_ENCRYPTION: case SEC_OID_PKCS1_SHA1_WITH_RSA_ENCRYPTION:
case SEC_OID_PKCS1_MD5_WITH_RSA_ENCRYPTION: case SEC_OID_PKCS1_MD5_WITH_RSA_ENCRYPTION:
#ifdef NSS_ENABLE_ECC
case SEC_OID_ANSIX962_EC_PUBLIC_KEY: case SEC_OID_ANSIX962_EC_PUBLIC_KEY:
#endif /* NSS_ENABLE_ECC */
/* ok */ /* ok */
break; break;
case SEC_OID_UNKNOWN: case SEC_OID_UNKNOWN:

4
security/nss/lib/smime/cmsutil.c
Просмотреть файл

@ -38,7 +38,7 @@
/* /*
* CMS miscellaneous utility functions. * CMS miscellaneous utility functions.
* *
* $Id: cmsutil.c,v 1.12 2005/08/12 23:22:28 wtchang%redhat.com Exp $ * $Id: cmsutil.c,v 1.13 2005/09/02 01:24:56 wtchang%redhat.com Exp $
*/ */
#include "nssrenam.h" #include "nssrenam.h"
@ -256,7 +256,6 @@ NSS_CMSUtil_MakeSignatureAlgorithm(SECOidTag hashalg, SECOidTag encalg)
default: default:
return SEC_OID_UNKNOWN; return SEC_OID_UNKNOWN;
} }
#ifdef NSS_ENABLE_ECC
case SEC_OID_ANSIX962_EC_PUBLIC_KEY: case SEC_OID_ANSIX962_EC_PUBLIC_KEY:
switch (hashalg) { switch (hashalg) {
case SEC_OID_SHA1: case SEC_OID_SHA1:
@ -264,7 +263,6 @@ NSS_CMSUtil_MakeSignatureAlgorithm(SECOidTag hashalg, SECOidTag encalg)
default: default:
return SEC_OID_UNKNOWN; return SEC_OID_UNKNOWN;
} }
#endif /* NSS_ENABLE_ECC */
default: default:
break; break;
} }

4
security/nss/lib/smime/config.mk
Просмотреть файл

@ -97,7 +97,3 @@ ifeq ($(OS_TARGET),SunOS)
# dependencies in the same directory where it resides. # dependencies in the same directory where it resides.
MKSHLIB += -R '$$ORIGIN' MKSHLIB += -R '$$ORIGIN'
endif endif
ifdef NSS_ENABLE_ECC
DEFINES += -DNSS_ENABLE_ECC
endif