Implement FIPS CMAC.

[openssl.git] / Makefile.org

diff --git a/Makefile.org b/Makefile.org
index deaf792546371afb5fde0e7b3d9aa5271924382d..73e8b6dd2617aebf76f5eb80547ffb5e223443b3 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -148,7 +148,7 @@ SDIRS=  \
        bn ec rsa dsa ecdsa dh ecdh dso engine \
        buffer bio stack lhash rand err \
        evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 \
        bn ec rsa dsa ecdsa dh ecdh dso engine \
        buffer bio stack lhash rand err \
        evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 \

-       cms pqueue ts jpake store cmac
+       cms pqueue ts jpake srp store cmac

 # keep in mind that the above list is adjusted by ./Configure
 # according to no-xxx arguments...
 
 # keep in mind that the above list is adjusted by ./Configure
 # according to no-xxx arguments...
 


@@ -295,6 +295,7 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \
        ../crypto/bn/bn_word.o \
        ../crypto/bn/bn_x931p.o \
        ../crypto/buffer/buf_str.o \
        ../crypto/bn/bn_word.o \
        ../crypto/bn/bn_x931p.o \
        ../crypto/buffer/buf_str.o \

+       ../crypto/cmac/cmac.o \

        ../crypto/cryptlib.o \
        ../crypto/des/cfb64ede.o \
        ../crypto/des/cfb64enc.o \
        ../crypto/cryptlib.o \
        ../crypto/des/cfb64ede.o \
        ../crypto/des/cfb64enc.o \


@@ -319,6 +320,8 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \
        ../crypto/ec/ecp_smpl.o \
        ../crypto/ec/ec2_mult.o \
        ../crypto/ec/ec2_smpl.o \
        ../crypto/ec/ecp_smpl.o \
        ../crypto/ec/ec2_mult.o \
        ../crypto/ec/ec2_smpl.o \

+       ../crypto/ecdh/ech_key.o \
+       ../crypto/ecdh/ech_ossl.o \

        ../crypto/ecdsa/ecs_ossl.o \
        ../crypto/evp/e_aes.o \
        ../crypto/evp/e_des3.o \
        ../crypto/ecdsa/ecs_ossl.o \
        ../crypto/evp/e_aes.o \
        ../crypto/evp/e_des3.o \


@@ -517,6 +520,9 @@ links:
        @$(PERL) $(TOP)/util/mkdir-p.pl include/openssl
        @$(PERL) $(TOP)/util/mklink.pl include/openssl $(EXHEADER)
        @set -e; target=links; $(RECURSIVE_BUILD_CMD)
        @$(PERL) $(TOP)/util/mkdir-p.pl include/openssl
        @$(PERL) $(TOP)/util/mklink.pl include/openssl $(EXHEADER)
        @set -e; target=links; $(RECURSIVE_BUILD_CMD)

+       @if [ -z "$(FIPSCANLIB)" ]; then \
+               set -e; target=links; dir=fips ; $(BUILD_CMD) ; \
+       fi

 
 gentests:
        @(cd test && echo "generating dummy tests (if needed)..." && \
 
 gentests:
        @(cd test && echo "generating dummy tests (if needed)..." && \