projects
/
BearSSL
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed spurious warning about old-style prototype.
[BearSSL]
/
src
/
symcipher
/
aes_x86ni_cbcenc.c
diff --git
a/src/symcipher/aes_x86ni_cbcenc.c
b/src/symcipher/aes_x86ni_cbcenc.c
index
f1c473e
..
85feecd
100644
(file)
--- a/
src/symcipher/aes_x86ni_cbcenc.c
+++ b/
src/symcipher/aes_x86ni_cbcenc.c
@@
-22,17
+22,17
@@
* SOFTWARE.
*/
* SOFTWARE.
*/
+#define BR_ENABLE_INTRINSICS 1
#include "inner.h"
#if BR_AES_X86NI
#include "inner.h"
#if BR_AES_X86NI
-#if BR_AES_X86NI_GCC
-#include <wmmintrin.h>
-#endif
-
-#if BR_AES_X86NI_MSC
-#include <intrin.h>
-#endif
+/* see bearssl_block.h */
+const br_block_cbcenc_class *
+br_aes_x86ni_cbcenc_get_vtable(void)
+{
+ return br_aes_x86ni_supported() ? &br_aes_x86ni_cbcenc_vtable : NULL;
+}
/* see bearssl_block.h */
void
/* see bearssl_block.h */
void
@@
-43,6
+43,8
@@
br_aes_x86ni_cbcenc_init(br_aes_x86ni_cbcenc_keys *ctx,
ctx->num_rounds = br_aes_x86ni_keysched_enc(ctx->skey.skni, key, len);
}
ctx->num_rounds = br_aes_x86ni_keysched_enc(ctx->skey.skni, key, len);
}
+BR_TARGETS_X86_UP
+
/* see bearssl_block.h */
BR_TARGET("sse2,aes")
void
/* see bearssl_block.h */
BR_TARGET("sse2,aes")
void
@@
-95,6
+97,8
@@
br_aes_x86ni_cbcenc_run(const br_aes_x86ni_cbcenc_keys *ctx,
_mm_storeu_si128(iv, ivx);
}
_mm_storeu_si128(iv, ivx);
}
+BR_TARGETS_X86_DOWN
+
/* see bearssl_block.h */
const br_block_cbcenc_class br_aes_x86ni_cbcenc_vtable = {
sizeof(br_aes_x86ni_cbcenc_keys),
/* see bearssl_block.h */
const br_block_cbcenc_class br_aes_x86ni_cbcenc_vtable = {
sizeof(br_aes_x86ni_cbcenc_keys),
@@
-106,13
+110,6
@@
const br_block_cbcenc_class br_aes_x86ni_cbcenc_vtable = {
&br_aes_x86ni_cbcenc_run
};
&br_aes_x86ni_cbcenc_run
};
-/* see bearssl_block.h */
-const br_block_cbcenc_class *
-br_aes_x86ni_cbcenc_get_vtable(void)
-{
- return br_aes_x86ni_supported() ? &br_aes_x86ni_cbcenc_vtable : NULL;
-}
-
#else
/* see bearssl_block.h */
#else
/* see bearssl_block.h */