Because there's chances we clash with the system's types.h, rename our

types.h to ossl_typ.h.
Also, it seems like krb5 was forgotten in some places.

diff --git a/crypto/Makefile.ssl b/crypto/Makefile.ssl
index 3e3f5ebaab13b9920483c0f3969e3f253b197a2a..967d0205de8ee74e884170159a3398a865437bdc 100644 (file)
--- a/crypto/Makefile.ssl
+++ b/crypto/Makefile.ssl
@@ -30,7 +30,7 @@ SDIRS=        md2 md5 sha mdc2 hmac ripemd \
        des rc2 rc4 rc5 idea bf cast \
        bn ec rsa dsa dh dso engine rijndael \
        buffer bio stack lhash rand err objects \
-       evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui
+       evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5
 
 GENERAL=Makefile README crypto-lib.com install.com
 
@@ -41,7 +41,7 @@ LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o tmdiff.o cpt_err.o ebcdi
 SRC= $(LIBSRC)
 
 EXHEADER= crypto.h tmdiff.h opensslv.h opensslconf.h ebcdic.h symhacks.h \
-       types.h
+       ossl_typ.h
 HEADER=        cryptlib.h buildinf.h md32_common.h o_time.h $(EXHEADER)
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)

diff --git a/crypto/crypto-lib.com b/crypto/crypto-lib.com
index f28e79eddbd20db0c01191b9e7fd703a1175447a..9428055708936f318875acfc56fe132988b03473 100644 (file)
--- a/crypto/crypto-lib.com
+++ b/crypto/crypto-lib.com
@@ -91,7 +91,7 @@ $ ENCRYPT_TYPES = "Basic,MD2,MD4,MD5,SHA,MDC2,HMAC,RIPEMD,"+ -
                  "BN,EC,RSA,DSA,DH,DSO,ENGINE,RIJNDAEL,"+ -
                  "BUFFER,BIO,STACK,LHASH,RAND,ERR,OBJECTS,"+ -
                  "EVP,EVP_2,ASN1,ASN1_2,PEM,X509,X509V3,"+ -
-                 "CONF,TXT_DB,PKCS7,PKCS12,COMP,OCSP,UI"
+                 "CONF,TXT_DB,PKCS7,PKCS12,COMP,OCSP,UI,KRB5"
 $ ENCRYPT_PROGRAMS = "DES,PKCS7"
 $!
 $! Check To Make Sure We Have Valid Command Line Parameters.
@@ -276,6 +276,7 @@ $ LIB_OCSP = "ocsp_asn,ocsp_ext,ocsp_ht,ocsp_lib,ocsp_cl,"+ -
        "ocsp_srv,ocsp_prn,ocsp_vfy,ocsp_err"
 $ LIB_UI_COMPAT = "ui_compat"
 $ LIB_UI = "ui_err,ui_lib,ui_openssl,"+LIB_UI_COMPAT
+$ LIB_KRB5 = "krb5_asn"
 $!
 $! Setup exceptional compilations
 $!

diff --git a/crypto/install.com b/crypto/install.com
index 6cc3af308cbcf85e302f33e072e4e837266d754d..d7aaa3f92ef6257600755cc3ae105f097377291e 100644 (file)
--- a/crypto/install.com
+++ b/crypto/install.com
@@ -36,7 +36,8 @@ $     SDIRS := ,MD2,MD4,MD5,SHA,MDC2,HMAC,RIPEMD,-
                 DES,RC2,RC4,RC5,IDEA,BF,CAST,-
                 BN,EC,RSA,DSA,DH,DSO,ENGINE,RIJNDAEL,-
                 BUFFER,BIO,STACK,LHASH,RAND,ERR,OBJECTS,-
-                EVP,ASN1,PEM,X509,X509V3,CONF,TXT_DB,PKCS7,PKCS12,COMP,OCSP,UI
+                EVP,ASN1,PEM,X509,X509V3,CONF,TXT_DB,PKCS7,PKCS12,COMP,OCSP,-
+                UI,KRB5
 $      EXHEADER_ := crypto.h,tmdiff.h,opensslv.h,opensslconf.h,ebcdic.h,symhacks.h
 $      EXHEADER_MD2 := md2.h
 $      EXHEADER_MD4 := md4.h
@@ -79,6 +80,7 @@ $     EXHEADER_PKCS12 := pkcs12.h
 $      EXHEADER_COMP := comp.h
 $      EXHEADER_OCSP := ocsp.h
 $      EXHEADER_UI := ui.h,ui_compat.h
+$      EXHEADER_KRB5 := krb5_asn.h
 $      LIBS := LIBCRYPTO
 $
 $      VEXE_DIR := [-.VAX.EXE.CRYPTO]

diff --git a/makevms.com b/makevms.com
index 9aa46b948dd879052f34b3caba62e81bc0e5d466..94a8ea4f3cfaa83864ebabd1b048b49fe81a2046 100755 (executable)
--- a/makevms.com
+++ b/makevms.com
@@ -424,9 +424,9 @@ $ SDIRS := ,MD2,MD4,MD5,SHA,MDC2,HMAC,RIPEMD,-
    DES,RC2,RC4,RC5,IDEA,BF,CAST,-
    BN,EC,RSA,DSA,DH,DSO,ENGINE,RIJNDAEL,-
    BUFFER,BIO,STACK,LHASH,RAND,ERR,OBJECTS,-
-   EVP,ASN1,PEM,X509,X509V3,CONF,TXT_DB,PKCS7,PKCS12,COMP,OCSP,UI
+   EVP,ASN1,PEM,X509,X509V3,CONF,TXT_DB,PKCS7,PKCS12,COMP,OCSP,UI,KRB5
 $ EXHEADER_ := crypto.h,tmdiff.h,opensslv.h,opensslconf.h,ebcdic.h,symhacks.h,-
-               types.h
+               ossl_typ.h
 $ EXHEADER_MD2 := md2.h
 $ EXHEADER_MD4 := md4.h
 $ EXHEADER_MD5 := md5.h
@@ -468,6 +468,7 @@ $ EXHEADER_PKCS12 := pkcs12.h
 $ EXHEADER_COMP := comp.h
 $ EXHEADER_OCSP := ocsp.h
 $ EXHEADER_UI := ui.h,ui_compat.h
+$ EXHEADER_KRB5 := krb5_asn.h
 $
 $ I = 0
 $ LOOP_SDIRS: