From: Richard Levitte <levitte@openssl.org>
Date: Thu, 4 Oct 2001 07:34:45 +0000 (+0000)
Subject: Because there's chances we clash with the system's types.h, rename our
X-Git-Tag: OpenSSL_0_9_6c~26^2~153
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=114697bef392419bf95d7f2701bc8b321050b6a5

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 3e3f5ebaab..967d0205de 100644
--- 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 f28e79eddb..9428055708 100644
--- 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 6cc3af308c..d7aaa3f92e 100644
--- 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 9aa46b948d..94a8ea4f3c 100755
--- 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: