diff options
| author | Martin Thomson <mt@lowentropy.net> | 2022-01-11 23:30:17 +0000 |
|---|---|---|
| committer | Martin Thomson <mt@lowentropy.net> | 2022-01-11 23:30:17 +0000 |
| commit | a4790ca203a490d076f951ad3038c8980cc4766d (patch) | |
| tree | 8b53aa8a1d1003505625a880df166287564d59d9 /lib/pk11wrap | |
| parent | cd158de5e84e4cb3671dfac59e444713a357b946 (diff) | |
| download | nss-hg-a4790ca203a490d076f951ad3038c8980cc4766d.tar.gz | |
Bug 1748386 - Enable CKM_CHACHA20, r=rrelyea
This change makes a few tiny changes to the code to re-enable the use of
Chacha20 ciphers and align their key type.
There are a lot more changes in tests, mostly just to factor existing tests and
determine that the legacy and final PKCS#11 mechanisms work as expected.
Differential Revision: https://phabricator.services.mozilla.com/D135007
Diffstat (limited to 'lib/pk11wrap')
| -rw-r--r-- | lib/pk11wrap/pk11mech.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pk11wrap/pk11mech.c b/lib/pk11wrap/pk11mech.c index d94d59a32..685f0e934 100644 --- a/lib/pk11wrap/pk11mech.c +++ b/lib/pk11wrap/pk11mech.c @@ -235,7 +235,7 @@ PK11_GetKeyType(CK_MECHANISM_TYPE type, unsigned long len) case CKM_CHACHA20_POLY1305: case CKM_CHACHA20_KEY_GEN: case CKM_CHACHA20: - return CKK_NSS_CHACHA20; + return CKK_CHACHA20; case CKM_AES_ECB: case CKM_AES_CBC: case CKM_AES_CCM: |