Compensate for BSDi shell bug.

[openssl.git] / Makefile.org

diff --git a/Makefile.org b/Makefile.org
index fa4c83b90cb50b19e476972ca96d497e51a24491..39add98f8d421815b638b6b583c7560008a37691 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -88,7 +88,7 @@ PROCESSOR=
 CPUID_OBJ= 
 BN_ASM= bn_asm.o
 DES_ENC= des_enc.o fcrypt_b.o
 CPUID_OBJ= 
 BN_ASM= bn_asm.o
 DES_ENC= des_enc.o fcrypt_b.o

-AES_ASM_OBJ=aes_core.o aes_cbc.o
+AES_ENC= aes_core.o aes_cbc.o

 BF_ENC= bf_enc.o
 CAST_ENC= c_enc.o
 RC4_ENC= rc4_enc.o
 BF_ENC= bf_enc.o
 CAST_ENC= c_enc.o
 RC4_ENC= rc4_enc.o


@@ -97,6 +97,7 @@ MD5_ASM_OBJ=
 SHA1_ASM_OBJ= 
 RMD160_ASM_OBJ= 
 WP_ASM_OBJ=
 SHA1_ASM_OBJ= 
 RMD160_ASM_OBJ= 
 WP_ASM_OBJ=

+CMLL_ENC=

 
 # KRB5 stuff
 KRB5_INCLUDES=
 
 # KRB5 stuff
 KRB5_INCLUDES=


@@ -113,7 +114,7 @@ SHLIBDIRS= crypto ssl
 SDIRS=  \
        objects \
        md2 md4 md5 sha mdc2 hmac ripemd whrlpool \
 SDIRS=  \
        objects \
        md2 md4 md5 sha mdc2 hmac ripemd whrlpool \

-       des aes rc2 rc4 rc5 idea bf cast camellia \
+       des aes rc2 rc4 rc5 idea bf cast camellia seed \

        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 \


@@ -191,7 +192,7 @@ BUILDENV=   PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \
                PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}'     \
                CPUID_OBJ='${CPUID_OBJ}'                        \
                BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}'         \
                PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}'     \
                CPUID_OBJ='${CPUID_OBJ}'                        \
                BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}'         \

-               AES_ASM_OBJ='${AES_ASM_OBJ}'                    \
+               AES_ENC='${AES_ENC}' CMLL_ENC='${CMLL_ENC}'     \

                BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}'       \
                RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}'       \
                SHA1_ASM_OBJ='${SHA1_ASM_OBJ}'                  \
                BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}'       \
                RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}'       \
                SHA1_ASM_OBJ='${SHA1_ASM_OBJ}'                  \


@@ -389,7 +390,7 @@ rehash: rehash.time
 rehash.time: certs apps
        @if [ -z "$(CROSS_COMPILE_PREFIX)" ]; then \
                (OPENSSL="`pwd`/util/opensslwrap.sh"; \
 rehash.time: certs apps
        @if [ -z "$(CROSS_COMPILE_PREFIX)" ]; then \
                (OPENSSL="`pwd`/util/opensslwrap.sh"; \

-               [ -x "apps/openssl.exe" ] && OPENSSL="apps/openssl.exe"; \
+               [ -x "apps/openssl.exe" ] && OPENSSL="apps/openssl.exe" || :; \

                OPENSSL_DEBUG_MEMORY=on; \
                export OPENSSL OPENSSL_DEBUG_MEMORY; \
                $(PERL) tools/c_rehash certs) && \
                OPENSSL_DEBUG_MEMORY=on; \
                export OPENSSL OPENSSL_DEBUG_MEMORY; \
                $(PERL) tools/c_rehash certs) && \