Support ChaCha20+Poly1305 cipher suites.

nss/lib/pk11wrap/pk11mech.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 maps various PKCS #11 Mechanisms to related mechanisms, key
  * types, and ASN.1 encodings.
  */
 #include "seccomon.h"
 #include "secmod.h"
 #include "secmodi.h"
@@ skipping 378 matching lines @@
     case CKM_SHA384_HMAC_GENERAL:
     case CKM_SHA512_HMAC:
     case CKM_SHA512_HMAC_GENERAL:
     case CKM_MD2_HMAC:
     case CKM_MD2_HMAC_GENERAL:
     case CKM_MD5_HMAC:
     case CKM_MD5_HMAC_GENERAL:
     case CKM_TLS_PRF_GENERAL:
     case CKM_NSS_TLS_PRF_GENERAL_SHA256:
         return CKK_GENERIC_SECRET;
+    case CKM_NSS_CHACHA20_POLY1305:
+        return CKK_NSS_CHACHA20;
     default:
         return pk11_lookup(type)->keyType;
     }
 }
 
 /*
  * Get the Key Gen Mechanism needed for the given 
  * crypto mechanism
  */
 CK_MECHANISM_TYPE
@@ skipping 197 matching lines @@
     case CKM_NETSCAPE_PBE_SHA1_TRIPLE_DES_CBC:
     case CKM_NETSCAPE_PBE_SHA1_FAULTY_3DES_CBC:
     case CKM_PBE_SHA1_RC2_40_CBC:
     case CKM_PBE_SHA1_RC2_128_CBC:
     case CKM_PBE_SHA1_RC4_40:
     case CKM_PBE_SHA1_RC4_128:
     case CKM_PBE_SHA1_DES3_EDE_CBC:
     case CKM_PBE_SHA1_DES2_EDE_CBC:
     case CKM_PKCS5_PBKD2:
         return type;
+    case CKM_NSS_CHACHA20_POLY1305:
+        return CKM_NSS_CHACHA20_KEY_GEN;
     default:
         return pk11_lookup(type)->keyGen;
     }
 }
 
 /*
  * get the mechanism block size
  */
 int
 PK11_GetBlockSize(CK_MECHANISM_TYPE type,SECItem *params)
@@ skipping 1251 matching lines @@
     case SEC_OID_MISSI_DSS:
     case SEC_OID_MISSI_DSS_OLD:
     case SEC_OID_MISSI_KEA_DSS_OLD:
     case SEC_OID_BOGUS_DSA_SIGNATURE_WITH_SHA1_DIGEST:
         return SEC_OID_ANSIX9_DSA_SIGNATURE;
     default:
         break;
     }
     return algTag;
 }