Due to an increasing number of clashes between modern OpenSSL and

libdes (which is still used out there) or other des implementations,
the OpenSSL DES functions are renamed to begin with DES_ instead of
des_.  Compatibility routines are provided and declared by including
openssl/des_old.h.  Those declarations are the same as were in des.h
when the OpenSSL project started, which is exactly how libdes looked
at that time, and hopefully still looks today.

The compatibility functions will be removed in some future release, at
the latest in version 1.0.

2 files changed, 122 insertions, 51 deletions

diff --git a/util/libeay.num b/util/libeay.num
index 884b473ec4..ac05c2aefc 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -701,7 +701,8 @@ bn_mul_words                            707	EXIST::FUNCTION:
 BN_uadd                                 708	EXIST::FUNCTION:
 BN_usub                                 709	EXIST::FUNCTION:
 bn_sqr_words                            710	EXIST::FUNCTION:
-crypt                                   711	EXIST:!NeXT,!PERL5,!__FreeBSD__:FUNCTION:DES
+crypt                                   711	EXIST:!NeXT,!PERL5,!VMS,!WIN16,!__FreeBSD__:FUNCTION:DES
+ocrypt                                  711	EXIST:!NeXT,!PERL5,!__FreeBSD__,VMS,WIN16:FUNCTION:DES
 d2i_ASN1_BIT_STRING                     712	EXIST::FUNCTION:
 d2i_ASN1_BOOLEAN                        713	EXIST::FUNCTION:
 d2i_ASN1_HEADER                         714	EXIST::FUNCTION:
@@ -766,43 +767,43 @@ d2i_X509_SIG                            772	EXIST::FUNCTION:
 d2i_X509_VAL                            773	EXIST::FUNCTION:
 d2i_X509_bio                            774	EXIST::FUNCTION:BIO
 d2i_X509_fp                             775	EXIST::FUNCTION:FP_API
-des_cbc_cksum                           777	EXIST::FUNCTION:DES
-des_cbc_encrypt                         778	EXIST::FUNCTION:DES
-des_cblock_print_file                   779	NOEXIST::FUNCTION:
-des_cfb64_encrypt                       780	EXIST::FUNCTION:DES
-des_cfb_encrypt                         781	EXIST::FUNCTION:DES
-des_decrypt3                            782	EXIST::FUNCTION:DES
-des_ecb3_encrypt                        783	EXIST::FUNCTION:DES
-des_ecb_encrypt                         784	EXIST::FUNCTION:DES
-des_ede3_cbc_encrypt                    785	EXIST::FUNCTION:DES
-des_ede3_cfb64_encrypt                  786	EXIST::FUNCTION:DES
-des_ede3_ofb64_encrypt                  787	EXIST::FUNCTION:DES
-des_enc_read                            788	EXIST::FUNCTION:DES
-des_enc_write                           789	EXIST::FUNCTION:DES
-des_encrypt1                            790	EXIST::FUNCTION:DES
-des_encrypt2                            791	EXIST::FUNCTION:DES
-des_encrypt3                            792	EXIST::FUNCTION:DES
-des_fcrypt                              793	EXIST::FUNCTION:DES
-des_is_weak_key                         794	EXIST::FUNCTION:DES
-des_key_sched                           795	EXIST::FUNCTION:DES
-des_ncbc_encrypt                        796	EXIST::FUNCTION:DES
-des_ofb64_encrypt                       797	EXIST::FUNCTION:DES
-des_ofb_encrypt                         798	EXIST::FUNCTION:DES
-des_options                             799	EXIST::FUNCTION:DES
-des_pcbc_encrypt                        800	EXIST::FUNCTION:DES
-des_quad_cksum                          801	EXIST::FUNCTION:DES
-des_random_key                          802	EXIST::FUNCTION:DES
-des_random_seed                         803	EXIST::FUNCTION:DES
-des_read_2passwords                     804	EXIST::FUNCTION:DES
-des_read_password                       805	EXIST::FUNCTION:DES
-des_read_pw                             806	EXIST::FUNCTION:
-des_read_pw_string                      807	EXIST::FUNCTION:
-des_set_key                             808	EXIST::FUNCTION:DES
-des_set_odd_parity                      809	EXIST::FUNCTION:DES
-des_string_to_2keys                     810	EXIST::FUNCTION:DES
-des_string_to_key                       811	EXIST::FUNCTION:DES
-des_xcbc_encrypt                        812	EXIST::FUNCTION:DES
-des_xwhite_in2out                       813	EXIST::FUNCTION:DES
+DES_cbc_cksum                           777	EXIST::FUNCTION:DES
+DES_cbc_encrypt                         778	EXIST::FUNCTION:DES
+DES_cblock_print_file                   779	NOEXIST::FUNCTION:
+DES_cfb64_encrypt                       780	EXIST::FUNCTION:DES
+DES_cfb_encrypt                         781	EXIST::FUNCTION:DES
+DES_decrypt3                            782	EXIST::FUNCTION:DES
+DES_ecb3_encrypt                        783	EXIST::FUNCTION:DES
+DES_ecb_encrypt                         784	EXIST::FUNCTION:DES
+DES_ede3_cbc_encrypt                    785	EXIST::FUNCTION:DES
+DES_ede3_cfb64_encrypt                  786	EXIST::FUNCTION:DES
+DES_ede3_ofb64_encrypt                  787	EXIST::FUNCTION:DES
+DES_enc_read                            788	EXIST::FUNCTION:DES
+DES_enc_write                           789	EXIST::FUNCTION:DES
+DES_encrypt1                            790	EXIST::FUNCTION:DES
+DES_encrypt2                            791	EXIST::FUNCTION:DES
+DES_encrypt3                            792	EXIST::FUNCTION:DES
+DES_fcrypt                              793	EXIST::FUNCTION:DES
+DES_is_weak_key                         794	EXIST::FUNCTION:DES
+DES_key_sched                           795	EXIST::FUNCTION:DES
+DES_ncbc_encrypt                        796	EXIST::FUNCTION:DES
+DES_ofb64_encrypt                       797	EXIST::FUNCTION:DES
+DES_ofb_encrypt                         798	EXIST::FUNCTION:DES
+DES_options                             799	EXIST::FUNCTION:DES
+DES_pcbc_encrypt                        800	EXIST::FUNCTION:DES
+DES_quad_cksum                          801	EXIST::FUNCTION:DES
+DES_random_key                          802	EXIST::FUNCTION:DES
+DES_random_seed                         803	EXIST::FUNCTION:DES
+DES_read_2passwords                     804	NOEXIST::FUNCTION:
+DES_read_password                       805	NOEXIST::FUNCTION:
+DES_read_pw                             806	NOEXIST::FUNCTION:
+DES_read_pw_string                      807	NOEXIST::FUNCTION:
+DES_set_key                             808	EXIST::FUNCTION:DES
+DES_set_odd_parity                      809	EXIST::FUNCTION:DES
+DES_string_to_2keys                     810	EXIST::FUNCTION:DES
+DES_string_to_key                       811	EXIST::FUNCTION:DES
+DES_xcbc_encrypt                        812	EXIST::FUNCTION:DES
+DES_xwhite_in2out                       813	EXIST::FUNCTION:DES
 fcrypt_body                             814	NOEXIST::FUNCTION:
 i2a_ASN1_INTEGER                        815	EXIST::FUNCTION:BIO
 i2a_ASN1_OBJECT                         816	EXIST::FUNCTION:BIO
@@ -1198,7 +1199,7 @@ s2i_ASN1_OCTET_STRING                   1221	EXIST::FUNCTION:
 X509V3_EXT_check_conf                   1222	NOEXIST::FUNCTION:
 hex_to_string                           1223	EXIST::FUNCTION:
 string_to_hex                           1224	EXIST::FUNCTION:
-des_ede3_cbcm_encrypt                   1225	EXIST::FUNCTION:DES
+DES_ede3_cbcm_encrypt                   1225	EXIST::FUNCTION:DES
 RSA_padding_add_PKCS1_OAEP              1226	EXIST::FUNCTION:RSA
 RSA_padding_check_PKCS1_OAEP            1227	EXIST::FUNCTION:RSA
 X509_CRL_print_fp                       1228	EXIST::FUNCTION:FP_API
@@ -1666,10 +1667,10 @@ X509_add1_trust_object                  2140	EXIST::FUNCTION:
 PKCS12_newpass                          2141	EXIST::FUNCTION:
 SMIME_write_PKCS7                       2142	EXIST::FUNCTION:
 SMIME_read_PKCS7                        2143	EXIST::FUNCTION:
-des_set_key_checked                     2144	EXIST::FUNCTION:DES
+DES_set_key_checked                     2144	EXIST::FUNCTION:DES
 PKCS7_verify                            2145	EXIST::FUNCTION:
 PKCS7_encrypt                           2146	EXIST::FUNCTION:
-des_set_key_unchecked                   2147	EXIST::FUNCTION:DES
+DES_set_key_unchecked                   2147	EXIST::FUNCTION:DES
 SMIME_crlf_copy                         2148	EXIST::FUNCTION:
 i2d_ASN1_PRINTABLESTRING                2149	EXIST::FUNCTION:
 PKCS7_get0_signers                      2150	EXIST::FUNCTION:
@@ -1753,14 +1754,14 @@ ASN1_STRING_TABLE_add                   2245	EXIST::FUNCTION:
 CRYPTO_dbg_get_options                  2246	EXIST::FUNCTION:
 AUTHORITY_INFO_ACCESS_new               2247	EXIST::FUNCTION:
 CRYPTO_get_mem_debug_options            2248	EXIST::FUNCTION:
-des_crypt                               2249	EXIST::FUNCTION:DES
+DES_crypt                               2249	EXIST::FUNCTION:DES
 PEM_write_bio_X509_REQ_NEW              2250	EXIST::FUNCTION:
 PEM_write_X509_REQ_NEW                  2251	EXIST:!WIN16:FUNCTION:
 BIO_callback_ctrl                       2252	EXIST::FUNCTION:
 RAND_egd                                2253	EXIST::FUNCTION:
 RAND_status                             2254	EXIST::FUNCTION:
 bn_dump1                                2255	NOEXIST::FUNCTION:
-des_check_key_parity                    2256	EXIST::FUNCTION:DES
+DES_check_key_parity                    2256	EXIST::FUNCTION:DES
 lh_num_items                            2257	EXIST::FUNCTION:
 RAND_event                              2258	EXIST:WIN32:FUNCTION:
 DSO_new                                 2259	EXIST::FUNCTION:
@@ -1870,9 +1871,9 @@ X509_STORE_CTX_trusted_stack            2452	EXIST::FUNCTION:
 X509_time_adj                           2453	EXIST::FUNCTION:
 X509_check_issued                       2454	EXIST::FUNCTION:
 ASN1_UTCTIME_cmp_time_t                 2455	EXIST::FUNCTION:
-des_set_weak_key_flag                   2456	NOEXIST::FUNCTION:
-des_check_key                           2457	NOEXIST::FUNCTION:
-des_rw_mode                             2458	NOEXIST::FUNCTION:
+DES_set_weak_key_flag                   2456	NOEXIST::FUNCTION:
+DES_check_key                           2457	NOEXIST::FUNCTION:
+DES_rw_mode                             2458	NOEXIST::FUNCTION:
 RSA_PKCS1_RSAref                        2459	NOEXIST::FUNCTION:
 X509_keyid_set1                         2460	EXIST::FUNCTION:
 BIO_next                                2461	EXIST::FUNCTION:
@@ -2122,8 +2123,8 @@ PKCS12_decrypt_skey                     2665	EXIST::FUNCTION:
 KRB5_AUTHENT_it                         2666	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 KRB5_AUTHENT_it                         2666	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 UI_dup_error_string                     2667	EXIST::FUNCTION:
-_shadow_des_rw_mode                     2668	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:DES
-_shadow_des_rw_mode                     2668	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:DES
+_shadow_DES_rw_mode                     2668	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:DES
+_shadow_DES_rw_mode                     2668	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:DES
 RSAPublicKey_it                         2669	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RSA
 RSAPublicKey_it                         2669	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RSA
 i2d_OCSP_REQUEST                        2670	EXIST::FUNCTION:
@@ -2639,8 +2640,8 @@ ASN1_TBOOLEAN_it                        3091	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIA
 ASN1_TBOOLEAN_it                        3091	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 ASN1_item_new                           3092	EXIST::FUNCTION:
 ASN1_TIME_to_generalizedtime            3093	EXIST::FUNCTION:
-_shadow_des_check_key                   3094	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:DES
-_shadow_des_check_key                   3094	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:DES
+_shadow_DES_check_key                   3094	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:DES
+_shadow_DES_check_key                   3094	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:DES
 BIGNUM_it                               3095	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 BIGNUM_it                               3095	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 ENGINE_get_BN_mod_exp                   3096	NOEXIST::FUNCTION:
@@ -2705,3 +2706,73 @@ EVP_DecryptFinal_ex                     3151	EXIST::FUNCTION:
 EVP_EncryptFinal_ex                     3152	EXIST::FUNCTION:
 EVP_DigestFinal_ex                      3153	EXIST::FUNCTION:
 X509_supported_extension                3154	EXIST::FUNCTION:
+des_random_key                          3155	EXIST:!VMS,!WIN16:FUNCTION:DES
+odes_random_key                         3155	EXIST:VMS,WIN16:FUNCTION:DES
+des_encrypt                             3156	EXIST:!VMS,!WIN16:FUNCTION:DES
+odes_encrypt                            3156	EXIST:VMS,WIN16:FUNCTION:DES
+des_is_weak_key                         3157	EXIST:!VMS,!WIN16:FUNCTION:DES
+odes_is_weak_key                        3157	EXIST:VMS,WIN16:FUNCTION:DES
+des_options                             3158	EXIST:!VMS,!WIN16:FUNCTION:DES
+odes_options                            3158	EXIST:VMS,WIN16:FUNCTION:DES
+des_xwhite_in2out                       3159	EXIST:!VMS,!WIN16:FUNCTION:DES
+odes_xwhite_in2out                      3159	EXIST:VMS,WIN16:FUNCTION:DES
+des_crypt                               3160	EXIST:!VMS,!WIN16:FUNCTION:DES
+odes_crypt                              3160	EXIST:VMS,WIN16:FUNCTION:DES
+des_key_sched                           3161	EXIST:!VMS,!WIN16:FUNCTION:DES
+odes_key_sched                          3161	EXIST:VMS,WIN16:FUNCTION:DES
+des_ofb64_encrypt                       3162	EXIST:!VMS,!WIN16:FUNCTION:DES
+odes_ofb64_encrypt                      3162	EXIST:VMS,WIN16:FUNCTION:DES
+des_enc_read                            3163	EXIST:!VMS,!WIN16:FUNCTION:DES
+odes_enc_read                           3163	EXIST:VMS,WIN16:FUNCTION:DES
+des_decrypt3                            3164	EXIST:!VMS,!WIN16:FUNCTION:DES
+odes_decrypt3                           3164	EXIST:VMS,WIN16:FUNCTION:DES
+des_read_password                       3165	EXIST::FUNCTION:DES
+des_string_to_2keys                     3166	EXIST:!VMS,!WIN16:FUNCTION:DES
+odes_string_to_2keys                    3166	EXIST:VMS,WIN16:FUNCTION:DES
+des_ede3_cbc_encrypt                    3167	EXIST:!VMS,!WIN16:FUNCTION:DES
+odes_ede3_cbc_encrypt                   3167	EXIST:VMS,WIN16:FUNCTION:DES
+des_cbc_cksum                           3168	EXIST:!VMS,!WIN16:FUNCTION:DES
+odes_cbc_cksum                          3168	EXIST:VMS,WIN16:FUNCTION:DES
+des_ede3_cfb64_encrypt                  3169	EXIST:!VMS,!WIN16:FUNCTION:DES
+odes_ede3_cfb64_encrypt                 3169	EXIST:VMS,WIN16:FUNCTION:DES
+des_string_to_key                       3170	EXIST:!VMS,!WIN16:FUNCTION:DES
+odes_string_to_key                      3170	EXIST:VMS,WIN16:FUNCTION:DES
+des_set_odd_parity                      3171	EXIST:!VMS,!WIN16:FUNCTION:DES
+odes_set_odd_parity                     3171	EXIST:VMS,WIN16:FUNCTION:DES
+des_fcrypt                              3172	EXIST:!VMS,!WIN16:FUNCTION:DES
+odes_fcrypt                             3172	EXIST:VMS,WIN16:FUNCTION:DES
+des_ecb3_encrypt                        3173	EXIST:!VMS,!WIN16:FUNCTION:DES
+odes_ecb3_encrypt                       3173	EXIST:VMS,WIN16:FUNCTION:DES
+des_read_pw_string                      3174	EXIST::FUNCTION:
+des_cbc_encrypt                         3175	EXIST:!VMS,!WIN16:FUNCTION:DES
+odes_cbc_encrypt                        3175	EXIST:VMS,WIN16:FUNCTION:DES
+des_cfb_encrypt                         3176	EXIST:!VMS,!WIN16:FUNCTION:DES
+odes_cfb_encrypt                        3176	EXIST:VMS,WIN16:FUNCTION:DES
+des_quad_cksum                          3177	EXIST:!VMS,!WIN16:FUNCTION:DES
+odes_quad_cksum                         3177	EXIST:VMS,WIN16:FUNCTION:DES
+des_read_2passwords                     3178	EXIST::FUNCTION:DES
+des_encrypt2                            3179	EXIST:!VMS,!WIN16:FUNCTION:DES
+odes_encrypt2                           3179	EXIST:VMS,WIN16:FUNCTION:DES
+des_encrypt3                            3180	EXIST:!VMS,!WIN16:FUNCTION:DES
+odes_encrypt3                           3180	EXIST:VMS,WIN16:FUNCTION:DES
+des_ede3_ofb64_encrypt                  3181	EXIST:!VMS,!WIN16:FUNCTION:DES
+odes_ede3_ofb64_encrypt                 3181	EXIST:VMS,WIN16:FUNCTION:DES
+des_enc_write                           3182	EXIST:!VMS,!WIN16:FUNCTION:DES
+odes_enc_write                          3182	EXIST:VMS,WIN16:FUNCTION:DES
+des_ncbc_encrypt                        3183	EXIST:!VMS,!WIN16:FUNCTION:DES
+odes_ncbc_encrypt                       3183	EXIST:VMS,WIN16:FUNCTION:DES
+des_pcbc_encrypt                        3184	EXIST:!VMS,!WIN16:FUNCTION:DES
+odes_pcbc_encrypt                       3184	EXIST:VMS,WIN16:FUNCTION:DES
+des_set_key                             3185	EXIST:!VMS,!WIN16:FUNCTION:DES
+odes_set_key                            3185	EXIST:VMS,WIN16:FUNCTION:DES
+des_random_seed                         3186	EXIST:!VMS,!WIN16:FUNCTION:DES
+odes_random_seed                        3186	EXIST:VMS,WIN16:FUNCTION:DES
+des_cfb64_encrypt                       3187	EXIST:!VMS,!WIN16:FUNCTION:DES
+odes_cfb64_encrypt                      3187	EXIST:VMS,WIN16:FUNCTION:DES
+des_ofb_encrypt                         3188	EXIST:!VMS,!WIN16:FUNCTION:DES
+odes_ofb_encrypt                        3188	EXIST:VMS,WIN16:FUNCTION:DES
+des_read_pw                             3189	EXIST::FUNCTION:
+des_xcbc_encrypt                        3190	EXIST:!VMS,!WIN16:FUNCTION:DES
+odes_xcbc_encrypt                       3190	EXIST:VMS,WIN16:FUNCTION:DES
+des_ecb_encrypt                         3191	EXIST:!VMS,!WIN16:FUNCTION:DES
+odes_ecb_encrypt                        3191	EXIST:VMS,WIN16:FUNCTION:DES
diff --git a/util/mkdef.pl b/util/mkdef.pl
index b66d05c06e..9243c0bb61 100755
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -195,7 +195,7 @@ my $ssl="ssl/ssl.h";
 $ssl.=" ssl/kssl.h";
 
 my $crypto ="crypto/crypto.h";
-$crypto.=" crypto/des/des.h" ; # unless $no_des;
+$crypto.=" crypto/des/des.h crypto/des/des_old.h" ; # unless $no_des;
 $crypto.=" crypto/idea/idea.h" ; # unless $no_idea;
 $crypto.=" crypto/rc4/rc4.h" ; # unless $no_rc4;
 $crypto.=" crypto/rc5/rc5.h" ; # unless $no_rc5;