generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Link GCM into FIPS module. Check return value in EVP gcm.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2011-02-08 15:10:42 +00:00
parent cea73f9db3
commit f4001a0d19
4 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.org
View File

@ -316,6 +316,7 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \
../crypto/modes/cbc128.o \ ../crypto/modes/cbc128.o \
../crypto/modes/cfb128.o \ ../crypto/modes/cfb128.o \
../crypto/modes/ctr128.o \ ../crypto/modes/ctr128.o \
../crypto/modes/gcm128.o \
../crypto/modes/ofb128.o \ ../crypto/modes/ofb128.o \
../crypto/rand/md_rand.o \ ../crypto/rand/md_rand.o \
../crypto/rand/rand_egd.o \ ../crypto/rand/rand_egd.o \
@ -350,7 +351,7 @@ build_fips:
build_crypto: build_crypto:
if [ -n "$(FIPSCANLIB)" ]; then \ if [ -n "$(FIPSCANLIB)" ]; then \
EXCL_OBJ='$(AES_ENC) $(BN_ASM) $(DES_ENC) $(CPUID_OBJ) $(SHA1_ASM_OBJ) $(FIPS_EX_OBJ)' ; export EXCL_OBJ ; \ EXCL_OBJ='$(AES_ENC) $(BN_ASM) $(DES_ENC) $(CPUID_OBJ) $(SHA1_ASM_OBJ) $(MODES_ASM_OBJ) $(FIPS_EX_OBJ)' ; export EXCL_OBJ ; \
ARX='$(PERL) $${TOP}/util/arx.pl $(AR)' ; \ ARX='$(PERL) $${TOP}/util/arx.pl $(AR)' ; \
else \ else \
ARX='${AR}' ; \ ARX='${AR}' ; \

15
crypto/evp/e_aes.c
View File

@ -312,11 +312,20 @@ static int aes_gcm(EVP_CIPHER_CTX *ctx, unsigned char *out,
if (in) if (in)
{ {
if (out == NULL) if (out == NULL)
CRYPTO_gcm128_aad(gctx->gcm, in, len); {
if (CRYPTO_gcm128_aad(gctx->gcm, in, len))
return -1;
}
else if (ctx->encrypt) else if (ctx->encrypt)
CRYPTO_gcm128_encrypt(gctx->gcm, in, out, len); {
if (CRYPTO_gcm128_encrypt(gctx->gcm, in, out, len))
return -1;
}
else else
CRYPTO_gcm128_decrypt(gctx->gcm, in, out, len); {
if (CRYPTO_gcm128_decrypt(gctx->gcm, in, out, len))
return -1;
}
return len; return len;
} }
else else

2
crypto/modes/gcm128.c
View File

@ -47,6 +47,8 @@
* ==================================================================== * ====================================================================
*/ */
#define OPENSSL_FIPSAPI
#include <openssl/crypto.h> #include <openssl/crypto.h>
#include "modes_lcl.h" #include "modes_lcl.h"
#include <string.h> #include <string.h>

1
fips/Makefile
View File

@ -89,6 +89,7 @@ fipscanister.o: fips_start.o $(LIBOBJ) $(FIPS_OBJ_LISTS) fips_end.o
list="$(AES_ENC)"; for i in $$list; do FIPS_ASM="$$FIPS_ASM ../crypto/aes/$$i" ; done; \ list="$(AES_ENC)"; for i in $$list; do FIPS_ASM="$$FIPS_ASM ../crypto/aes/$$i" ; done; \
list="$(DES_ENC)"; for i in $$list; do FIPS_ASM="$$FIPS_ASM ../crypto/des/$$i" ; done; \ list="$(DES_ENC)"; for i in $$list; do FIPS_ASM="$$FIPS_ASM ../crypto/des/$$i" ; done; \
list="$(SHA1_ASM_OBJ)"; for i in $$list; do FIPS_ASM="$$FIPS_ASM ../crypto/sha/$$i" ; done; \ list="$(SHA1_ASM_OBJ)"; for i in $$list; do FIPS_ASM="$$FIPS_ASM ../crypto/sha/$$i" ; done; \
list="$(MODES_ASM_OBJ)"; for i in $$list; do FIPS_ASM="$$FIPS_ASM ../crypto/modes/$$i" ; done; \
if [ -n "$(CPUID_OBJ)" ]; then \ if [ -n "$(CPUID_OBJ)" ]; then \
CPUID=../crypto/$(CPUID_OBJ) ; \ CPUID=../crypto/$(CPUID_OBJ) ; \
else \ else \