diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-02-08 16:10:42 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-02-08 16:10:42 +0100 |
| commit | f4001a0d192a2462bcedbaadf95e778ddc352ebb (patch) | |
| tree | 43159a16fbda0c3b364b269481746fd7ee12c2a6 /Makefile.org | |
| parent | Synchronize with 1.0.0 branch (diff) | |
| download | openssl-f4001a0d192a2462bcedbaadf95e778ddc352ebb.tar.xz openssl-f4001a0d192a2462bcedbaadf95e778ddc352ebb.zip | |
Link GCM into FIPS module. Check return value in EVP gcm.
Diffstat (limited to 'Makefile.org')
| -rw-r--r-- | Makefile.org | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.org b/Makefile.org index b608f710e9..89fa394546 100644 --- a/Makefile.org +++ b/Makefile.org @@ -316,6 +316,7 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \ ../crypto/modes/cbc128.o \ ../crypto/modes/cfb128.o \ ../crypto/modes/ctr128.o \ + ../crypto/modes/gcm128.o \ ../crypto/modes/ofb128.o \ ../crypto/rand/md_rand.o \ ../crypto/rand/rand_egd.o \ @@ -350,7 +351,7 @@ build_fips: build_crypto: 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)' ; \ else \ ARX='${AR}' ; \ |