diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-10-24 22:41:05 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-10-24 22:41:05 +0200 |
| commit | 565ae72f5af3bcc9fb85945233e2a7afa115d435 (patch) | |
| tree | 52dd8525956f7bea1fcb2bc89b9af73269666855 /security/nss/lib/freebl/gcm.c | |
| parent | f1308011aef318f40d05d93353db17d059db83a0 (diff) | |
| parent | fbf84d5155f7d47df85e1d389955a9529a04158f (diff) | |
| download | UXP-565ae72f5af3bcc9fb85945233e2a7afa115d435.tar UXP-565ae72f5af3bcc9fb85945233e2a7afa115d435.tar.gz UXP-565ae72f5af3bcc9fb85945233e2a7afa115d435.tar.lz UXP-565ae72f5af3bcc9fb85945233e2a7afa115d435.tar.xz UXP-565ae72f5af3bcc9fb85945233e2a7afa115d435.zip | |
Merge branch 'nss-work'
Diffstat (limited to 'security/nss/lib/freebl/gcm.c')
| -rw-r--r-- | security/nss/lib/freebl/gcm.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/security/nss/lib/freebl/gcm.c b/security/nss/lib/freebl/gcm.c index f1e16da78..e93970b88 100644 --- a/security/nss/lib/freebl/gcm.c +++ b/security/nss/lib/freebl/gcm.c @@ -469,6 +469,12 @@ gcmHash_Reset(gcmHashContext *ghash, const unsigned char *AAD, { SECStatus rv; + // Limit AADLen in accordance with SP800-38D + if (sizeof(AADLen) >= 8 && AADLen > (1ULL << 61) - 1) { + PORT_SetError(SEC_ERROR_INPUT_LEN); + return SECFailure; + } + ghash->cLen = 0; PORT_Memset(ghash->counterBuf, 0, GCM_HASH_LEN_LEN * 2); ghash->bufLen = 0; |