|
 |
6fbbf4 |
diff -up ./nss/lib/softoken/pkcs11.c.add_encrypt_derive ./nss/lib/softoken/pkcs11.c
|
|
|
60ce18 |
--- ./nss/lib/softoken/pkcs11.c.add_encrypt_derive 2017-02-17 14:20:06.000000000 +0100
|
|
|
60ce18 |
+++ ./nss/lib/softoken/pkcs11.c 2017-05-26 14:10:26.633700334 +0200
|
|
|
60ce18 |
@@ -423,11 +423,22 @@ static const struct mechanismList mechan
|
|
|
6fbbf4 |
#endif
|
|
|
60ce18 |
/* --------------------- Secret Key Operations ------------------------ */
|
|
|
60ce18 |
{ CKM_GENERIC_SECRET_KEY_GEN, { 1, 32, CKF_GENERATE }, PR_TRUE },
|
|
|
60ce18 |
- { CKM_CONCATENATE_BASE_AND_KEY, { 1, 32, CKF_GENERATE }, PR_FALSE },
|
|
|
60ce18 |
- { CKM_CONCATENATE_BASE_AND_DATA, { 1, 32, CKF_GENERATE }, PR_FALSE },
|
|
|
60ce18 |
- { CKM_CONCATENATE_DATA_AND_BASE, { 1, 32, CKF_GENERATE }, PR_FALSE },
|
|
|
60ce18 |
- { CKM_XOR_BASE_AND_DATA, { 1, 32, CKF_GENERATE }, PR_FALSE },
|
|
|
60ce18 |
+ { CKM_CONCATENATE_BASE_AND_KEY, { 1, 32, CKF_DERIVE }, PR_FALSE },
|
|
|
60ce18 |
+ { CKM_CONCATENATE_BASE_AND_DATA, { 1, 32, CKF_DERIVE }, PR_FALSE },
|
|
|
60ce18 |
+ { CKM_CONCATENATE_DATA_AND_BASE, { 1, 32, CKF_DERIVE }, PR_FALSE },
|
|
|
60ce18 |
+ { CKM_XOR_BASE_AND_DATA, { 1, 32, CKF_DERIVE }, PR_FALSE },
|
|
|
60ce18 |
{ CKM_EXTRACT_KEY_FROM_KEY, { 1, 32, CKF_DERIVE }, PR_FALSE },
|
|
|
60ce18 |
+ { CKM_EXTRACT_KEY_FROM_KEY, { 1, 32, CKF_DERIVE }, PR_FALSE },
|
|
|
60ce18 |
+ { CKM_DES_ECB_ENCRYPT_DATA, { 1, 32, CKF_DERIVE }, PR_FALSE },
|
|
|
60ce18 |
+ { CKM_DES_CBC_ENCRYPT_DATA, { 1, 32, CKF_DERIVE }, PR_FALSE },
|
|
|
60ce18 |
+ { CKM_DES3_ECB_ENCRYPT_DATA, { 1, 32, CKF_DERIVE }, PR_FALSE },
|
|
|
60ce18 |
+ { CKM_DES3_CBC_ENCRYPT_DATA, { 1, 32, CKF_DERIVE }, PR_FALSE },
|
|
|
60ce18 |
+ { CKM_AES_ECB_ENCRYPT_DATA, { 1, 32, CKF_DERIVE }, PR_FALSE },
|
|
|
60ce18 |
+ { CKM_AES_CBC_ENCRYPT_DATA, { 1, 32, CKF_DERIVE }, PR_FALSE },
|
|
|
60ce18 |
+ { CKM_CAMELLIA_ECB_ENCRYPT_DATA, { 1, 32, CKF_DERIVE }, PR_FALSE },
|
|
|
60ce18 |
+ { CKM_CAMELLIA_CBC_ENCRYPT_DATA, { 1, 32, CKF_DERIVE }, PR_FALSE },
|
|
|
60ce18 |
+ { CKM_SEED_ECB_ENCRYPT_DATA, { 1, 32, CKF_DERIVE }, PR_FALSE },
|
|
|
60ce18 |
+ { CKM_SEED_CBC_ENCRYPT_DATA, { 1, 32, CKF_DERIVE }, PR_FALSE },
|
|
|
60ce18 |
/* ---------------------- SSL Key Derivations ------------------------- */
|
|
|
60ce18 |
{ CKM_SSL3_PRE_MASTER_KEY_GEN, { 48, 48, CKF_GENERATE }, PR_FALSE },
|
|
|
60ce18 |
{ CKM_SSL3_MASTER_KEY_DERIVE, { 48, 48, CKF_DERIVE }, PR_FALSE },
|
|
|
6fbbf4 |
diff -up ./nss/lib/softoken/pkcs11c.c.add_encrypt_derive ./nss/lib/softoken/pkcs11c.c
|
|
|
60ce18 |
--- ./nss/lib/softoken/pkcs11c.c.add_encrypt_derive 2017-02-17 14:20:06.000000000 +0100
|
|
|
60ce18 |
+++ ./nss/lib/softoken/pkcs11c.c 2017-05-26 14:09:34.990901108 +0200
|
|
|
60ce18 |
@@ -6213,6 +6213,44 @@ sftk_ANSI_X9_63_kdf(CK_BYTE **key, CK_UL
|
|
|
6fbbf4 |
#endif /* NSS_DISABLE_ECC */
|
|
|
6fbbf4 |
|
|
|
6fbbf4 |
/*
|
|
|
6fbbf4 |
+ * Handle The derive from a block encryption cipher
|
|
|
6fbbf4 |
+ */
|
|
|
6fbbf4 |
+CK_RV
|
|
|
60ce18 |
+sftk_DeriveEncrypt(SFTKObject *key, CK_ULONG keySize, void *cipherInfo,
|
|
|
60ce18 |
+ int blockSize, unsigned char *data, CK_ULONG len, SFTKCipher encrypt)
|
|
|
6fbbf4 |
+{
|
|
|
6fbbf4 |
+ unsigned char *tmpdata = NULL;
|
|
|
6fbbf4 |
+ SECStatus rv;
|
|
|
6fbbf4 |
+ unsigned int outLen;
|
|
|
6fbbf4 |
+ CK_RV crv;
|
|
|
6fbbf4 |
+
|
|
|
6fbbf4 |
+ if ((len % blockSize) != 0) {
|
|
|
60ce18 |
+ return CKR_MECHANISM_PARAM_INVALID;
|
|
|
6fbbf4 |
+ }
|
|
|
6fbbf4 |
+ if (keySize && (len < keySize)) {
|
|
|
60ce18 |
+ return CKR_MECHANISM_PARAM_INVALID;
|
|
|
6fbbf4 |
+ }
|
|
|
6fbbf4 |
+ if (keySize == 0) {
|
|
|
60ce18 |
+ keySize = len;
|
|
|
6fbbf4 |
+ }
|
|
|
6fbbf4 |
+
|
|
|
6fbbf4 |
+ tmpdata = PORT_Alloc(len);
|
|
|
6fbbf4 |
+ if (tmpdata == NULL) {
|
|
|
60ce18 |
+ return CKR_HOST_MEMORY;
|
|
|
6fbbf4 |
+ }
|
|
|
6fbbf4 |
+ rv = (*encrypt)(cipherInfo, tmpdata, &outLen, len, data, len);
|
|
|
6fbbf4 |
+ if (rv != SECSuccess) {
|
|
|
60ce18 |
+ crv = sftk_MapCryptError(PORT_GetError());
|
|
|
60ce18 |
+ PORT_ZFree(tmpdata, len);
|
|
|
60ce18 |
+ return crv;
|
|
|
6fbbf4 |
+ }
|
|
|
6fbbf4 |
+
|
|
|
60ce18 |
+ crv = sftk_forceAttribute(key, CKA_VALUE, tmpdata, keySize);
|
|
|
60ce18 |
+ PORT_ZFree(tmpdata, len);
|
|
|
6fbbf4 |
+ return crv;
|
|
|
6fbbf4 |
+}
|
|
|
6fbbf4 |
+
|
|
|
6fbbf4 |
+/*
|
|
|
6fbbf4 |
* SSL Key generation given pre master secret
|
|
|
6fbbf4 |
*/
|
|
|
6fbbf4 |
#define NUM_MIXERS 9
|
|
|
60ce18 |
@@ -6257,6 +6295,9 @@ NSC_DeriveKey(CK_SESSION_HANDLE hSession
|
|
|
60ce18 |
CK_KEY_TYPE keyType = CKK_GENERIC_SECRET;
|
|
|
60ce18 |
CK_OBJECT_CLASS classType = CKO_SECRET_KEY;
|
|
|
6fbbf4 |
CK_KEY_DERIVATION_STRING_DATA *stringPtr;
|
|
|
6fbbf4 |
+ CK_AES_CBC_ENCRYPT_DATA_PARAMS *aesEncryptPtr;
|
|
|
6fbbf4 |
+ CK_DES_CBC_ENCRYPT_DATA_PARAMS *desEncryptPtr;
|
|
|
6fbbf4 |
+ void *cipherInfo;
|
|
|
60ce18 |
CK_MECHANISM_TYPE mechanism = pMechanism->mechanism;
|
|
|
60ce18 |
PRBool isTLS = PR_FALSE;
|
|
|
60ce18 |
PRBool isDH = PR_FALSE;
|
|
|
60ce18 |
@@ -6266,6 +6307,7 @@ NSC_DeriveKey(CK_SESSION_HANDLE hSession
|
|
|
60ce18 |
unsigned int outLen;
|
|
|
60ce18 |
unsigned char sha_out[SHA1_LENGTH];
|
|
|
60ce18 |
unsigned char key_block[NUM_MIXERS * SFTK_MAX_MAC_LENGTH];
|
|
|
60ce18 |
+ unsigned char des3key[24];
|
|
|
60ce18 |
PRBool isFIPS;
|
|
|
60ce18 |
HASH_HashType hashType;
|
|
|
60ce18 |
PRBool extractValue = PR_TRUE;
|
|
|
60ce18 |
@@ -6935,6 +6977,168 @@ NSC_DeriveKey(CK_SESSION_HANDLE hSession
|
|
|
60ce18 |
break;
|
|
|
60ce18 |
}
|
|
|
6fbbf4 |
|
|
|
60ce18 |
+ case CKM_DES_ECB_ENCRYPT_DATA:
|
|
|
60ce18 |
+ stringPtr = (CK_KEY_DERIVATION_STRING_DATA *)pMechanism->pParameter;
|
|
|
60ce18 |
+ cipherInfo = DES_CreateContext((unsigned char *)att->attrib.pValue,
|
|
|
60ce18 |
+ NULL, NSS_DES, PR_TRUE);
|
|
|
60ce18 |
+ if (cipherInfo == NULL) {
|
|
|
60ce18 |
+ crv = CKR_HOST_MEMORY;
|
|
|
60ce18 |
+ break;
|
|
|
60ce18 |
+ }
|
|
|
60ce18 |
+ crv = sftk_DeriveEncrypt(key, keySize, cipherInfo, 8,
|
|
|
60ce18 |
+ stringPtr->pData, stringPtr->ulLen, (SFTKCipher)DES_Encrypt);
|
|
|
60ce18 |
+ DES_DestroyContext(cipherInfo, PR_TRUE);
|
|
|
60ce18 |
+ break;
|
|
|
6fbbf4 |
+
|
|
|
60ce18 |
+ case CKM_DES_CBC_ENCRYPT_DATA:
|
|
|
60ce18 |
+ desEncryptPtr = (CK_DES_CBC_ENCRYPT_DATA_PARAMS *)
|
|
|
60ce18 |
+ pMechanism->pParameter;
|
|
|
60ce18 |
+ cipherInfo = DES_CreateContext((unsigned char *)att->attrib.pValue,
|
|
|
60ce18 |
+ desEncryptPtr->iv, NSS_DES_CBC, PR_TRUE);
|
|
|
60ce18 |
+ if (cipherInfo == NULL) {
|
|
|
60ce18 |
+ crv = CKR_HOST_MEMORY;
|
|
|
60ce18 |
+ break;
|
|
|
60ce18 |
+ }
|
|
|
60ce18 |
+ crv = sftk_DeriveEncrypt(key, keySize, cipherInfo, 8,
|
|
|
60ce18 |
+ desEncryptPtr->pData, desEncryptPtr->length,
|
|
|
60ce18 |
+ (SFTKCipher)DES_Encrypt);
|
|
|
60ce18 |
+ DES_DestroyContext(cipherInfo, PR_TRUE);
|
|
|
60ce18 |
+ break;
|
|
|
6fbbf4 |
+
|
|
|
60ce18 |
+ case CKM_DES3_ECB_ENCRYPT_DATA:
|
|
|
60ce18 |
+ stringPtr = (CK_KEY_DERIVATION_STRING_DATA *)pMechanism->pParameter;
|
|
|
60ce18 |
+ if (att->attrib.ulValueLen == 16) {
|
|
|
60ce18 |
+ PORT_Memcpy(des3key, att->attrib.pValue, 16);
|
|
|
60ce18 |
+ PORT_Memcpy(des3key + 16, des3key, 8);
|
|
|
60ce18 |
+ } else if (att->attrib.ulValueLen == 24) {
|
|
|
60ce18 |
+ PORT_Memcpy(des3key, att->attrib.pValue, 24);
|
|
|
60ce18 |
+ } else {
|
|
|
60ce18 |
+ crv = CKR_KEY_SIZE_RANGE;
|
|
|
60ce18 |
+ break;
|
|
|
60ce18 |
+ }
|
|
|
60ce18 |
+ cipherInfo = DES_CreateContext(des3key, NULL, NSS_DES_EDE3, PR_TRUE);
|
|
|
60ce18 |
+ PORT_Memset(des3key, 0, 24);
|
|
|
60ce18 |
+ if (cipherInfo == NULL) {
|
|
|
60ce18 |
+ crv = CKR_HOST_MEMORY;
|
|
|
60ce18 |
+ break;
|
|
|
60ce18 |
+ }
|
|
|
60ce18 |
+ crv = sftk_DeriveEncrypt(key, keySize, cipherInfo, 8,
|
|
|
60ce18 |
+ stringPtr->pData, stringPtr->ulLen, (SFTKCipher)DES_Encrypt);
|
|
|
60ce18 |
+ DES_DestroyContext(cipherInfo, PR_TRUE);
|
|
|
60ce18 |
+ break;
|
|
|
6fbbf4 |
+
|
|
|
60ce18 |
+ case CKM_DES3_CBC_ENCRYPT_DATA:
|
|
|
60ce18 |
+ desEncryptPtr = (CK_DES_CBC_ENCRYPT_DATA_PARAMS *)
|
|
|
60ce18 |
+ pMechanism->pParameter;
|
|
|
60ce18 |
+ if (att->attrib.ulValueLen == 16) {
|
|
|
60ce18 |
+ PORT_Memcpy(des3key, att->attrib.pValue, 16);
|
|
|
60ce18 |
+ PORT_Memcpy(des3key + 16, des3key, 8);
|
|
|
60ce18 |
+ } else if (att->attrib.ulValueLen == 24) {
|
|
|
60ce18 |
+ PORT_Memcpy(des3key, att->attrib.pValue, 24);
|
|
|
60ce18 |
+ } else {
|
|
|
60ce18 |
+ crv = CKR_KEY_SIZE_RANGE;
|
|
|
60ce18 |
+ break;
|
|
|
60ce18 |
+ }
|
|
|
60ce18 |
+ cipherInfo = DES_CreateContext(des3key, desEncryptPtr->iv,
|
|
|
60ce18 |
+ NSS_DES_EDE3_CBC, PR_TRUE);
|
|
|
60ce18 |
+ PORT_Memset(des3key, 0, 24);
|
|
|
60ce18 |
+ if (cipherInfo == NULL) {
|
|
|
60ce18 |
+ crv = CKR_HOST_MEMORY;
|
|
|
60ce18 |
+ break;
|
|
|
60ce18 |
+ }
|
|
|
60ce18 |
+ crv = sftk_DeriveEncrypt(key, keySize, cipherInfo, 8,
|
|
|
60ce18 |
+ desEncryptPtr->pData, desEncryptPtr->length,
|
|
|
60ce18 |
+ (SFTKCipher)DES_Encrypt);
|
|
|
60ce18 |
+ DES_DestroyContext(cipherInfo, PR_TRUE);
|
|
|
60ce18 |
+ break;
|
|
|
6fbbf4 |
+
|
|
|
60ce18 |
+ case CKM_AES_ECB_ENCRYPT_DATA:
|
|
|
60ce18 |
+ stringPtr = (CK_KEY_DERIVATION_STRING_DATA *)pMechanism->pParameter;
|
|
|
60ce18 |
+ cipherInfo = AES_CreateContext((unsigned char *)att->attrib.pValue,
|
|
|
60ce18 |
+ NULL, NSS_AES, PR_TRUE, att->attrib.ulValueLen, 16);
|
|
|
60ce18 |
+ if (cipherInfo == NULL) {
|
|
|
60ce18 |
+ crv = CKR_HOST_MEMORY;
|
|
|
60ce18 |
+ break;
|
|
|
60ce18 |
+ }
|
|
|
60ce18 |
+ crv = sftk_DeriveEncrypt(key, keySize, cipherInfo, 16,
|
|
|
60ce18 |
+ stringPtr->pData, stringPtr->ulLen, (SFTKCipher)AES_Encrypt);
|
|
|
60ce18 |
+ AES_DestroyContext(cipherInfo, PR_TRUE);
|
|
|
60ce18 |
+ break;
|
|
|
6fbbf4 |
+
|
|
|
60ce18 |
+ case CKM_AES_CBC_ENCRYPT_DATA:
|
|
|
60ce18 |
+ aesEncryptPtr = (CK_AES_CBC_ENCRYPT_DATA_PARAMS *)
|
|
|
60ce18 |
+ pMechanism->pParameter;
|
|
|
60ce18 |
+ cipherInfo = AES_CreateContext((unsigned char *)att->attrib.pValue,
|
|
|
60ce18 |
+ aesEncryptPtr->iv, NSS_AES_CBC,
|
|
|
60ce18 |
+ PR_TRUE, att->attrib.ulValueLen, 16);
|
|
|
60ce18 |
+ if (cipherInfo == NULL) {
|
|
|
60ce18 |
+ crv = CKR_HOST_MEMORY;
|
|
|
60ce18 |
+ break;
|
|
|
60ce18 |
+ }
|
|
|
60ce18 |
+ crv = sftk_DeriveEncrypt(key, keySize, cipherInfo, 16,
|
|
|
60ce18 |
+ aesEncryptPtr->pData, aesEncryptPtr->length,
|
|
|
60ce18 |
+ (SFTKCipher)AES_Encrypt);
|
|
|
60ce18 |
+ AES_DestroyContext(cipherInfo, PR_TRUE);
|
|
|
60ce18 |
+ break;
|
|
|
6fbbf4 |
+
|
|
|
60ce18 |
+ case CKM_CAMELLIA_ECB_ENCRYPT_DATA:
|
|
|
60ce18 |
+ stringPtr = (CK_KEY_DERIVATION_STRING_DATA *)pMechanism->pParameter;
|
|
|
60ce18 |
+ cipherInfo = Camellia_CreateContext((unsigned char *)att->attrib.pValue,
|
|
|
60ce18 |
+ NULL, NSS_CAMELLIA, PR_TRUE, att->attrib.ulValueLen);
|
|
|
60ce18 |
+ if (cipherInfo == NULL) {
|
|
|
60ce18 |
+ crv = CKR_HOST_MEMORY;
|
|
|
60ce18 |
+ break;
|
|
|
60ce18 |
+ }
|
|
|
60ce18 |
+ crv = sftk_DeriveEncrypt(key, keySize, cipherInfo, 16,
|
|
|
60ce18 |
+ stringPtr->pData, stringPtr->ulLen,
|
|
|
60ce18 |
+ (SFTKCipher)Camellia_Encrypt);
|
|
|
60ce18 |
+ Camellia_DestroyContext(cipherInfo, PR_TRUE);
|
|
|
60ce18 |
+ break;
|
|
|
6fbbf4 |
+
|
|
|
60ce18 |
+ case CKM_CAMELLIA_CBC_ENCRYPT_DATA:
|
|
|
60ce18 |
+ aesEncryptPtr = (CK_AES_CBC_ENCRYPT_DATA_PARAMS *)
|
|
|
60ce18 |
+ pMechanism->pParameter;
|
|
|
60ce18 |
+ cipherInfo = Camellia_CreateContext((unsigned char *)att->attrib.pValue,
|
|
|
60ce18 |
+ aesEncryptPtr->iv, NSS_CAMELLIA_CBC,
|
|
|
60ce18 |
+ PR_TRUE, att->attrib.ulValueLen);
|
|
|
60ce18 |
+ if (cipherInfo == NULL) {
|
|
|
60ce18 |
+ crv = CKR_HOST_MEMORY;
|
|
|
60ce18 |
+ break;
|
|
|
60ce18 |
+ }
|
|
|
60ce18 |
+ crv = sftk_DeriveEncrypt(key, keySize, cipherInfo, 16,
|
|
|
60ce18 |
+ aesEncryptPtr->pData, aesEncryptPtr->length,
|
|
|
60ce18 |
+ (SFTKCipher)Camellia_Encrypt);
|
|
|
60ce18 |
+ Camellia_DestroyContext(cipherInfo, PR_TRUE);
|
|
|
60ce18 |
+ break;
|
|
|
6fbbf4 |
+
|
|
|
60ce18 |
+ case CKM_SEED_ECB_ENCRYPT_DATA:
|
|
|
60ce18 |
+ stringPtr = (CK_KEY_DERIVATION_STRING_DATA *)pMechanism->pParameter;
|
|
|
60ce18 |
+ cipherInfo = SEED_CreateContext((unsigned char *)att->attrib.pValue,
|
|
|
60ce18 |
+ NULL, NSS_SEED, PR_TRUE);
|
|
|
60ce18 |
+ if (cipherInfo == NULL) {
|
|
|
60ce18 |
+ crv = CKR_HOST_MEMORY;
|
|
|
60ce18 |
+ break;
|
|
|
60ce18 |
+ }
|
|
|
60ce18 |
+ crv = sftk_DeriveEncrypt(key, keySize, cipherInfo, 16,
|
|
|
60ce18 |
+ stringPtr->pData, stringPtr->ulLen, (SFTKCipher)SEED_Encrypt);
|
|
|
60ce18 |
+ SEED_DestroyContext(cipherInfo, PR_TRUE);
|
|
|
60ce18 |
+ break;
|
|
|
6fbbf4 |
+
|
|
|
60ce18 |
+ case CKM_SEED_CBC_ENCRYPT_DATA:
|
|
|
60ce18 |
+ aesEncryptPtr = (CK_AES_CBC_ENCRYPT_DATA_PARAMS *)
|
|
|
60ce18 |
+ pMechanism->pParameter;
|
|
|
60ce18 |
+ cipherInfo = SEED_CreateContext((unsigned char *)att->attrib.pValue,
|
|
|
60ce18 |
+ aesEncryptPtr->iv, NSS_SEED_CBC, PR_TRUE);
|
|
|
60ce18 |
+ if (cipherInfo == NULL) {
|
|
|
60ce18 |
+ crv = CKR_HOST_MEMORY;
|
|
|
60ce18 |
+ break;
|
|
|
60ce18 |
+ }
|
|
|
60ce18 |
+ crv = sftk_DeriveEncrypt(key, keySize, cipherInfo, 16,
|
|
|
60ce18 |
+ aesEncryptPtr->pData, aesEncryptPtr->length,
|
|
|
60ce18 |
+ (SFTKCipher)SEED_Encrypt);
|
|
|
60ce18 |
+ SEED_DestroyContext(cipherInfo, PR_TRUE);
|
|
|
60ce18 |
+ break;
|
|
|
6fbbf4 |
+
|
|
|
60ce18 |
case CKM_CONCATENATE_BASE_AND_DATA:
|
|
|
60ce18 |
crv = sftk_DeriveSensitiveCheck(sourceKey, key);
|
|
|
60ce18 |
if (crv != CKR_OK)
|