From 4d0a061acbf0bc1872a3c5815ef8d821d1619cee Mon Sep 17 00:00:00 2001 From: John Safranek Date: Fri, 13 Apr 2018 13:25:07 -0700 Subject: [PATCH] FIPS Revalidation 1. Updated the segment tags in the aes_asm.asm file so that it is linked in order between aes.obj and des3.obj. --- wolfcrypt/src/aes_asm.asm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wolfcrypt/src/aes_asm.asm b/wolfcrypt/src/aes_asm.asm index aaac07a01..bd2feb49f 100644 --- a/wolfcrypt/src/aes_asm.asm +++ b/wolfcrypt/src/aes_asm.asm @@ -26,6 +26,9 @@ ; ; /* This file is in intel asm syntax, see .s for at&t syntax */ ; + +fipsAh SEGMENT ALIAS(".fipsA$h") 'CODE' + ; /* ; AES_CBC_encrypt[const ,unsigned char*in ; unsigned ,char*out @@ -34,7 +37,6 @@ ; const ,unsigned char*KS ; int nr] ; */ -_text SEGMENT AES_CBC_encrypt PROC ;# parameter 1: rdi ;# parameter 2: rsi @@ -1502,4 +1504,5 @@ MAKE_RK256_b: pxor xmm3,xmm2 ret +fipsAh ENDS END