Refactoring BIO: Adapt s_client and s_server

[openssl.git] / makevms.com

diff --git a/makevms.com b/makevms.com
index fc7c0a44dec9d99c580c7f7e2e6890bffbf8211e..bfaf261b4e113e276211d955eb61968263d5ddf8 100755 (executable)
--- a/makevms.com
+++ b/makevms.com
@@ -240,7 +240,7 @@ $ WRITE H_FILE "#endif"
 $
 $!
 $! Defined the full SDIRS here.  It will be pruned depending on configuration.
-$! This is an exact copy of what's found in Makefile.org, with spaces replaced
+$! This is an exact copy of what's found in Makefile.in, with spaces replaced
 $! with commas.
 $!
 $ SDIRS := -
@@ -249,7 +249,7 @@ $ SDIRS := -
         des,aes,rc2,rc4,rc5,idea,bf,cast,camellia,seed,modes,-
         bn,ec,rsa,dsa,ecdsa,dh,ecdh,dso,engine,-
         buffer,bio,stack,lhash,rand,err,-
-        evp,asn1,pem,x509,x509v3,conf,txt_db,pkcs7,pkcs12,comp,ocsp,ui,krb5,-
+        evp,asn1,pem,x509,x509v3,conf,txt_db,pkcs7,pkcs12,comp,ocsp,ui,-
         cms,pqueue,ts,jpake,srp,store,cmac
 $
 $! One of the best way to figure out what the list should be is to do
@@ -281,7 +281,6 @@ $ CONFIG_LOGICALS := AES,-
                     HMAC,-
                     IDEA,-
                     JPAKE,-
-                    KRB5,-
                     MD2,-
                     MD4,-
                     MD5,-
@@ -293,8 +292,11 @@ $ CONFIG_LOGICALS := AES,-
                     RC2,-
                     RC4,-
                     RC5,-
+                    RFC3779,-
                     RMD160,-
                     RSA,-
+                    SCT,-
+                     SCRYPT,-
                     SCTP,-
                     SEED,-
                     SOCK,-
@@ -305,7 +307,6 @@ $ CONFIG_LOGICALS := AES,-
                     STATIC_ENGINE,-
                     STDIO,-
                     STORE,-
-                    TLSEXT,-
                     UNIT_TEST,-
                     WHIRLPOOL
 $ CONFIG_EXPERIMENTAL := JPAKE,-
@@ -333,13 +334,10 @@ $ CONFIG_DISABLE_RULES := RIJNDAEL/AES;-
                          SHA/SSL3,TLS1;-
                          RSA,DSA/SSL3,TLS1;-
                          DH/SSL3,TLS1;-
-                         TLS1/TLSEXT;-
                          EC/GOST;-
                          DSA/GOST;-
                          DH/GOST;-
-                         TLSEXT/SRP,HEARTBEAT;-
                          /STATIC_ENGINE;-
-                         /KRB5;-
                          /DEPRECATED;-
                          /EC_NISTP_64_GCC_128;-
                          /GMP;-
@@ -582,20 +580,10 @@ $!
 $   WRITE H_FILE "#if defined(HEADER_RC4_H)"
 $   WRITE H_FILE "#undef RC4_INT"
 $   WRITE H_FILE "#define RC4_INT unsigned int"
-$   WRITE H_FILE "#undef RC4_CHUNK"
-$   WRITE H_FILE "#define RC4_CHUNK unsigned long long"
 $   WRITE H_FILE "#endif"
 $!
 $   WRITE H_FILE "#if defined(HEADER_DES_LOCL_H)"
-$   WRITE H_FILE "#undef DES_LONG"
-$   WRITE H_FILE "#define DES_LONG unsigned int"
-$   WRITE H_FILE "#undef DES_PTR"
-$   WRITE H_FILE "#define DES_PTR"
-$   WRITE H_FILE "#undef DES_RISC1"
-$   WRITE H_FILE "#undef DES_RISC2"
-$   WRITE H_FILE "#define DES_RISC1"
-$   WRITE H_FILE "#undef DES_UNROLL"
-$   WRITE H_FILE "#define DES_UNROLL"
+$   WRITE H_FILE "typedef unsigned int OSSL_DES_LONG;"
 $   WRITE H_FILE "#endif"
 $!
 $   WRITE H_FILE "#if defined(HEADER_BN_H)"
@@ -604,8 +592,6 @@ $   WRITE H_FILE "#undef SIXTY_FOUR_BIT_LONG"
 $   WRITE H_FILE "#undef SIXTY_FOUR_BIT"
 $   WRITE H_FILE "#define SIXTY_FOUR_BIT"
 $   WRITE H_FILE "#undef THIRTY_TWO_BIT"
-$   WRITE H_FILE "#undef SIXTEEN_BIT"
-$   WRITE H_FILE "#undef EIGHT_BIT"
 $   WRITE H_FILE "#endif"
 $
 $   WRITE H_FILE "#undef OPENSSL_EXPORT_VAR_AS_FUNCTION"
@@ -619,18 +605,10 @@ $!
 $   WRITE H_FILE "#if defined(HEADER_RC4_H)"
 $   WRITE H_FILE "#undef RC4_INT"
 $   WRITE H_FILE "#define RC4_INT unsigned char"
-$   WRITE H_FILE "#undef RC4_CHUNK"
-$   WRITE H_FILE "#define RC4_CHUNK unsigned long"
 $   WRITE H_FILE "#endif"
 $!
 $   WRITE H_FILE "#if defined(HEADER_DES_LOCL_H)"
-$   WRITE H_FILE "#undef DES_LONG"
-$   WRITE H_FILE "#define DES_LONG unsigned long"
-$   WRITE H_FILE "#undef DES_PTR"
-$   WRITE H_FILE "#define DES_PTR"
-$   WRITE H_FILE "#undef DES_RISC1"
-$   WRITE H_FILE "#undef DES_RISC2"
-$   WRITE H_FILE "#undef DES_UNROLL"
+$   WRITE H_FILE "typedef unsigned int OSSL_DES_LONG;"
 $   WRITE H_FILE "#endif"
 $!
 $   WRITE H_FILE "#if defined(HEADER_BN_H)"
@@ -639,8 +617,6 @@ $   WRITE H_FILE "#undef SIXTY_FOUR_BIT_LONG"
 $   WRITE H_FILE "#undef SIXTY_FOUR_BIT"
 $   WRITE H_FILE "#undef THIRTY_TWO_BIT"
 $   WRITE H_FILE "#define THIRTY_TWO_BIT"
-$   WRITE H_FILE "#undef SIXTEEN_BIT"
-$   WRITE H_FILE "#undef EIGHT_BIT"
 $   WRITE H_FILE "#endif"
 $!
 $   WRITE H_FILE "#undef OPENSSL_EXPORT_VAR_AS_FUNCTION"
@@ -774,7 +750,7 @@ $ HEADER_SDIRS := , -
    BN, EC, RSA, DSA, ECDSA, DH, ECDH, DSO, ENGINE, -
    BUFFER, BIO, STACK, LHASH, RAND, ERR, -
    EVP, ASN1, PEM, X509, X509V3, CONF, TXT_DB, PKCS7, PKCS12, -
-   COMP, OCSP, UI, KRB5, -
+   COMP, OCSP, UI, -
    CMS, PQUEUE, TS, JPAKE, SRP, STORE, CMAC
 $!
 $ EXHEADER_ := crypto.h, opensslv.h, ebcdic.h, symhacks.h, ossl_typ.h
@@ -826,7 +802,6 @@ $ EXHEADER_PKCS12 := pkcs12.h
 $ EXHEADER_COMP := comp.h
 $ EXHEADER_OCSP := ocsp.h
 $ EXHEADER_UI := ui.h
-$ EXHEADER_KRB5 := krb5_asn.h
 $ EXHEADER_CMS := cms.h
 $ EXHEADER_PQUEUE := pqueue.h
 $ EXHEADER_TS := ts.h
@@ -850,7 +825,7 @@ $!
 $! Copy All The ".H" Files From The [.SSL] Directory.
 $!
 $! (keep these in the same order as ssl/Makefile)
-$ EXHEADER := ssl.h, ssl2.h, ssl3.h, ssl23.h, tls1.h, dtls1.h, kssl.h, srtp.h
+$ EXHEADER := ssl.h, ssl2.h, ssl3.h, ssl23.h, tls1.h, dtls1.h, srtp.h
 $ copy sys$disk:[.ssl]'exheader' sys$disk:[.include.openssl]
 $!
 $! Purge the [.include.openssl] header files.