Commit 114c8e22 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Use consistent FIPS tarball name. 

Add XTS to FIPS build.

Hide XTS symbol names.
parent 32a2d8dd

Makefile.fips

+2 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ SHARED_LDFLAGS= 
GENERAL=        Makefile

BASENAME=       openssl

NAME=           $(BASENAME)-$(VERSION)

TARFILE=        openssl-fips-test-2.0.tar

TARFILE=        openssl-fips-2.0-test.tar

WTARFILE=       $(NAME)-win.tar

EXHEADER=       e_os2.h

HEADER=         e_os.h
@@ -338,6 +338,7 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \ 
	../crypto/modes/ctr128.o \

	../crypto/modes/gcm128.o \

	../crypto/modes/ofb128.o \

	../crypto/modes/xts128.o \

	../crypto/rsa/rsa_eay.o \

	../crypto/rsa/rsa_gen.o \

	../crypto/rsa/rsa_crpt.o \

Makefile.org

+1 −0
Original line number Diff line number Diff line
@@ -332,6 +332,7 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \ 
	../crypto/modes/ctr128.o \

	../crypto/modes/gcm128.o \

	../crypto/modes/ofb128.o \

	../crypto/modes/xts128.o \

	../crypto/rsa/rsa_eay.o \

	../crypto/rsa/rsa_gen.o \

	../crypto/rsa/rsa_crpt.o \

fips/fipssyms.h

+3 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ 
#define CRYPTO_gcm128_setiv FIPS_crypto_gcm128_setiv

#define CRYPTO_gcm128_tag FIPS_crypto_gcm128_tag

#define CRYPTO_ofb128_encrypt FIPS_crypto_ofb128_encrypt

#define CRYPTO_xts128_encrypt FIPS_crypto_xts128_encrypt

#define DES_cfb64_encrypt FIPS_des_cfb64_encrypt

#define DES_cfb_encrypt FIPS_des_cfb_encrypt

#define DES_check_key_parity FIPS_des_check_key_parity
@@ -297,6 +298,7 @@ 
#define EVP_aes_128_ecb FIPS_evp_aes_128_ecb

#define EVP_aes_128_gcm FIPS_evp_aes_128_gcm

#define EVP_aes_128_ofb FIPS_evp_aes_128_ofb

#define EVP_aes_128_xts FIPS_evp_aes_128_xts

#define EVP_aes_192_cbc FIPS_evp_aes_192_cbc

#define EVP_aes_192_cfb1 FIPS_evp_aes_192_cfb1

#define EVP_aes_192_cfb128 FIPS_evp_aes_192_cfb128
@@ -313,6 +315,7 @@ 
#define EVP_aes_256_ecb FIPS_evp_aes_256_ecb

#define EVP_aes_256_gcm FIPS_evp_aes_256_gcm

#define EVP_aes_256_ofb FIPS_evp_aes_256_ofb

#define EVP_aes_256_xts FIPS_evp_aes_256_xts

#define EVP_des_ede FIPS_evp_des_ede

#define EVP_des_ede3 FIPS_evp_des_ede3

#define EVP_des_ede3_cbc FIPS_evp_des_ede3_cbc