Damnit, I'm sick of having to do something special every time a module

that gets built before objects barfs all over the place because it
uses a new NID that hasn't had a chance of getting defined yet (in
this case, it was about a couple of new EC curves, and therefore a
couple of new corresponding NIDs).

I'm placing objects first in SDIRS!  There.

diff --git a/Makefile.org b/Makefile.org
index ab3a96adaed07e9d0e8e910531c28c41c6691a5a..5c3e60ff0711c647fafb30456f1a58b3bf664f52 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -174,10 +174,11 @@ SHLIBDIRS= crypto ssl
 
 # dirs in crypto to build
 SDIRS=  \
 
 # dirs in crypto to build
 SDIRS=  \

+       objects \

        md2 md4 md5 sha mdc2 hmac ripemd \
        des rc2 rc4 rc5 idea bf cast \
        bn ec rsa dsa ecdsa dh ecdh dso engine aes \
        md2 md4 md5 sha mdc2 hmac ripemd \
        des rc2 rc4 rc5 idea bf cast \
        bn ec rsa dsa ecdsa dh ecdh dso engine aes \

-       buffer bio stack lhash rand err objects \
+       buffer bio stack lhash rand err \

        evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 \
        store
 
        evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 \
        store
 

diff --git a/crypto/Makefile.ssl b/crypto/Makefile.ssl
index 79dec73cfb9c69f88f1d453dd4497f1f44580256..a81b367ccfb97d217b00a3d0748282ff0efb712d 100644 (file)
--- a/crypto/Makefile.ssl
+++ b/crypto/Makefile.ssl
@@ -26,10 +26,11 @@ CFLAGS= $(INCLUDE) $(CFLAG)
 
 LIBS=
 
 
 LIBS=
 

-SDIRS= md2 md5 sha mdc2 hmac ripemd \
+SDIRS= objects \
+       md2 md4 md5 sha mdc2 hmac ripemd \

        des rc2 rc4 rc5 idea bf cast \
        bn ec rsa dsa ecdsa ecdh dh dso engine aes \
        des rc2 rc4 rc5 idea bf cast \
        bn ec rsa dsa ecdsa ecdh dh dso engine aes \

-       buffer bio stack lhash rand err objects \
+       buffer bio stack lhash rand err \

        evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 \
        store
 
        evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 \
        store
 

diff --git a/crypto/crypto-lib.com b/crypto/crypto-lib.com
index 410e449046697f330e918c6f1f8977731e547daa..5f7c83fe54f322a8a416689fd189b99ec5aecfa3 100644 (file)
--- a/crypto/crypto-lib.com
+++ b/crypto/crypto-lib.com
@@ -75,10 +75,12 @@ $ ENDIF
 $!
 $! Define The Different Encryption Types.
 $!
 $!
 $! Define The Different Encryption Types.
 $!

-$ ENCRYPT_TYPES = "Basic,MD2,MD4,MD5,SHA,MDC2,HMAC,RIPEMD,"+ -
+$ ENCRYPT_TYPES = "Basic,"+ -
+                 "OBJECTS,"+ -
+                 "MD2,MD4,MD5,SHA,MDC2,HMAC,RIPEMD,"+ -

                  "DES,RC2,RC4,RC5,IDEA,BF,CAST,"+ -
                  "BN,EC,RSA,DSA,ECDSA,DH,ECDH,DSO,ENGINE,AES,"+ -
                  "DES,RC2,RC4,RC5,IDEA,BF,CAST,"+ -
                  "BN,EC,RSA,DSA,ECDSA,DH,ECDH,DSO,ENGINE,AES,"+ -

-                 "BUFFER,BIO,STACK,LHASH,RAND,ERR,OBJECTS,"+ -
+                 "BUFFER,BIO,STACK,LHASH,RAND,ERR,"+ -

                  "EVP,EVP_2,ASN1,ASN1_2,PEM,X509,X509V3,"+ -
                  "CONF,TXT_DB,PKCS7,PKCS12,COMP,OCSP,UI,KRB5,"+ -
                  "STORE"
                  "EVP,EVP_2,ASN1,ASN1_2,PEM,X509,X509V3,"+ -
                  "CONF,TXT_DB,PKCS7,PKCS12,COMP,OCSP,UI,KRB5,"+ -
                  "STORE"