diff options
author | Richard Levitte <levitte@openssl.org> | 2003-11-29 09:19:12 +0000 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2003-11-29 09:19:12 +0000 |
commit | d87b79bf31ccbc2da5e80e9e43f6558d3803b65e (patch) | |
tree | 1102ea07a7f20545edfd9d27586abc78ded0e234 | |
parent | 70ef9c5a3ddf317b204c7f77aa3fc01b5ebeb0fb (diff) |
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.
-rw-r--r-- | Makefile.org | 3 | ||||
-rw-r--r-- | crypto/Makefile.ssl | 5 | ||||
-rw-r--r-- | crypto/crypto-lib.com | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/Makefile.org b/Makefile.org index ab3a96adae..5c3e60ff07 100644 --- a/Makefile.org +++ b/Makefile.org @@ -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 diff --git a/crypto/Makefile.ssl b/crypto/Makefile.ssl index 79dec73cfb..a81b367ccf 100644 --- a/crypto/Makefile.ssl +++ b/crypto/Makefile.ssl @@ -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 diff --git a/crypto/crypto-lib.com b/crypto/crypto-lib.com index 410e449046..5f7c83fe54 100644 --- a/crypto/crypto-lib.com +++ b/crypto/crypto-lib.com @@ -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" |