From 87ebdd8a718adec7efc8ae7c31025db1d3959ac2 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Thu, 28 Feb 2002 13:17:40 +0000 Subject: [PATCH] VMS addaptation, including a few more long names that needed hacking. --- crypto/crypto-lib.com | 11 ++++++----- crypto/evp/evp.h | 2 ++ crypto/symhacks.h | 12 ++++++++++++ 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/crypto/crypto-lib.com b/crypto/crypto-lib.com index e4e4fd4c54..ec6862e3c2 100644 --- a/crypto/crypto-lib.com +++ b/crypto/crypto-lib.com @@ -187,7 +187,8 @@ $ LIB_DES = "set_key,ecb_enc,cbc_enc,"+ - "enc_read,enc_writ,ofb64enc,"+ - "ofb_enc,str2key,pcbc_enc,qud_cksm,rand_key,"+ - "des_enc,fcrypt_b,"+ - - "fcrypt,xcbc_enc,rpc_enc,cbc_cksm,ede_cbcm_enc,des_old" + "fcrypt,xcbc_enc,rpc_enc,cbc_cksm,"+ + "ede_cbcm_enc,des_old,read2pwd" $ LIB_RC2 = "rc2_ecb,rc2_skey,rc2_cbc,rc2cfb64,rc2ofb64" $ LIB_RC4 = "rc4_skey,rc4_enc" $ LIB_RC5 = "rc5_skey,rc5_ecb,rc5_enc,rc5cfb64,rc5ofb64" @@ -214,8 +215,8 @@ $ LIB_ENGINE = "eng_err,eng_lib,eng_list,eng_init,eng_ctrl,"+ - "tb_rsa,tb_dsa,tb_dh,tb_rand,tb_cipher,tb_digest,"+ - "eng_openssl,eng_dyn,eng_cnf,"+ - "hw_atalla,hw_cswift,hw_ncipher,hw_nuron,hw_ubsec,"+ - - "hw_openbsd_dev_crypto" -$ LIB_AES = "aes_core,aes_misc,aes_ecb,aes_cbc" + "hw_openbsd_dev_crypto,hw_aep,hw_sureware,hw_4758_cca" +$ LIB_AES = "aes_core,aes_misc,aes_ecb,aes_cbc,aes_cfb,aes_ofb,aes_ctr" $ LIB_BUFFER = "buffer,buf_err" $ LIB_BIO = "bio_lib,bio_cb,bio_err,"+ - "bss_mem,bss_null,bss_fd,"+ - @@ -274,8 +275,8 @@ $ LIB_COMP = "comp_lib,"+ - "c_rle,c_zlib" $ 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_UI_COMPAT = ",ui_compat" +$ LIB_UI = "ui_err,ui_lib,ui_openssl,ui_util"+LIB_UI_COMPAT $ LIB_KRB5 = "krb5_asn" $! $! Setup exceptional compilations diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h index 8d99c29f5f..d6494ed06a 100644 --- a/crypto/evp/evp.h +++ b/crypto/evp/evp.h @@ -69,6 +69,8 @@ #include +#include + #ifndef OPENSSL_NO_BIO #include #endif diff --git a/crypto/symhacks.h b/crypto/symhacks.h index d1aff2ae32..de0f452b47 100644 --- a/crypto/symhacks.h +++ b/crypto/symhacks.h @@ -182,6 +182,18 @@ #undef OCSP_SINGLERESP_get_ext_by_critical #define OCSP_SINGLERESP_get_ext_by_critical OCSP_SINGLERESP_get_ext_by_crit +/* Hack some long DES names */ +#undef _ossl_old_des_ede3_cfb64_encrypt +#define _ossl_old_des_ede3_cfb64_encrypt _ossl_odes_ede3_cfb64_encrypt +#undef _ossl_old_des_ede3_ofb64_encrypt +#define _ossl_old_des_ede3_ofb64_encrypt _ossl_odes_ede3_ofb64_encrypt + +/* Hack some long EVP names */ +#undef OPENSSL_add_all_algorithms_noconf +#define OPENSSL_add_all_algorithms_noconf OPENSSL_add_all_algo_noconf +#undef OPENSSL_add_all_algorithms_conf +#define OPENSSL_add_all_algorithms_conf OPENSSL_add_all_algo_conf + /* Hack some long EC names */ #undef EC_POINT_set_Jprojective_coordinates_GFp #define EC_POINT_set_Jprojective_coordinates_GFp \