diff options
| author | John-Mark Gurney <jmg@FreeBSD.org> | 2015-07-29 23:37:15 +0000 |
|---|---|---|
| committer | John-Mark Gurney <jmg@FreeBSD.org> | 2015-07-29 23:37:15 +0000 |
| commit | e381fd293d6d0424a73fc828f56cb82abdd991c1 (patch) | |
| tree | 8904bdac3e4c2b43d3a334aeb7c8308d02388fae /sys/crypto | |
| parent | 796ba6fcc2bb4305a6faa0029da6f413293b4d9c (diff) | |
Notes
Diffstat (limited to 'sys/crypto')
| -rw-r--r-- | sys/crypto/aesni/aesni.h | 2 | ||||
| -rw-r--r-- | sys/crypto/aesni/aesni_ghash.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/crypto/aesni/aesni.h b/sys/crypto/aesni/aesni.h index 0594176a4522..3d5adec79eed 100644 --- a/sys/crypto/aesni/aesni.h +++ b/sys/crypto/aesni/aesni.h @@ -104,7 +104,7 @@ void AES_GCM_encrypt(const unsigned char *in, unsigned char *out, const unsigned char *key, int nr); int AES_GCM_decrypt(const unsigned char *in, unsigned char *out, const unsigned char *addt, const unsigned char *ivec, - unsigned char *tag, uint32_t nbytes, uint32_t abytes, int ibytes, + const unsigned char *tag, uint32_t nbytes, uint32_t abytes, int ibytes, const unsigned char *key, int nr); int aesni_cipher_setup_common(struct aesni_session *ses, const uint8_t *key, diff --git a/sys/crypto/aesni/aesni_ghash.c b/sys/crypto/aesni/aesni_ghash.c index f7be6c089754..54c8815ce01f 100644 --- a/sys/crypto/aesni/aesni_ghash.c +++ b/sys/crypto/aesni/aesni_ghash.c @@ -528,7 +528,7 @@ AES_GCM_encrypt(const unsigned char *in, unsigned char *out, int AES_GCM_decrypt(const unsigned char *in, unsigned char *out, const unsigned char *addt, const unsigned char *ivec, - unsigned char *tag, uint32_t nbytes, uint32_t abytes, int ibytes, + const unsigned char *tag, uint32_t nbytes, uint32_t abytes, int ibytes, const unsigned char *key, int nr) { int i, j ,k; @@ -677,7 +677,7 @@ AES_GCM_decrypt(const unsigned char *in, unsigned char *out, X = _mm_shuffle_epi8(X, BSWAP_MASK); T = _mm_xor_si128(X, T); - if (!m128icmp(T, _mm_loadu_si128((__m128i*)tag))) + if (!m128icmp(T, _mm_loadu_si128((const __m128i*)tag))) return 0; //in case the authentication failed ctr1 = _mm_shuffle_epi8(Y, BSWAP_EPI64); |