Support ChaCha20+Poly1305 cipher suites.

nss/lib/softoken/pkcs11c.c

 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 /*
  * This file implements PKCS 11 on top of our existing security modules
  *
  * For more information about PKCS 11 See PKCS 11 Token Inteface Standard.
  *   This implementation has two slots:
  *      slot 1 is our generic crypto support. It does not require login.
  *   It supports Public Key ops, and all they bulk ciphers and hashes. 
@@ skipping 852 matching lines @@
             isEncrypt, att->attrib.ulValueLen, 16);
         sftk_FreeAttribute(att);
         if (context->cipherInfo == NULL) {
             crv = CKR_HOST_MEMORY;
             break;
         }
         context->update = (SFTKCipher) (isEncrypt ? AES_Encrypt : AES_Decrypt);
         context->destroy = (SFTKDestroy) AES_DestroyContext;
         break;
 
+    case CKM_NSS_CHACHA20_POLY1305: {
+        CK_NSS_AEAD_PARAMS *params;
+        if (pMechanism->ulParameterLen != sizeof(CK_NSS_AEAD_PARAMS)) {
+            crv = CKR_MECHANISM_PARAM_INVALID;
+            break;
+        }
+        params = (CK_NSS_AEAD_PARAMS*) pMechanism->pParameter;
+        context->multi = PR_FALSE;
+        if (key_type != CKK_NSS_CHACHA20) {
+            crv = CKR_KEY_TYPE_INCONSISTENT;
+            break;
+        }
+        att = sftk_FindAttribute(key,CKA_VALUE);
+        if (att == NULL) {
+            crv = CKR_KEY_HANDLE_INVALID;
+            break;
+        }
+        context->cipherInfo = ChaCha20Poly1305_CreateContext(
+                (unsigned char*) att->attrib.pValue, att->attrib.ulValueLen,
+                params->pIv, params->ulIvLen, params->pAAD, params->ulAADLen,
+                params->ulTagBits);
+        sftk_FreeAttribute(att);
+        if (context->cipherInfo == NULL) {
+            /* XXX map error code */
+            crv = CKR_HOST_MEMORY;
+            break;
+        }
+        context->update = (SFTKCipher) (isEncrypt ? ChaCha20Poly1305_Seal :
+                                        ChaCha20Poly1305_Open);
+        context->destroy = (SFTKDestroy) ChaCha20Poly1305_DestroyContext;
+        break;
+    }
+
     case CKM_NETSCAPE_AES_KEY_WRAP_PAD:
         context->doPad = PR_TRUE;
         /* fall thru */
     case CKM_NETSCAPE_AES_KEY_WRAP:
         context->multi = PR_FALSE;
         context->blockSize = 8;
         if (key_type != CKK_AES) {
             crv = CKR_KEY_TYPE_INCONSISTENT;
             break;
         }
@@ skipping 2382 matching lines @@
         *key_length = 16;
         break;
     case CKM_CAMELLIA_KEY_GEN:
         *key_type = CKK_CAMELLIA;
         if (*key_length == 0) crv = CKR_TEMPLATE_INCOMPLETE;
         break;
     case CKM_AES_KEY_GEN:
         *key_type = CKK_AES;
         if (*key_length == 0) crv = CKR_TEMPLATE_INCOMPLETE;
         break;
+    case CKM_NSS_CHACHA20_KEY_GEN:
+        *key_type = CKK_NSS_CHACHA20;
+        if (*key_length == 0) crv = CKR_TEMPLATE_INCOMPLETE;
+        break;
     default:
         PORT_Assert(0);
         crv = CKR_MECHANISM_INVALID;
         break;
     }
 
     return crv;
 }
 
 CK_RV
@@ skipping 224 matching lines @@
     case CKM_DES_KEY_GEN:
     case CKM_DES2_KEY_GEN:
     case CKM_DES3_KEY_GEN:
         checkWeak = PR_TRUE;
     case CKM_RC2_KEY_GEN:
     case CKM_RC4_KEY_GEN:
     case CKM_GENERIC_SECRET_KEY_GEN:
     case CKM_SEED_KEY_GEN:
     case CKM_CAMELLIA_KEY_GEN:
     case CKM_AES_KEY_GEN:
+    case CKM_NSS_CHACHA20_KEY_GEN:
 #if NSS_SOFTOKEN_DOES_RC5
     case CKM_RC5_KEY_GEN:
 #endif
         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 = nsc_ssl;
         break;
@@ skipping 3418 matching lines @@
     att = sftk_FindAttribute(key,CKA_VALUE);
     sftk_FreeObject(key);
     if (!att) {
         return CKR_KEY_HANDLE_INVALID;        
     }
     crv = NSC_DigestUpdate(hSession,(CK_BYTE_PTR)att->attrib.pValue,
                            att->attrib.ulValueLen);
     sftk_FreeAttribute(att);
     return crv;
 }