diff options
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/crypto-lib.com | 6 | ||||
| -rw-r--r-- | crypto/des/des-lib.com | 4 | ||||
| -rw-r--r-- | crypto/des/des.h | 6 | ||||
| -rw-r--r-- | crypto/install.com | 2 | ||||
| -rw-r--r-- | crypto/pem/pem.h | 14 | ||||
| -rw-r--r-- | crypto/pkcs7/pkcs7.h | 4 |
6 files changed, 20 insertions, 16 deletions
diff --git a/crypto/crypto-lib.com b/crypto/crypto-lib.com index 4178044191..bf916528eb 100644 --- a/crypto/crypto-lib.com +++ b/crypto/crypto-lib.com @@ -177,7 +177,7 @@ $ LIB_BN = "bn_add,bn_div,bn_exp,bn_lib,bn_mul,"+ - "bn_gcd,bn_prime,bn_err,bn_sqr,"+LIB_BN_ASM+",bn_recp,bn_mont,"+ - "bn_mpi,bn_exp2" $ LIB_RSA = "rsa_eay,rsa_gen,rsa_lib,rsa_sign,rsa_saos,rsa_err,"+ - - "rsa_pk1,rsa_ssl,rsa_none,rsa_oaep" + "rsa_pk1,rsa_ssl,rsa_none,rsa_oaep,rsa_chk" $ LIB_DSA = "dsa_gen,dsa_key,dsa_lib,dsa_asn1,dsa_vrf,dsa_sign,dsa_err" $ LIB_DH = "dh_gen,dh_key,dh_lib,dh_check,dh_err" $ LIB_BUFFER = "buffer,buf_err" @@ -185,7 +185,7 @@ $ LIB_BIO = "bio_lib,bio_cb,bio_err,"+ - "bss_mem,bss_null,bss_fd,"+ - "bss_file,bss_sock,bss_conn,"+ - "bf_null,bf_buff,b_print,b_dump,"+ - - "b_sock,bss_acpt,bf_nbio,bss_rtcp" ! + ",bss_log" for syslog + "b_sock,bss_acpt,bf_nbio,bss_rtcp,bss_bio" ! + ",bss_log" for syslog $ LIB_STACK = "stack" $ LIB_LHASH = "lhash,lh_stats" $ LIB_RAND = "md_rand,randfile,rand_lib" @@ -204,7 +204,7 @@ $ LIB_EVP_2 = "e_ecb_c,e_cbc_c,e_cfb_c,e_ofb_c,"+ - "m_ripemd,"+ - "p_open,p_seal,p_sign,p_verify,p_lib,p_enc,p_dec,"+ - "bio_md,bio_b64,bio_enc,evp_err,e_null,"+ - - "c_all,evp_lib,bio_ok,evp_pkey,evp_pbe" + "c_all,evp_lib,bio_ok,evp_pkey,evp_pbe,p5_crpt,p5_crpt2" $ LIB_ASN1 = "a_object,a_bitstr,a_utctm,a_gentm,a_time,a_int,a_octet,"+ - "a_print,a_type,a_set,a_dup,a_d2i_fp,a_i2d_fp,a_bmp,"+ - "a_enum,a_vis,a_utf8,a_sign,a_digest,a_verify,"+ - diff --git a/crypto/des/des-lib.com b/crypto/des/des-lib.com index 40a34bb0dd..2aea7a0dea 100644 --- a/crypto/des/des-lib.com +++ b/crypto/des/des-lib.com @@ -430,11 +430,13 @@ $! $! Compile The DES Program. $! $ CC/OBJECT='OBJ_DIR'DES.OBJ SYS$DISK:[]DES.C +$ CC/OBJECT='OBJ_DIR'DES.OBJ SYS$DISK:[]CBC3_ENC.C $! $! Link The DES Program. $! $ LINK/'DEBUGGER'/'TRACEBACK'/CONTIGUOUS/EXE='EXE_DIR'DES.EXE - - 'OBJ_DIR'DES.OBJ,'LIB_NAME'/LIBRARY,'OPT_FILE'/OPTION + 'OBJ_DIR'DES.OBJ,'OBJ_DIR'CBC3_ENC.OBJ,- + 'LIB_NAME'/LIBRARY,'OPT_FILE'/OPTION $! $! All Done, Time To Return. $! diff --git a/crypto/des/des.h b/crypto/des/des.h index 141526ba05..54d58ed602 100644 --- a/crypto/des/des.h +++ b/crypto/des/des.h @@ -67,6 +67,10 @@ extern "C" { #error DES is disabled. #endif +#ifdef _KERBEROS_DES_H +#error kerberos/des.h and openssl/des.h +#endif + #include <stdio.h> #include <openssl/opensslconf.h> /* DES_LONG */ #include <openssl/e_os2.h> /* OPENSSL_EXTERN */ @@ -116,11 +120,11 @@ typedef struct des_ks_struct #define des_ede2_ofb64_encrypt(i,o,l,k1,k2,iv,n) \ des_ede3_ofb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n)) -#define Key_schedule des_key_schedule #ifdef KERBEROS #define ENCRYPT DES_ENCRYPT #define DECRYPT DES_DECRYPT #endif + #define KEY_SZ DES_KEY_SZ #define string_to_key des_string_to_key #define read_pw_string des_read_pw_string diff --git a/crypto/install.com b/crypto/install.com index 4737a560b5..b75d1b44b2 100644 --- a/crypto/install.com +++ b/crypto/install.com @@ -38,7 +38,7 @@ $ SDIRS := ,MD2,MD5,SHA,MDC2,HMAC,RIPEMD,- BUFFER,BIO,STACK,LHASH,RAND,ERR,OBJECTS,- EVP,ASN1,PEM,X509,X509V3,- CONF,TXT_DB,PKCS7,PKCS12,COMP -$ EXHEADER_ := crypto.h,tmdiff.h,opensslv.h,opensslconf.h +$ EXHEADER_ := crypto.h,tmdiff.h,opensslv.h,opensslconf.h,ebcdic.h $ EXHEADER_MD2 := md2.h $ EXHEADER_MD5 := md5.h $ EXHEADER_SHA := sha.h diff --git a/crypto/pem/pem.h b/crypto/pem/pem.h index 5017a87259..91f718826a 100644 --- a/crypto/pem/pem.h +++ b/crypto/pem/pem.h @@ -522,6 +522,10 @@ void PEM_dek_info(char *buf, const char *type, int len, char *str); #ifndef SSLEAY_MACROS +#ifdef VMS +#include <openssl/vms_idhacks.h> +#endif + DECLARE_PEM_rw(X509, X509) DECLARE_PEM_rw(X509_REQ, X509_REQ) @@ -560,16 +564,6 @@ DECLARE_PEM_rw(DHparams, DH) DECLARE_PEM_rw_cb(PrivateKey, EVP_PKEY) -#ifdef VMS -/* Too long names need to be abbreviated to at most 31 characters */ -#undef PEM_write_NETSCAPE_CERT_SEQUENCE -#define PEM_write_NETSCAPE_CERT_SEQUENCE PEM_write_NETSCAPE_CERT_SEQ -#undef PEM_read_bio_NETSCAPE_CERT_SEQUENCE -#define PEM_read_bio_NETSCAPE_CERT_SEQUENCE PEM_read_bio_NETSCAPE_CERT_SEQ -#undef PEM_write_bio_NETSCAPE_CERT_SEQUENCE -#define PEM_write_bio_NETSCAPE_CERT_SEQUENCE PEM_write_bio_NETSCAPE_CERT_SEQ -#endif - int PEM_write_PKCS8PrivateKey(FILE *fp,EVP_PKEY *x,const EVP_CIPHER *enc, char *kstr,int klen, pem_password_cb *cd, void *u); #endif /* SSLEAY_MACROS */ diff --git a/crypto/pkcs7/pkcs7.h b/crypto/pkcs7/pkcs7.h index 859718eb11..c42bd6d391 100644 --- a/crypto/pkcs7/pkcs7.h +++ b/crypto/pkcs7/pkcs7.h @@ -66,6 +66,10 @@ extern "C" { #include <openssl/bio.h> #include <openssl/x509.h> +#ifdef VMS +#include <openssl/vms_idhacks.h> +#endif + #ifdef WIN32 /* Under Win32 this is defined in wincrypt.h */ #undef PKCS7_ISSUER_AND_SERIAL |