From dc1565216a5d20ae0d75872151523252309a1292 Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Wed, 4 Jan 2017 14:24:24 +0000 Subject: nss-3.28.1 --- nss/lib/freebl/intel-aes.h | 229 ++++++++++++++++++++++----------------------- 1 file changed, 113 insertions(+), 116 deletions(-) (limited to 'nss/lib/freebl/intel-aes.h') diff --git a/nss/lib/freebl/intel-aes.h b/nss/lib/freebl/intel-aes.h index 3b71e5f..d5bd2d8 100644 --- a/nss/lib/freebl/intel-aes.h +++ b/nss/lib/freebl/intel-aes.h @@ -10,137 +10,134 @@ void intel_aes_decrypt_init_128(const unsigned char *key, PRUint32 *expanded); void intel_aes_decrypt_init_192(const unsigned char *key, PRUint32 *expanded); void intel_aes_decrypt_init_256(const unsigned char *key, PRUint32 *expanded); SECStatus intel_aes_encrypt_ecb_128(AESContext *cx, unsigned char *output, - unsigned int *outputLen, - unsigned int maxOutputLen, - const unsigned char *input, - unsigned int inputLen, - unsigned int blocksize); + unsigned int *outputLen, + unsigned int maxOutputLen, + const unsigned char *input, + unsigned int inputLen, + unsigned int blocksize); SECStatus intel_aes_decrypt_ecb_128(AESContext *cx, unsigned char *output, - unsigned int *outputLen, - unsigned int maxOutputLen, - const unsigned char *input, - unsigned int inputLen, - unsigned int blocksize); + unsigned int *outputLen, + unsigned int maxOutputLen, + const unsigned char *input, + unsigned int inputLen, + unsigned int blocksize); SECStatus intel_aes_encrypt_cbc_128(AESContext *cx, unsigned char *output, - unsigned int *outputLen, - unsigned int maxOutputLen, - const unsigned char *input, - unsigned int inputLen, - unsigned int blocksize); + unsigned int *outputLen, + unsigned int maxOutputLen, + const unsigned char *input, + unsigned int inputLen, + unsigned int blocksize); SECStatus intel_aes_decrypt_cbc_128(AESContext *cx, unsigned char *output, - unsigned int *outputLen, - unsigned int maxOutputLen, - const unsigned char *input, - unsigned int inputLen, - unsigned int blocksize); + unsigned int *outputLen, + unsigned int maxOutputLen, + const unsigned char *input, + unsigned int inputLen, + unsigned int blocksize); SECStatus intel_aes_encrypt_ctr_128(CTRContext *cx, unsigned char *output, - unsigned int *outputLen, - unsigned int maxOutputLen, - const unsigned char *input, - unsigned int inputLen, - unsigned int blocksize); + unsigned int *outputLen, + unsigned int maxOutputLen, + const unsigned char *input, + unsigned int inputLen, + unsigned int blocksize); SECStatus intel_aes_encrypt_ecb_192(AESContext *cx, unsigned char *output, - unsigned int *outputLen, - unsigned int maxOutputLen, - const unsigned char *input, - unsigned int inputLen, - unsigned int blocksize); + unsigned int *outputLen, + unsigned int maxOutputLen, + const unsigned char *input, + unsigned int inputLen, + unsigned int blocksize); SECStatus intel_aes_decrypt_ecb_192(AESContext *cx, unsigned char *output, - unsigned int *outputLen, - unsigned int maxOutputLen, - const unsigned char *input, - unsigned int inputLen, - unsigned int blocksize); + unsigned int *outputLen, + unsigned int maxOutputLen, + const unsigned char *input, + unsigned int inputLen, + unsigned int blocksize); SECStatus intel_aes_encrypt_cbc_192(AESContext *cx, unsigned char *output, - unsigned int *outputLen, - unsigned int maxOutputLen, - const unsigned char *input, - unsigned int inputLen, - unsigned int blocksize); + unsigned int *outputLen, + unsigned int maxOutputLen, + const unsigned char *input, + unsigned int inputLen, + unsigned int blocksize); SECStatus intel_aes_decrypt_cbc_192(AESContext *cx, unsigned char *output, - unsigned int *outputLen, - unsigned int maxOutputLen, - const unsigned char *input, - unsigned int inputLen, - unsigned int blocksize); + unsigned int *outputLen, + unsigned int maxOutputLen, + const unsigned char *input, + unsigned int inputLen, + unsigned int blocksize); SECStatus intel_aes_encrypt_ctr_192(CTRContext *cx, unsigned char *output, - unsigned int *outputLen, - unsigned int maxOutputLen, - const unsigned char *input, - unsigned int inputLen, - unsigned int blocksize); + unsigned int *outputLen, + unsigned int maxOutputLen, + const unsigned char *input, + unsigned int inputLen, + unsigned int blocksize); SECStatus intel_aes_encrypt_ecb_256(AESContext *cx, unsigned char *output, - unsigned int *outputLen, - unsigned int maxOutputLen, - const unsigned char *input, - unsigned int inputLen, - unsigned int blocksize); + unsigned int *outputLen, + unsigned int maxOutputLen, + const unsigned char *input, + unsigned int inputLen, + unsigned int blocksize); SECStatus intel_aes_decrypt_ecb_256(AESContext *cx, unsigned char *output, - unsigned int *outputLen, - unsigned int maxOutputLen, - const unsigned char *input, - unsigned int inputLen, - unsigned int blocksize); + unsigned int *outputLen, + unsigned int maxOutputLen, + const unsigned char *input, + unsigned int inputLen, + unsigned int blocksize); SECStatus intel_aes_encrypt_cbc_256(AESContext *cx, unsigned char *output, - unsigned int *outputLen, - unsigned int maxOutputLen, - const unsigned char *input, - unsigned int inputLen, - unsigned int blocksize); + unsigned int *outputLen, + unsigned int maxOutputLen, + const unsigned char *input, + unsigned int inputLen, + unsigned int blocksize); SECStatus intel_aes_decrypt_cbc_256(AESContext *cx, unsigned char *output, - unsigned int *outputLen, - unsigned int maxOutputLen, - const unsigned char *input, - unsigned int inputLen, - unsigned int blocksize); + unsigned int *outputLen, + unsigned int maxOutputLen, + const unsigned char *input, + unsigned int inputLen, + unsigned int blocksize); SECStatus intel_aes_encrypt_ctr_256(CTRContext *cx, unsigned char *output, - unsigned int *outputLen, - unsigned int maxOutputLen, - const unsigned char *input, - unsigned int inputLen, - unsigned int blocksize); + unsigned int *outputLen, + unsigned int maxOutputLen, + const unsigned char *input, + unsigned int inputLen, + unsigned int blocksize); +#define intel_aes_ecb_worker(encrypt, keysize) \ + ((encrypt) \ + ? ((keysize) == 16 ? intel_aes_encrypt_ecb_128 \ + : (keysize) == 24 ? intel_aes_encrypt_ecb_192 \ + : intel_aes_encrypt_ecb_256) \ + : ((keysize) == 16 ? intel_aes_decrypt_ecb_128 \ + : (keysize) == 24 ? intel_aes_decrypt_ecb_192 \ + : intel_aes_decrypt_ecb_256)) -#define intel_aes_ecb_worker(encrypt, keysize) \ - ((encrypt) \ - ? ((keysize) == 16 ? intel_aes_encrypt_ecb_128 : \ - (keysize) == 24 ? intel_aes_encrypt_ecb_192 : \ - intel_aes_encrypt_ecb_256) \ - : ((keysize) == 16 ? intel_aes_decrypt_ecb_128 : \ - (keysize) == 24 ? intel_aes_decrypt_ecb_192 : \ - intel_aes_decrypt_ecb_256)) +#define intel_aes_cbc_worker(encrypt, keysize) \ + ((encrypt) \ + ? ((keysize) == 16 ? intel_aes_encrypt_cbc_128 \ + : (keysize) == 24 ? intel_aes_encrypt_cbc_192 \ + : intel_aes_encrypt_cbc_256) \ + : ((keysize) == 16 ? intel_aes_decrypt_cbc_128 \ + : (keysize) == 24 ? intel_aes_decrypt_cbc_192 \ + : intel_aes_decrypt_cbc_256)) +#define intel_aes_ctr_worker(nr) \ + ((nr) == 10 ? intel_aes_encrypt_ctr_128 \ + : (nr) == 12 ? intel_aes_encrypt_ctr_192 \ + : intel_aes_encrypt_ctr_256) -#define intel_aes_cbc_worker(encrypt, keysize) \ - ((encrypt) \ - ? ((keysize) == 16 ? intel_aes_encrypt_cbc_128 : \ - (keysize) == 24 ? intel_aes_encrypt_cbc_192 : \ - intel_aes_encrypt_cbc_256) \ - : ((keysize) == 16 ? intel_aes_decrypt_cbc_128 : \ - (keysize) == 24 ? intel_aes_decrypt_cbc_192 : \ - intel_aes_decrypt_cbc_256)) - -#define intel_aes_ctr_worker(nr) \ - ((nr) == 10 ? intel_aes_encrypt_ctr_128 : \ - (nr) == 12 ? intel_aes_encrypt_ctr_192 : \ - intel_aes_encrypt_ctr_256) - - -#define intel_aes_init(encrypt, keysize) \ - do { \ - if (encrypt) { \ - if (keysize == 16) \ - intel_aes_encrypt_init_128(key, cx->expandedKey); \ - else if (keysize == 24) \ - intel_aes_encrypt_init_192(key, cx->expandedKey); \ - else \ - intel_aes_encrypt_init_256(key, cx->expandedKey); \ - } else { \ - if (keysize == 16) \ - intel_aes_decrypt_init_128(key, cx->expandedKey); \ - else if (keysize == 24) \ - intel_aes_decrypt_init_192(key, cx->expandedKey); \ - else \ - intel_aes_decrypt_init_256(key, cx->expandedKey); \ - } \ - } while (0) +#define intel_aes_init(encrypt, keysize) \ + do { \ + if (encrypt) { \ + if (keysize == 16) \ + intel_aes_encrypt_init_128(key, cx->expandedKey); \ + else if (keysize == 24) \ + intel_aes_encrypt_init_192(key, cx->expandedKey); \ + else \ + intel_aes_encrypt_init_256(key, cx->expandedKey); \ + } else { \ + if (keysize == 16) \ + intel_aes_decrypt_init_128(key, cx->expandedKey); \ + else if (keysize == 24) \ + intel_aes_decrypt_init_192(key, cx->expandedKey); \ + else \ + intel_aes_decrypt_init_256(key, cx->expandedKey); \ + } \ + } while (0) -- cgit v1.2.1