From 3e0f27f3c9419a83e82bda973f8e9ba7296480d6 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Fri, 25 Feb 2000 20:37:46 +0000 Subject: [PATCH] Changes to synchronise with Unix. (actually, much more is needed, like a real config script) --- VMS/vms_idhacks.h | 21 +++++++++++++++++++++ apps/makeapps.com | 7 +++---- crypto/rand/randfile.c | 1 + test/maketests.com | 2 +- 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/VMS/vms_idhacks.h b/VMS/vms_idhacks.h index 37a8cdcfd0..c2010c91e4 100644 --- a/VMS/vms_idhacks.h +++ b/VMS/vms_idhacks.h @@ -143,6 +143,27 @@ #define sk_ACCESS_DESCRIPTION_pop sk_ACC_DESC_pop #define sk_ACCESS_DESCRIPTION_sort sk_ACC_DESC_sort +/* Hack the names created with DECLARE_STACK_OF(CRYPTO_EX_DATA_FUNCS) */ +#define sk_CRYPTO_EX_DATA_FUNCS_new sk_CRYPT_EX_DATFNS_new +#define sk_CRYPTO_EX_DATA_FUNCS_new_null sk_CRYPT_EX_DATFNS_new_null +#define sk_CRYPTO_EX_DATA_FUNCS_free sk_CRYPT_EX_DATFNS_free +#define sk_CRYPTO_EX_DATA_FUNCS_num sk_CRYPT_EX_DATFNS_num +#define sk_CRYPTO_EX_DATA_FUNCS_value sk_CRYPT_EX_DATFNS_value +#define sk_CRYPTO_EX_DATA_FUNCS_set sk_CRYPT_EX_DATFNS_set +#define sk_CRYPTO_EX_DATA_FUNCS_zero sk_CRYPT_EX_DATFNS_zero +#define sk_CRYPTO_EX_DATA_FUNCS_push sk_CRYPT_EX_DATFNS_push +#define sk_CRYPTO_EX_DATA_FUNCS_unshift sk_CRYPT_EX_DATFNS_unshift +#define sk_CRYPTO_EX_DATA_FUNCS_find sk_CRYPT_EX_DATFNS_find +#define sk_CRYPTO_EX_DATA_FUNCS_delete sk_CRYPT_EX_DATFNS_delete +#define sk_CRYPTO_EX_DATA_FUNCS_delete_ptr sk_CRYPT_EX_DATFNS_delete_ptr +#define sk_CRYPTO_EX_DATA_FUNCS_insert sk_CRYPT_EX_DATFNS_insert +#define sk_CRYPTO_EX_DATA_FUNCS_set_cmp_func sk_CRYPT_EX_DATFNS_set_cmp_func +#define sk_CRYPTO_EX_DATA_FUNCS_dup sk_CRYPT_EX_DATFNS_dup +#define sk_CRYPTO_EX_DATA_FUNCS_pop_free sk_CRYPT_EX_DATFNS_pop_free +#define sk_CRYPTO_EX_DATA_FUNCS_shift sk_CRYPT_EX_DATFNS_shift +#define sk_CRYPTO_EX_DATA_FUNCS_pop sk_CRYPT_EX_DATFNS_pop +#define sk_CRYPTO_EX_DATA_FUNCS_sort sk_CRYPT_EX_DATFNS_sort + /* Hack the names created with DECLARE_ASN1_SET_OF(PKCS7_SIGNER_INFO) */ #define i2d_ASN1_SET_OF_PKCS7_SIGNER_INFO i2d_ASN1_SET_OF_PKCS7_SIGINF #define d2i_ASN1_SET_OF_PKCS7_SIGNER_INFO d2i_ASN1_SET_OF_PKCS7_SIGINF diff --git a/apps/makeapps.com b/apps/makeapps.com index cd5458871c..a075c5c843 100644 --- a/apps/makeapps.com +++ b/apps/makeapps.com @@ -152,15 +152,14 @@ $ GOSUB CHECK_OPT_FILE $! $! Define The Application Files. $! -$ LIB_FILES = "VERIFY;ASN1PARS;REQ;DGST;DH;DHPARAM;ENC;GENDH;ERRSTR;"+- +$ LIB_FILES = "VERIFY;ASN1PARS;REQ;DGST;DH;DHPARAM;ENC;PASSWD;GENDH;ERRSTR;"+- "CA;PKCS7;CRL2P7;CRL;"+- "RSA;DSA;DSAPARAM;"+- "X509;GENRSA;GENDSA;S_SERVER;S_CLIENT;SPEED;"+- "S_TIME;APPS;S_CB;S_SOCKET;APP_RAND;VERSION;SESS_ID;"+- "CIPHERS;NSEQ;PKCS12;PKCS8;SPKAC;SMIME" -$ APP_FILES := OPENSSL,'OBJ_DIR'VERIFY.OBJ,ASN1PARS.OBJ,REQ.OBJ,DGST.OBJ,DH.OBJ,ENC.OBJ,GENDH.OBJ,- - ERRSTR.OBJ,CA.OBJ,- - PKCS7.OBJ,CRL2P7.OBJ,CRL.OBJ,- +$ APP_FILES := OPENSSL,'OBJ_DIR'VERIFY.OBJ,ASN1PARS.OBJ,REQ.OBJ,DGST.OBJ,DH.OBJ,DHPARAM.OBJ,ENC.OBJ,PASSWD.OBJ,GENDH.OBJ,ERRSTR.OBJ,. + CA.OBJ,PKCS7.OBJ,CRL2P7.OBJ,CRL.OBJ,- RSA.OBJ,DSA.OBJ,DSAPARAM.OBJ,- X509.OBJ,GENRSA.OBJ,GENDSA.OBJ,S_SERVER.OBJ,S_CLIENT.OBJ,SPEED.OBJ,- S_TIME.OBJ,APPS.OBJ,S_CB.OBJ,S_SOCKET.OBJ,APP_RAND.OBJ,VERSION.OBJ,SESS_ID.OBJ,- diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c index 7ff06adccc..69cb5f4a05 100644 --- a/crypto/rand/randfile.c +++ b/crypto/rand/randfile.c @@ -71,6 +71,7 @@ #else # include #endif +#include OPENSSL_UNISTD #include diff --git a/test/maketests.com b/test/maketests.com index e4b052e688..02faf25b6e 100644 --- a/test/maketests.com +++ b/test/maketests.com @@ -147,7 +147,7 @@ $ TEST_FILES = "BNTEST,IDEATEST,MD2TEST,MD5TEST,HMACTEST,"+ - "RC2TEST,RC4TEST,RC5TEST,"+ - "DESTEST,SHATEST,SHA1TEST,MDC2TEST,RMDTEST,"+ - "RANDTEST,DHTEST,"+ - - "BFTEST,CASTTEST,SSLTEST,EXPTEST,DSATEST,RSA_OAEP_TEST" + "BFTEST,CASTTEST,SSLTEST,EXPTEST,DSATEST,RSATEST" $ TCPIP_PROGRAMS = ",," $ IF COMPILER .EQS. "VAXC" THEN - TCPIP_PROGRAMS = ",SSLTEST," -- GitLab