diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-06-06 21:27:04 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-06-06 21:27:04 +0200 |
| commit | 4a71b30364a4b6d1eaf16fcfdc8e873e6697f293 (patch) | |
| tree | a47014077c14579249859ad34afcc5a8f2f0730a /security/nss/lib/softoken/sftkpwd.c | |
| parent | d7da72799521386c110dbba73b1e483b00a0a56a (diff) | |
| parent | 2dad0ec41d0b69c0a815012e6ea4bdde81b2875b (diff) | |
| download | UXP-4a71b30364a4b6d1eaf16fcfdc8e873e6697f293.tar UXP-4a71b30364a4b6d1eaf16fcfdc8e873e6697f293.tar.gz UXP-4a71b30364a4b6d1eaf16fcfdc8e873e6697f293.tar.lz UXP-4a71b30364a4b6d1eaf16fcfdc8e873e6697f293.tar.xz UXP-4a71b30364a4b6d1eaf16fcfdc8e873e6697f293.zip | |
Merge branch 'NSS-335'
Diffstat (limited to 'security/nss/lib/softoken/sftkpwd.c')
| -rw-r--r-- | security/nss/lib/softoken/sftkpwd.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/security/nss/lib/softoken/sftkpwd.c b/security/nss/lib/softoken/sftkpwd.c index 0b8c91bfd..e0d2df9ab 100644 --- a/security/nss/lib/softoken/sftkpwd.c +++ b/security/nss/lib/softoken/sftkpwd.c @@ -926,6 +926,13 @@ sftk_updateMacs(PLArenaPool *arena, SFTKDBHandle *handle, continue; } + if (authAttrs[i].ulValueLen == sizeof(CK_ULONG) && + sftkdb_isULONGAttribute(authAttrs[i].type)) { + CK_ULONG value = *(CK_ULONG *)authAttrs[i].pValue; + sftk_ULong2SDBULong(authAttrs[i].pValue, value); + authAttrs[i].ulValueLen = SDB_ULONG_SIZE; + } + plainText.data = authAttrs[i].pValue; plainText.len = authAttrs[i].ulValueLen; rv = sftkdb_SignAttribute(arena, newKey, id, |