diff options
| author | Robert Relyea <rrelyea@redhat.com> | 2019-06-06 14:52:36 -0700 |
|---|---|---|
| committer | Robert Relyea <rrelyea@redhat.com> | 2019-06-06 14:52:36 -0700 |
| commit | 6e22abb94dbbe43081b7c9127c6a5511f374c1f1 (patch) | |
| tree | 86dc1be049ed7077f3cc7d2617395b95d8bc5cd6 /lib/pk11wrap | |
| parent | c93463d134c11b89cc622cc7472990068b3f8d56 (diff) | |
| parent | cc215ef7e96c8ae5d5d0218555742bfb72b4cfa3 (diff) | |
| download | nss-hg-6e22abb94dbbe43081b7c9127c6a5511f374c1f1.tar.gz | |
Bug 1546229 Add IPSEC IKE support to softoken.
Diffstat (limited to 'lib/pk11wrap')
| -rw-r--r-- | lib/pk11wrap/pk11mech.c | 2 | ||||
| -rw-r--r-- | lib/pk11wrap/pk11skey.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/lib/pk11wrap/pk11mech.c b/lib/pk11wrap/pk11mech.c index 874980882..4ac614ba0 100644 --- a/lib/pk11wrap/pk11mech.c +++ b/lib/pk11wrap/pk11mech.c @@ -240,6 +240,8 @@ PK11_GetKeyType(CK_MECHANISM_TYPE type, unsigned long len) case CKM_AES_KEY_GEN: case CKM_NETSCAPE_AES_KEY_WRAP: case CKM_NETSCAPE_AES_KEY_WRAP_PAD: + case CKM_AES_XCBC_MAC: + case CKM_AES_XCBC_MAC_96: return CKK_AES; case CKM_DES_ECB: case CKM_DES_CBC: diff --git a/lib/pk11wrap/pk11skey.c b/lib/pk11wrap/pk11skey.c index 6024d6c80..a1c38223f 100644 --- a/lib/pk11wrap/pk11skey.c +++ b/lib/pk11wrap/pk11skey.c @@ -1598,6 +1598,7 @@ PK11_DeriveWithTemplate(PK11SymKey *baseKey, CK_MECHANISM_TYPE derive, PK11_FreeSymKey(newBaseKey); if (crv != CKR_OK) { PK11_FreeSymKey(symKey); + PORT_SetError(PK11_MapError(crv)); return NULL; } return symKey; |