Commit d87b79bf authored by Richard Levitte's avatar Richard Levitte
Browse files

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.
parent 70ef9c5a

Makefile.org

+2 −1
Original line number Diff line number Diff line
@@ -174,10 +174,11 @@ SHLIBDIRS= crypto ssl 


# 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 \

	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

crypto/Makefile.ssl

+3 −2
Original line number Diff line number Diff line
@@ -26,10 +26,11 @@ CFLAGS= $(INCLUDE) $(CFLAG) 


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 \

	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

crypto/crypto-lib.com

+4 −2
Original line number Diff line number Diff line
@@ -75,10 +75,12 @@ $ ENDIF 
$!

$! 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,"+ -

		  "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"