diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-12-23 19:02:52 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-12-23 19:02:52 +0000 |
| commit | 029bcfe189eae5eebbaf58ccff4e1200dd78b228 (patch) | |
| tree | 1c226a334ea1a88e2d1c6f949c9320eb0c3bff59 /security/nss/lib/freebl/cmac.c | |
| parent | 149d2ffa779826cb48a381099858e76e4624d471 (diff) | |
| download | UXP-029bcfe189eae5eebbaf58ccff4e1200dd78b228.tar UXP-029bcfe189eae5eebbaf58ccff4e1200dd78b228.tar.gz UXP-029bcfe189eae5eebbaf58ccff4e1200dd78b228.tar.lz UXP-029bcfe189eae5eebbaf58ccff4e1200dd78b228.tar.xz UXP-029bcfe189eae5eebbaf58ccff4e1200dd78b228.zip | |
Issue #1693 - Update NSS to 3.59.1.1
This updates to MoonchildProductions/NSS@bd49b2b88 in the repo created for our
consumption of the library.
Diffstat (limited to 'security/nss/lib/freebl/cmac.c')
| -rw-r--r-- | security/nss/lib/freebl/cmac.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/security/nss/lib/freebl/cmac.c b/security/nss/lib/freebl/cmac.c index 73237c03a..222cef1b4 100644 --- a/security/nss/lib/freebl/cmac.c +++ b/security/nss/lib/freebl/cmac.c @@ -22,9 +22,9 @@ struct CMACContextStr { * add a new Context pointer to the cipher union with the correct type. */ CMACCipher cipherType; union { - AESContext aes; + AESContext *aes; } cipher; - int blockSize; + unsigned int blockSize; /* Internal keys which are conditionally used by the algorithm. Derived * from encrypting the NULL block. We leave the storing of (and the @@ -62,7 +62,7 @@ cmac_Encrypt(CMACContext *ctx, unsigned char *output, { if (ctx->cipherType == CMAC_AES) { unsigned int tmpOutputLen; - SECStatus rv = AES_Encrypt(&ctx->cipher.aes, output, &tmpOutputLen, + SECStatus rv = AES_Encrypt(ctx->cipher.aes, output, &tmpOutputLen, ctx->blockSize, input, inputLen); /* Assumption: AES_Encrypt (when in ECB mode) always returns an @@ -156,8 +156,9 @@ CMAC_Init(CMACContext *ctx, CMACCipher type, ctx->blockSize = AES_BLOCK_SIZE; ctx->cipherType = CMAC_AES; - if (AES_InitContext(&ctx->cipher.aes, key, key_len, NULL, NSS_AES, 1, - ctx->blockSize) != SECSuccess) { + ctx->cipher.aes = AES_CreateContext(key, NULL, NSS_AES, 1, key_len, + ctx->blockSize); + if (ctx->cipher.aes == NULL) { return SECFailure; } @@ -209,7 +210,7 @@ SECStatus CMAC_Update(CMACContext *ctx, const unsigned char *data, unsigned int data_len) { - int data_index = 0; + unsigned int data_index = 0; if (ctx == NULL) { PORT_SetError(SEC_ERROR_INVALID_ARGS); return SECFailure; @@ -308,8 +309,8 @@ CMAC_Destroy(CMACContext *ctx, PRBool free_it) return; } - if (ctx->cipherType == CMAC_AES) { - AES_DestroyContext(&ctx->cipher.aes, PR_FALSE); + if (ctx->cipherType == CMAC_AES && ctx->cipher.aes != NULL) { + AES_DestroyContext(ctx->cipher.aes, PR_TRUE); } /* Destroy everything in the context. This includes sensitive data in |