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

Fix AIX 64 bit tools failure. For some reason the 64 bit compilier didn't like 

the massive switch statement. The new code is easier to read anyway now.
bug 70713
This commit is contained in:
relyea%netscape.com 2001-03-10 01:34:08 +00:00
Родитель cd16b81ceb
Коммит 9d9fb5174d
1 изменённых файлов: 156 добавлений и 95 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

251
security/nss/lib/softoken/pkcs11c.c
Просмотреть файл

@ -2837,7 +2837,7 @@ CK_RV NSC_GenerateRandom(CK_SESSION_HANDLE hSession,
*/
CK_RV
pk11_pbe_key_gen(SECOidTag algtag,CK_MECHANISM_PTR pMechanism,
char *buf,int *key_length, PRBool faulty3DES)
char *buf,CK_ULONG *key_length, PRBool faulty3DES)
{
SECAlgorithmID algid;
SECItem *pbe_key = NULL, mech;
@ -2890,6 +2890,138 @@ pk11_pbe_key_gen(SECOidTag algtag,CK_MECHANISM_PTR pMechanism,
return CKR_OK;
}
static CK_RV
nsc_SetupBulkKeyGen(CK_MECHANISM_TYPE mechanism,
CK_KEY_TYPE *key_type,CK_ULONG *key_length) {
CK_RV crv = CKR_OK;
switch (mechanism) {
case CKM_RC2_KEY_GEN:
*key_type = CKK_RC2;
if (*key_length == 0) crv = CKR_TEMPLATE_INCOMPLETE;
break;
#if NSS_SOFTOKEN_DOES_RC5
case CKM_RC5_KEY_GEN:
*key_type = CKK_RC5;
if (*key_length == 0) crv = CKR_TEMPLATE_INCOMPLETE;
break;
#endif
case CKM_RC4_KEY_GEN:
*key_type = CKK_RC4;
if (*key_length == 0) crv = CKR_TEMPLATE_INCOMPLETE;
break;
case CKM_GENERIC_SECRET_KEY_GEN:
*key_type = CKK_GENERIC_SECRET;
if (*key_length == 0) crv = CKR_TEMPLATE_INCOMPLETE;
break;
case CKM_CDMF_KEY_GEN:
*key_type = CKK_CDMF;
*key_length = 8;
break;
case CKM_DES_KEY_GEN:
*key_type = CKK_DES;
*key_length = 8;
break;
case CKM_DES2_KEY_GEN:
*key_type = CKK_DES2;
*key_length = 16;
break;
case CKM_DES3_KEY_GEN:
*key_type = CKK_DES3;
*key_length = 24;
break;
case CKM_AES_KEY_GEN:
*key_type = CKK_AES;
if (*key_length == 0) crv = CKR_TEMPLATE_INCOMPLETE;
break;
default:
PORT_Assert(0);
crv = CKR_MECHANISM_INVALID;
break;
}
return crv;
}
static CK_RV
nsc_SetupPBEKeyGen(CK_MECHANISM_TYPE mechanism,SECOidTag *algtag,
CK_KEY_TYPE *key_type,CK_ULONG *key_length) {
CK_RV crv = CKR_OK;
switch (mechanism) {
case CKM_PBE_MD2_DES_CBC:
*algtag = SEC_OID_PKCS5_PBE_WITH_MD2_AND_DES_CBC;
*key_type = CKK_DES;
break;
case CKM_PBE_MD5_DES_CBC:
*algtag = SEC_OID_PKCS5_PBE_WITH_MD5_AND_DES_CBC;
*key_type = CKK_DES;
break;
case CKM_PBE_SHA1_RC4_40:
*algtag = SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_40_BIT_RC4;
*key_length = 5;
*key_type = CKK_RC4;
break;
case CKM_PBE_SHA1_RC4_128:
*algtag = SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_128_BIT_RC4;
*key_length = 16;
*key_type = CKK_RC4;
break;
case CKM_PBE_SHA1_RC2_40_CBC:
*algtag = SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_40_BIT_RC2_CBC;
*key_length = 5;
*key_type = CKK_RC2;
break;
case CKM_PBE_SHA1_RC2_128_CBC:
*algtag = SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_128_BIT_RC2_CBC;
*key_length = 16;
*key_type = CKK_RC2;
break;
case CKM_PBE_SHA1_DES3_EDE_CBC:
*algtag = SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_3KEY_TRIPLE_DES_CBC;
*key_length = 24;
*key_type = CKK_DES3;
break;
case CKM_PBE_SHA1_DES2_EDE_CBC:
*algtag = SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_2KEY_TRIPLE_DES_CBC;
*key_length = 16;
*key_type = CKK_DES2;
break;
case CKM_NETSCAPE_PBE_SHA1_DES_CBC:
*algtag = SEC_OID_PKCS5_PBE_WITH_SHA1_AND_DES_CBC;
*key_type = CKK_DES;
break;
case CKM_NETSCAPE_PBE_SHA1_FAULTY_3DES_CBC:
case CKM_NETSCAPE_PBE_SHA1_TRIPLE_DES_CBC:
*algtag = SEC_OID_PKCS12_PBE_WITH_SHA1_AND_TRIPLE_DES_CBC;
*key_type = CKK_DES3;
break;
case CKM_NETSCAPE_PBE_SHA1_40_BIT_RC2_CBC:
*algtag = SEC_OID_PKCS12_PBE_WITH_SHA1_AND_40_BIT_RC2_CBC;
*key_type = CKK_RC2;
break;
case CKM_NETSCAPE_PBE_SHA1_128_BIT_RC2_CBC:
*algtag = SEC_OID_PKCS12_PBE_WITH_SHA1_AND_128_BIT_RC2_CBC;
*key_type = CKK_RC2;
break;
case CKM_NETSCAPE_PBE_SHA1_40_BIT_RC4:
*algtag = SEC_OID_PKCS12_PBE_WITH_SHA1_AND_40_BIT_RC4;
*key_type = CKK_RC4;
break;
case CKM_NETSCAPE_PBE_SHA1_128_BIT_RC4:
*algtag = SEC_OID_PKCS12_PBE_WITH_SHA1_AND_128_BIT_RC4;
*key_type = CKK_RC4;
break;
default:
PORT_Assert(0);
crv = CKR_MECHANISM_INVALID;
break;
}
return crv;
}
/* NSC_GenerateKey generates a secret key, creating a new key object. */
CK_RV NSC_GenerateKey(CK_SESSION_HANDLE hSession,
CK_MECHANISM_PTR pMechanism,CK_ATTRIBUTE_PTR pTemplate,CK_ULONG ulCount,
@ -2898,7 +3030,7 @@ CK_RV NSC_GenerateKey(CK_SESSION_HANDLE hSession,
PK11Object *key;
PK11Session *session;
PRBool checkWeak = PR_FALSE;
int key_length = 0;
CK_ULONG key_length = 0;
CK_KEY_TYPE key_type;
CK_OBJECT_CLASS objclass = CKO_SECRET_KEY;
CK_RV crv = CKR_OK;
@ -2916,6 +3048,7 @@ CK_RV NSC_GenerateKey(CK_SESSION_HANDLE hSession,
*/
PRBool faultyPBE3DES = PR_FALSE;
/*
* now lets create an object to hang the attributes off of
*/
@ -2949,123 +3082,51 @@ CK_RV NSC_GenerateKey(CK_SESSION_HANDLE hSession,
/* Now Set up the parameters to generate the key (based on mechanism) */
key_gen_type = pk11_bulk; /* bulk key by default */
switch (pMechanism->mechanism) {
case CKM_RC2_KEY_GEN:
key_type = CKK_RC2;
if (key_length == 0) crv = CKR_TEMPLATE_INCOMPLETE;
case CKM_CDMF_KEY_GEN:
case CKM_DES_KEY_GEN:
case CKM_DES2_KEY_GEN:
case CKM_DES3_KEY_GEN:
checkWeak = PR_TRUE;
break;
case CKM_RC2_KEY_GEN:
case CKM_RC4_KEY_GEN:
case CKM_GENERIC_SECRET_KEY_GEN:
case CKM_AES_KEY_GEN:
#if NSS_SOFTOKEN_DOES_RC5
case CKM_RC5_KEY_GEN:
key_type = CKK_RC5;
if (key_length == 0) crv = CKR_TEMPLATE_INCOMPLETE;
break;
#endif
case CKM_RC4_KEY_GEN:
key_type = CKK_RC4;
if (key_length == 0) crv = CKR_TEMPLATE_INCOMPLETE;
break;
case CKM_GENERIC_SECRET_KEY_GEN:
key_type = CKK_GENERIC_SECRET;
if (key_length == 0) crv = CKR_TEMPLATE_INCOMPLETE;
break;
case CKM_CDMF_KEY_GEN:
key_type = CKK_CDMF;
key_length = 8;
checkWeak = PR_TRUE;
break;
case CKM_DES_KEY_GEN:
key_type = CKK_DES;
key_length = 8;
checkWeak = PR_TRUE;
break;
case CKM_DES2_KEY_GEN:
key_type = CKK_DES2;
key_length = 16;
checkWeak = PR_TRUE;
break;
case CKM_DES3_KEY_GEN:
key_type = CKK_DES3;
key_length = 24;
checkWeak = PR_TRUE;
break;
case CKM_AES_KEY_GEN:
key_type = CKK_AES;
if (key_length == 0) crv = CKR_TEMPLATE_INCOMPLETE;
crv = nsc_SetupBulkKeyGen(pMechanism->mechanism,&key_type,&key_length);
break;
case CKM_SSL3_PRE_MASTER_KEY_GEN:
key_type = CKK_GENERIC_SECRET;
key_length = 48;
key_gen_type = pk11_ssl;
break;
case CKM_PBE_MD2_DES_CBC:
algtag = SEC_OID_PKCS5_PBE_WITH_MD2_AND_DES_CBC;
key_type = CKK_DES;
goto have_key_type;
case CKM_PBE_MD5_DES_CBC:
algtag = SEC_OID_PKCS5_PBE_WITH_MD5_AND_DES_CBC;
key_type = CKK_DES;
goto have_key_type;
case CKM_NETSCAPE_PBE_SHA1_DES_CBC:
algtag = SEC_OID_PKCS5_PBE_WITH_SHA1_AND_DES_CBC;
key_type = CKK_DES;
goto have_key_type;
case CKM_NETSCAPE_PBE_SHA1_FAULTY_3DES_CBC:
faultyPBE3DES = PR_TRUE;
case CKM_NETSCAPE_PBE_SHA1_TRIPLE_DES_CBC:
algtag = SEC_OID_PKCS12_PBE_WITH_SHA1_AND_TRIPLE_DES_CBC;
key_type = CKK_DES3;
goto have_key_type;
case CKM_NETSCAPE_PBE_SHA1_40_BIT_RC2_CBC:
algtag = SEC_OID_PKCS12_PBE_WITH_SHA1_AND_40_BIT_RC2_CBC;
key_type = CKK_RC2;
goto have_key_type;
case CKM_NETSCAPE_PBE_SHA1_DES_CBC:
case CKM_NETSCAPE_PBE_SHA1_128_BIT_RC2_CBC:
algtag = SEC_OID_PKCS12_PBE_WITH_SHA1_AND_128_BIT_RC2_CBC;
key_type = CKK_RC2;
goto have_key_type;
case CKM_NETSCAPE_PBE_SHA1_40_BIT_RC4:
algtag = SEC_OID_PKCS12_PBE_WITH_SHA1_AND_40_BIT_RC4;
key_type = CKK_RC4;
goto have_key_type;
case CKM_NETSCAPE_PBE_SHA1_128_BIT_RC4:
algtag = SEC_OID_PKCS12_PBE_WITH_SHA1_AND_128_BIT_RC4;
key_type = CKK_RC4;
goto have_key_type;
case CKM_PBE_SHA1_RC4_40:
algtag = SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_40_BIT_RC4;
key_length = 5;
key_type = CKK_RC4;
goto have_key_type;
case CKM_PBE_SHA1_RC4_128:
algtag = SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_128_BIT_RC4;
key_length = 16;
key_type = CKK_RC4;
goto have_key_type;
case CKM_PBE_SHA1_RC2_40_CBC:
algtag = SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_40_BIT_RC2_CBC;
key_length = 5;
key_type = CKK_RC2;
goto have_key_type;
case CKM_PBE_SHA1_RC2_128_CBC:
algtag = SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_128_BIT_RC2_CBC;
key_length = 16;
key_type = CKK_RC2;
goto have_key_type;
case CKM_PBE_SHA1_DES3_EDE_CBC:
algtag = SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_3KEY_TRIPLE_DES_CBC;
key_length = 24;
key_type = CKK_DES3;
goto have_key_type;
case CKM_PBE_SHA1_DES2_EDE_CBC:
algtag = SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_2KEY_TRIPLE_DES_CBC;
key_length = 16;
key_type = CKK_DES2;
checkWeak = PR_FALSE;
have_key_type:
case CKM_PBE_SHA1_RC2_128_CBC:
case CKM_PBE_SHA1_RC2_40_CBC:
case CKM_PBE_SHA1_RC4_128:
case CKM_PBE_SHA1_RC4_40:
case CKM_PBE_MD5_DES_CBC:
case CKM_PBE_MD2_DES_CBC:
key_gen_type = pk11_pbe;
crv = nsc_SetupPBEKeyGen(pMechanism->mechanism,&algtag,
&key_type,&key_length);
break;
default:
crv = CKR_MECHANISM_INVALID;
break;
}
/* make sure we aren't going to overflow the buffer */
if (sizeof(buf) < key_length) {
/* someone is getting pretty optimistic about how big their key can