I got a request to make the "old des" symbols more closely tied to

OpenSSL.  Adding '_ossl' in the name seems to be a good way to do
this.

CHANGES

@@ -235,8 +235,8 @@
 
   +) Change all functions with names starting with des_ to be starting
      with DES_ instead.  Add wrappers that are compatible with libdes,
-     but are named _old_des_*.  Finally, add macros that map the des_*
-     symbols to the corresponding _old_des_*.
+     but are named _ossl_old_des_*.  Finally, add macros that map the
+     des_* symbols to the corresponding _ossl_old_des_*.
 
      All this is done because there are increasing clashes with libdes
      and other DES libraries that are currently used by other projects.

crypto/des/des_old.c

@@ -76,11 +76,11 @@
 #include <openssl/des.h>
 #include <openssl/rand.h>
 
-const char *_old_des_options(void)
+const char *_ossl_old_des_options(void)
 	{
 	return DES_options();
 	}
-void _old_des_ecb3_encrypt(des_cblock *input,des_cblock *output,
+void _ossl_old_des_ecb3_encrypt(des_cblock *input,des_cblock *output,
 	des_key_schedule ks1,des_key_schedule ks2,
 	des_key_schedule ks3, int enc)
 	{
@@ -88,63 +88,63 @@ void _old_des_ecb3_encrypt(des_cblock *input,des_cblock *output,
 		(DES_key_schedule *)ks1, (DES_key_schedule *)ks2,
 		(DES_key_schedule *)ks3, enc);
 	}
-DES_LONG _old_des_cbc_cksum(des_cblock *input,des_cblock *output,
+DES_LONG _ossl_old_des_cbc_cksum(des_cblock *input,des_cblock *output,
 	long length,des_key_schedule schedule,des_cblock *ivec)
 	{
 	return DES_cbc_cksum((unsigned char *)input, output, length,
 		(DES_key_schedule *)schedule, ivec);
 	}
-void _old_des_cbc_encrypt(des_cblock *input,des_cblock *output,long length,
+void _ossl_old_des_cbc_encrypt(des_cblock *input,des_cblock *output,long length,
 	des_key_schedule schedule,des_cblock *ivec,int enc)
 	{
 	DES_cbc_encrypt((unsigned char *)input, (unsigned char *)output,
 		length, (DES_key_schedule *)schedule, ivec, enc);
 	}
-void _old_des_ncbc_encrypt(des_cblock *input,des_cblock *output,long length,
+void _ossl_old_des_ncbc_encrypt(des_cblock *input,des_cblock *output,long length,
 	des_key_schedule schedule,des_cblock *ivec,int enc)
 	{
 	DES_ncbc_encrypt((unsigned char *)input, (unsigned char *)output,
 		length, (DES_key_schedule *)schedule, ivec, enc);
 	}
-void _old_des_xcbc_encrypt(des_cblock *input,des_cblock *output,long length,
+void _ossl_old_des_xcbc_encrypt(des_cblock *input,des_cblock *output,long length,
 	des_key_schedule schedule,des_cblock *ivec,
 	des_cblock *inw,des_cblock *outw,int enc)
 	{
 	DES_xcbc_encrypt((unsigned char *)input, (unsigned char *)output,
 		length, (DES_key_schedule *)schedule, ivec, inw, outw, enc);
 	}
-void _old_des_cfb_encrypt(unsigned char *in,unsigned char *out,int numbits,
+void _ossl_old_des_cfb_encrypt(unsigned char *in,unsigned char *out,int numbits,
 	long length,des_key_schedule schedule,des_cblock *ivec,int enc)
 	{
 	DES_cfb_encrypt(in, out, numbits, length,
 		(DES_key_schedule *)schedule, ivec, enc);
 	}
-void _old_des_ecb_encrypt(des_cblock *input,des_cblock *output,
+void _ossl_old_des_ecb_encrypt(des_cblock *input,des_cblock *output,
 	des_key_schedule ks,int enc)
 	{
 	DES_ecb_encrypt(input, output, (DES_key_schedule *)ks, enc);
 	}
-void _old_des_encrypt(DES_LONG *data,des_key_schedule ks, int enc)
+void _ossl_old_des_encrypt(DES_LONG *data,des_key_schedule ks, int enc)
 	{
 	DES_encrypt1(data, (DES_key_schedule *)ks, enc);
 	}
-void _old_des_encrypt2(DES_LONG *data,des_key_schedule ks, int enc)
+void _ossl_old_des_encrypt2(DES_LONG *data,des_key_schedule ks, int enc)
 	{
 	DES_encrypt2(data, (DES_key_schedule *)ks, enc);
 	}
-void _old_des_encrypt3(DES_LONG *data, des_key_schedule ks1,
+void _ossl_old_des_encrypt3(DES_LONG *data, des_key_schedule ks1,
 	des_key_schedule ks2, des_key_schedule ks3)
 	{
 	DES_encrypt3(data, (DES_key_schedule *)ks1, (DES_key_schedule *)ks2,
 		(DES_key_schedule *)ks3);
 	}
-void _old_des_decrypt3(DES_LONG *data, des_key_schedule ks1,
+void _ossl_old_des_decrypt3(DES_LONG *data, des_key_schedule ks1,
 	des_key_schedule ks2, des_key_schedule ks3)
 	{
 	DES_decrypt3(data, (DES_key_schedule *)ks1, (DES_key_schedule *)ks2,
 		(DES_key_schedule *)ks3);
 	}
-void _old_des_ede3_cbc_encrypt(des_cblock *input, des_cblock *output, 
+void _ossl_old_des_ede3_cbc_encrypt(des_cblock *input, des_cblock *output, 
 	long length, des_key_schedule ks1, des_key_schedule ks2, 
 	des_key_schedule ks3, des_cblock *ivec, int enc)
 	{
@@ -152,7 +152,7 @@ void _old_des_ede3_cbc_encrypt(des_cblock *input, des_cblock *output,
 		length, (DES_key_schedule *)ks1, (DES_key_schedule *)ks2,
 		(DES_key_schedule *)ks3, ivec, enc);
 	}
-void _old_des_ede3_cfb64_encrypt(unsigned char *in, unsigned char *out,
+void _ossl_old_des_ede3_cfb64_encrypt(unsigned char *in, unsigned char *out,
 	long length, des_key_schedule ks1, des_key_schedule ks2,
 	des_key_schedule ks3, des_cblock *ivec, int *num, int enc)
 	{
@@ -160,7 +160,7 @@ void _old_des_ede3_cfb64_encrypt(unsigned char *in, unsigned char *out,
 		(DES_key_schedule *)ks1, (DES_key_schedule *)ks2,
 		(DES_key_schedule *)ks3, ivec, num, enc);
 	}
-void _old_des_ede3_ofb64_encrypt(unsigned char *in, unsigned char *out,
+void _ossl_old_des_ede3_ofb64_encrypt(unsigned char *in, unsigned char *out,
 	long length, des_key_schedule ks1, des_key_schedule ks2,
 	des_key_schedule ks3, des_cblock *ivec, int *num)
 	{
@@ -169,93 +169,93 @@ void _old_des_ede3_ofb64_encrypt(unsigned char *in, unsigned char *out,
 		(DES_key_schedule *)ks3, ivec, num);
 	}
 
-void _old_des_xwhite_in2out(des_cblock (*des_key), des_cblock (*in_white),
+void _ossl_old_des_xwhite_in2out(des_cblock (*des_key), des_cblock (*in_white),
 	des_cblock (*out_white))
 	{
 	DES_xwhite_in2out(des_key, in_white, out_white);
 	}
 
-int _old_des_enc_read(int fd,char *buf,int len,des_key_schedule sched,
+int _ossl_old_des_enc_read(int fd,char *buf,int len,des_key_schedule sched,
 	des_cblock *iv)
 	{
 	return DES_enc_read(fd, buf, len, (DES_key_schedule *)sched, iv);
 	}
-int _old_des_enc_write(int fd,char *buf,int len,des_key_schedule sched,
+int _ossl_old_des_enc_write(int fd,char *buf,int len,des_key_schedule sched,
 	des_cblock *iv)
 	{
 	return DES_enc_write(fd, buf, len, (DES_key_schedule *)sched, iv);
 	}
-char *_old_des_fcrypt(const char *buf,const char *salt, char *ret)
+char *_ossl_old_des_fcrypt(const char *buf,const char *salt, char *ret)
 	{
 	return DES_fcrypt(buf, salt, ret);
 	}
-char *_old_des_crypt(const char *buf,const char *salt)
+char *_ossl_old_des_crypt(const char *buf,const char *salt)
 	{
 	return DES_crypt(buf, salt);
 	}
 #if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(_DARWIN)
-char *_old_crypt(const char *buf,const char *salt)
+char *_ossl_old_crypt(const char *buf,const char *salt)
 	{
 	return DES_crypt(buf, salt);
 	}
 #endif
-void _old_des_ofb_encrypt(unsigned char *in,unsigned char *out,
+void _ossl_old_des_ofb_encrypt(unsigned char *in,unsigned char *out,
 	int numbits,long length,des_key_schedule schedule,des_cblock *ivec)
 	{
 	DES_ofb_encrypt(in, out, numbits, length, (DES_key_schedule *)schedule,
 		ivec);
 	}
-void _old_des_pcbc_encrypt(des_cblock *input,des_cblock *output,long length,
+void _ossl_old_des_pcbc_encrypt(des_cblock *input,des_cblock *output,long length,
 	des_key_schedule schedule,des_cblock *ivec,int enc)
 	{
 	DES_pcbc_encrypt((unsigned char *)input, (unsigned char *)output,
 		length, (DES_key_schedule *)schedule, ivec, enc);
 	}
-DES_LONG _old_des_quad_cksum(des_cblock *input,des_cblock *output,
+DES_LONG _ossl_old_des_quad_cksum(des_cblock *input,des_cblock *output,
 	long length,int out_count,des_cblock *seed)
 	{
 	return DES_quad_cksum((unsigned char *)input, output, length,
 		out_count, seed);
 	}
-void _old_des_random_seed(des_cblock key)
+void _ossl_old_des_random_seed(des_cblock key)
 	{
 	RAND_seed(key, sizeof(des_cblock));
 	}
-void _old_des_random_key(des_cblock ret)
+void _ossl_old_des_random_key(des_cblock ret)
 	{
 	DES_random_key((DES_cblock *)ret);
 	}
-void _old_des_set_odd_parity(des_cblock *key)
+void _ossl_old_des_set_odd_parity(des_cblock *key)
 	{
 	DES_set_odd_parity(key);
 	}
-int _old_des_is_weak_key(des_cblock *key)
+int _ossl_old_des_is_weak_key(des_cblock *key)
 	{
 	return DES_is_weak_key(key);
 	}
-int _old_des_set_key(des_cblock *key,des_key_schedule schedule)
+int _ossl_old_des_set_key(des_cblock *key,des_key_schedule schedule)
 	{
 	return DES_set_key(key, (DES_key_schedule *)schedule);
 	}
-int _old_des_key_sched(des_cblock *key,des_key_schedule schedule)
+int _ossl_old_des_key_sched(des_cblock *key,des_key_schedule schedule)
 	{
 	return DES_key_sched(key, (DES_key_schedule *)schedule);
 	}
-void _old_des_string_to_key(char *str,des_cblock *key)
+void _ossl_old_des_string_to_key(char *str,des_cblock *key)
 	{
 	DES_string_to_key(str, key);
 	}
-void _old_des_string_to_2keys(char *str,des_cblock *key1,des_cblock *key2)
+void _ossl_old_des_string_to_2keys(char *str,des_cblock *key1,des_cblock *key2)
 	{
 	DES_string_to_2keys(str, key1, key2);
 	}
-void _old_des_cfb64_encrypt(unsigned char *in, unsigned char *out, long length,
+void _ossl_old_des_cfb64_encrypt(unsigned char *in, unsigned char *out, long length,
 	des_key_schedule schedule, des_cblock *ivec, int *num, int enc)
 	{
 	DES_cfb64_encrypt(in, out, length, (DES_key_schedule *)schedule,
 		ivec, num, enc);
 	}
-void _old_des_ofb64_encrypt(unsigned char *in, unsigned char *out, long length,
+void _ossl_old_des_ofb64_encrypt(unsigned char *in, unsigned char *out, long length,
 	des_key_schedule schedule, des_cblock *ivec, int *num)
 	{
 	DES_ofb64_encrypt(in, out, length, (DES_key_schedule *)schedule,

crypto/des/des_old.h

@@ -107,76 +107,76 @@ typedef struct des_ks_struct
 		} ks;
 	} des_key_schedule[16];
 
-/* Map all function names to _old_des_* form, so we avoid all clashes with
-   libdes */
+/* Map all function names to _ossl_old_des_* form, so we avoid all
+   clashes with libdes */
 #define des_ecb3_encrypt(i,o,k1,k2,k3,e)\
-	_old_des_ecb3_encrypt((i),(o),(k1),(k2),(k3),(e))
+	_ossl_old_des_ecb3_encrypt((i),(o),(k1),(k2),(k3),(e))
 #define des_ecb3_cbc_encrypt(i,o,l,k1,k2,k3,iv,e)\
-	_old_des_ecb3_cbc_encrypt((i),(o),(k1),(k2),(k3),(e))
+	_ossl_old_des_ecb3_cbc_encrypt((i),(o),(k1),(k2),(k3),(e))
 #define des_ecb3_cfb64_encrypt(i,o,l,k1,k2,k3,iv,n,e)\
-	_old_des_ecb3_cfb64_encrypt((i),(o),(k1),(k2),(k3),(e))
+	_ossl_old_des_ecb3_cfb64_encrypt((i),(o),(k1),(k2),(k3),(e))
 #define des_ecb3_ofb64_encrypt(i,o,l,k1,k2,k3,iv,n)\
-	_old_des_ecb3_ofb64_encrypt((i),(o),(k1),(k2),(k3),(e))
+	_ossl_old_des_ecb3_ofb64_encrypt((i),(o),(k1),(k2),(k3),(e))
 #define des_options()\
-	_old_des_options()
+	_ossl_old_des_options()
 #define des_cbc_cksum(i,o,l,k,iv)\
-	_old_des_cbc_cksum((i),(o),(l),(k),(iv))
+	_ossl_old_des_cbc_cksum((i),(o),(l),(k),(iv))
 #define des_cbc_encrypt(i,o,l,k,iv,e)\
-	_old_des_cbc_encrypt((i),(o),(l),(k),(iv),(e))
+	_ossl_old_des_cbc_encrypt((i),(o),(l),(k),(iv),(e))
 #define des_ncbc_encrypt(i,o,l,k,iv,e)\
-	_old_des_ncbc_encrypt((i),(o),(l),(k),(iv),(e))
+	_ossl_old_des_ncbc_encrypt((i),(o),(l),(k),(iv),(e))
 #define des_xcbc_encrypt(i,o,l,k,iv,inw,outw,e)\
-	_old_des_xcbc_encrypt((i),(o),(l),(k),(iv),(inw),(outw),(e))
+	_ossl_old_des_xcbc_encrypt((i),(o),(l),(k),(iv),(inw),(outw),(e))
 #define des_cfb_encrypt(i,o,l,k,iv,e)\
-	_old_des_cfb_encrypt((i),(o),(l),(k),(iv),(e))
+	_ossl_old_des_cfb_encrypt((i),(o),(l),(k),(iv),(e))
 #define des_ecb_encrypt(i,o,k,e)\
-	_old_des_ecb_encrypt((i),(o),(k),(e))
+	_ossl_old_des_ecb_encrypt((i),(o),(k),(e))
 #define des_encrypt(d,k,e)\
-	_old_des_encrypt((d),(k),(e))
+	_ossl_old_des_encrypt((d),(k),(e))
 #define des_encrypt2(d,k,e)\
-	_old_des_encrypt2((d),(k),(e))
+	_ossl_old_des_encrypt2((d),(k),(e))
 #define des_encrypt3(d,k1,k2,k3)\
-	_old_des_encrypt3((d),(k1),(k2),(k3))
+	_ossl_old_des_encrypt3((d),(k1),(k2),(k3))
 #define des_decrypt3(d,k1,k2,k3)\
-	_old_des_decrypt3((d),(k1),(k2),(k3))
+	_ossl_old_des_decrypt3((d),(k1),(k2),(k3))
 #define des_des_xwhite_in2out(k,i,o)\
-	_old_des_des_xwhite_in2out((k),(i),(o))
+	_ossl_old_des_des_xwhite_in2out((k),(i),(o))
 #define des_enc_read(f,b,l,k,iv)\
-	_old_des_enc_read((f),(b),(l),(k),(iv))
+	_ossl_old_des_enc_read((f),(b),(l),(k),(iv))
 #define des_enc_write(f,b,l,k,iv)\
-	_old_des_enc_write((f),(b),(l),(k),(iv))
+	_ossl_old_des_enc_write((f),(b),(l),(k),(iv))
 #define des_fcrypt(b,s,r)\
-	_old_des_fcrypt((b),(s),(r))
+	_ossl_old_des_fcrypt((b),(s),(r))
 #define des_crypt(b,s)\
-	_old_des_crypt((b),(s))
+	_ossl_old_des_crypt((b),(s))
 #define crypt(b,s)\
-	_old_crypt((b),(s))
+	_ossl_old_crypt((b),(s))
 #define des_ofb_encrypt(i,o,n,l,k,iv)\
-	_old_des_ofb_encrypt((i),(o),(n),(l),(k),(iv))
+	_ossl_old_des_ofb_encrypt((i),(o),(n),(l),(k),(iv))
 #define des_pcbc_encrypt(i,o,l,k,iv,e)\
-	_old_des_pcbc_encrypt((i),(o),(l),(k),(iv),(e))
+	_ossl_old_des_pcbc_encrypt((i),(o),(l),(k),(iv),(e))
 #define des_quad_cksum(i,o,l,c,s)\
-	_old_des_quad_cksum((i),(o),(l),(c),(s))
+	_ossl_old_des_quad_cksum((i),(o),(l),(c),(s))
 #define des_random_seed(k);\
-	_old_des_random_seed((k));
+	_ossl_old_des_random_seed((k));
 #define des_random_key(r);\
-	_old_des_random_key((r));
+	_ossl_old_des_random_key((r));
 #define des_set_odd_parity(k);\
-	_old_des_set_odd_parity((k));
+	_ossl_old_des_set_odd_parity((k));
 #define des_is_weak_key(k);\
-	_old_des_is_weak_key((k));
+	_ossl_old_des_is_weak_key((k));
 #define des_set_key(k,ks)\
-	_old_des_set_key((k),(ks))
+	_ossl_old_des_set_key((k),(ks))
 #define des_key_sched(k,ks)\
-	_old_des_key_sched((k),(ks))
+	_ossl_old_des_key_sched((k),(ks))
 #define des_string_to_key(s,k)\
-	_old_des_string_to_key((s),(k))
+	_ossl_old_des_string_to_key((s),(k))
 #define des_string_to_2keys(s,k1,k2)\
-	_old_des_string_to_2keys((s),(k1),(k2))
+	_ossl_old_des_string_to_2keys((s),(k1),(k2))
 #define des_cfb64_encrypt(i,o,l,ks,iv,n,e)\
-	_old_des_cfb64_encrypt((i),(o),(l),(ks),(iv),(n),(e))
+	_ossl_old_des_cfb64_encrypt((i),(o),(l),(ks),(iv),(n),(e))
 #define des_ofb64_encrypt(i,o,l,ks,iv,n)\
-	_old_des_ofb64_encrypt((i),(o),(l),(ks),(iv),(n))
+	_ossl_old_des_ofb64_encrypt((i),(o),(l),(ks),(iv),(n))
 		
 
 #define des_ecb2_encrypt(i,o,k1,k2,e) \
@@ -194,68 +194,68 @@ typedef struct des_ks_struct
 #define des_check_key DES_check_key
 #define des_rw_mode DES_rw_mode
 
-const char *_old_des_options(void);
-void _old_des_ecb3_encrypt(des_cblock *input,des_cblock *output,
+const char *_ossl_old_des_options(void);
+void _ossl_old_des_ecb3_encrypt(des_cblock *input,des_cblock *output,
 	des_key_schedule ks1,des_key_schedule ks2,
 	des_key_schedule ks3, int enc);
-DES_LONG _old_des_cbc_cksum(des_cblock *input,des_cblock *output,
+DES_LONG _ossl_old_des_cbc_cksum(des_cblock *input,des_cblock *output,
 	long length,des_key_schedule schedule,des_cblock *ivec);
-void _old_des_cbc_encrypt(des_cblock *input,des_cblock *output,long length,
+void _ossl_old_des_cbc_encrypt(des_cblock *input,des_cblock *output,long length,
 	des_key_schedule schedule,des_cblock *ivec,int enc);
-void _old_des_ncbc_encrypt(des_cblock *input,des_cblock *output,long length,
+void _ossl_old_des_ncbc_encrypt(des_cblock *input,des_cblock *output,long length,
 	des_key_schedule schedule,des_cblock *ivec,int enc);
-void _old_des_xcbc_encrypt(des_cblock *input,des_cblock *output,long length,
+void _ossl_old_des_xcbc_encrypt(des_cblock *input,des_cblock *output,long length,
 	des_key_schedule schedule,des_cblock *ivec,
 	des_cblock *inw,des_cblock *outw,int enc);
-void _old_des_cfb_encrypt(unsigned char *in,unsigned char *out,int numbits,
+void _ossl_old_des_cfb_encrypt(unsigned char *in,unsigned char *out,int numbits,
 	long length,des_key_schedule schedule,des_cblock *ivec,int enc);
-void _old_des_ecb_encrypt(des_cblock *input,des_cblock *output,
+void _ossl_old_des_ecb_encrypt(des_cblock *input,des_cblock *output,
 	des_key_schedule ks,int enc);
-void _old_des_encrypt(DES_LONG *data,des_key_schedule ks, int enc);
-void _old_des_encrypt2(DES_LONG *data,des_key_schedule ks, int enc);
-void _old_des_encrypt3(DES_LONG *data, des_key_schedule ks1,
+void _ossl_old_des_encrypt(DES_LONG *data,des_key_schedule ks, int enc);
+void _ossl_old_des_encrypt2(DES_LONG *data,des_key_schedule ks, int enc);
+void _ossl_old_des_encrypt3(DES_LONG *data, des_key_schedule ks1,
 	des_key_schedule ks2, des_key_schedule ks3);
-void _old_des_decrypt3(DES_LONG *data, des_key_schedule ks1,
+void _ossl_old_des_decrypt3(DES_LONG *data, des_key_schedule ks1,
 	des_key_schedule ks2, des_key_schedule ks3);
-void _old_des_ede3_cbc_encrypt(des_cblock *input, des_cblock *output, 
+void _ossl_old_des_ede3_cbc_encrypt(des_cblock *input, des_cblock *output, 
 	long length, des_key_schedule ks1, des_key_schedule ks2, 
 	des_key_schedule ks3, des_cblock *ivec, int enc);
-void _old_des_ede3_cfb64_encrypt(unsigned char *in, unsigned char *out,
+void _ossl_old_des_ede3_cfb64_encrypt(unsigned char *in, unsigned char *out,
 	long length, des_key_schedule ks1, des_key_schedule ks2,
 	des_key_schedule ks3, des_cblock *ivec, int *num, int enc);
-void _old_des_ede3_ofb64_encrypt(unsigned char *in, unsigned char *out,
+void _ossl_old_des_ede3_ofb64_encrypt(unsigned char *in, unsigned char *out,
 	long length, des_key_schedule ks1, des_key_schedule ks2,
 	des_key_schedule ks3, des_cblock *ivec, int *num);
 
-void _old_des_xwhite_in2out(des_cblock (*des_key), des_cblock (*in_white),
+void _ossl_old_des_xwhite_in2out(des_cblock (*des_key), des_cblock (*in_white),
 	des_cblock (*out_white));
 
-int _old_des_enc_read(int fd,char *buf,int len,des_key_schedule sched,
+int _ossl_old_des_enc_read(int fd,char *buf,int len,des_key_schedule sched,
 	des_cblock *iv);
-int _old_des_enc_write(int fd,char *buf,int len,des_key_schedule sched,
+int _ossl_old_des_enc_write(int fd,char *buf,int len,des_key_schedule sched,
 	des_cblock *iv);
-char *_old_des_fcrypt(const char *buf,const char *salt, char *ret);
-char *_old_des_crypt(const char *buf,const char *salt);
+char *_ossl_old_des_fcrypt(const char *buf,const char *salt, char *ret);
+char *_ossl_old_des_crypt(const char *buf,const char *salt);
 #if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT)
-char *_old_crypt(const char *buf,const char *salt);
+char *_ossl_old_crypt(const char *buf,const char *salt);
 #endif
-void _old_des_ofb_encrypt(unsigned char *in,unsigned char *out,
+void _ossl_old_des_ofb_encrypt(unsigned char *in,unsigned char *out,
 	int numbits,long length,des_key_schedule schedule,des_cblock *ivec);
-void _old_des_pcbc_encrypt(des_cblock *input,des_cblock *output,long length,
+void _ossl_old_des_pcbc_encrypt(des_cblock *input,des_cblock *output,long length,
 	des_key_schedule schedule,des_cblock *ivec,int enc);
-DES_LONG _old_des_quad_cksum(des_cblock *input,des_cblock *output,
+DES_LONG _ossl_old_des_quad_cksum(des_cblock *input,des_cblock *output,
 	long length,int out_count,des_cblock *seed);
-void _old_des_random_seed(des_cblock key);
-void _old_des_random_key(des_cblock ret);
-void _old_des_set_odd_parity(des_cblock *key);
-int _old_des_is_weak_key(des_cblock *key);
-int _old_des_set_key(des_cblock *key,des_key_schedule schedule);
-int _old_des_key_sched(des_cblock *key,des_key_schedule schedule);
-void _old_des_string_to_key(char *str,des_cblock *key);
-void _old_des_string_to_2keys(char *str,des_cblock *key1,des_cblock *key2);
-void _old_des_cfb64_encrypt(unsigned char *in, unsigned char *out, long length,
+void _ossl_old_des_random_seed(des_cblock key);
+void _ossl_old_des_random_key(des_cblock ret);
+void _ossl_old_des_set_odd_parity(des_cblock *key);
+int _ossl_old_des_is_weak_key(des_cblock *key);
+int _ossl_old_des_set_key(des_cblock *key,des_key_schedule schedule);
+int _ossl_old_des_key_sched(des_cblock *key,des_key_schedule schedule);
+void _ossl_old_des_string_to_key(char *str,des_cblock *key);
+void _ossl_old_des_string_to_2keys(char *str,des_cblock *key1,des_cblock *key2);
+void _ossl_old_des_cfb64_encrypt(unsigned char *in, unsigned char *out, long length,
 	des_key_schedule schedule, des_cblock *ivec, int *num, int enc);
-void _old_des_ofb64_encrypt(unsigned char *in, unsigned char *out, long length,
+void _ossl_old_des_ofb64_encrypt(unsigned char *in, unsigned char *out, long length,
 	des_key_schedule schedule, des_cblock *ivec, int *num);
 
 /* The following definitions provide compatibility with the MIT Kerberos

util/libeay.num

@@ -701,7 +701,7 @@ bn_mul_words                            707	EXIST::FUNCTION:
 BN_uadd                                 708	EXIST::FUNCTION:
 BN_usub                                 709	EXIST::FUNCTION:
 bn_sqr_words                            710	EXIST::FUNCTION:
-_old_crypt                              711	EXIST:!NeXT,!PERL5,!__FreeBSD__:FUNCTION:DES
+_ossl_old_crypt                         711	EXIST:!NeXT,!PERL5,!__FreeBSD__:FUNCTION:DES
 d2i_ASN1_BIT_STRING                     712	EXIST::FUNCTION:
 d2i_ASN1_BOOLEAN                        713	EXIST::FUNCTION:
 d2i_ASN1_HEADER                         714	EXIST::FUNCTION:
@@ -792,7 +792,7 @@ 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
-_old_des_random_seed                    803	EXIST::FUNCTION:DES
+_ossl_old_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:
@@ -1990,19 +1990,19 @@ i2d_OCSP_SERVICELOC                     2562	EXIST::FUNCTION:
 ENGINE_get_digest_engine                2563	EXIST::FUNCTION:
 EC_GROUP_set_curve_GFp                  2564	EXIST::FUNCTION:EC
 OCSP_REQUEST_get_ext_by_OBJ             2565	EXIST::FUNCTION:
-_old_des_random_key                     2566	EXIST::FUNCTION:DES
+_ossl_old_des_random_key                2566	EXIST::FUNCTION:DES
 ASN1_T61STRING_it                       2567	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 ASN1_T61STRING_it                       2567	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 EC_GROUP_method_of                      2568	EXIST::FUNCTION:EC
 i2d_KRB5_APREQ                          2569	EXIST::FUNCTION:
-_old_des_encrypt                        2570	EXIST::FUNCTION:DES
+_ossl_old_des_encrypt                   2570	EXIST::FUNCTION:DES
 ASN1_PRINTABLE_new                      2571	EXIST::FUNCTION:
 HMAC_Init_ex                            2572	EXIST::FUNCTION:HMAC
 d2i_KRB5_AUTHENT                        2573	EXIST::FUNCTION:
 OCSP_archive_cutoff_new                 2574	EXIST::FUNCTION:
 EC_POINT_set_Jprojective_coordinates_GFp 2575	EXIST:!VMS:FUNCTION:EC
 EC_POINT_set_Jproj_coords_GFp           2575	EXIST:VMS:FUNCTION:EC
-_old_des_is_weak_key                    2576	EXIST::FUNCTION:DES
+_ossl_old_des_is_weak_key               2576	EXIST::FUNCTION:DES
 OCSP_BASICRESP_get_ext_by_OBJ           2577	EXIST::FUNCTION:
 EC_POINT_oct2point                      2578	EXIST::FUNCTION:EC
 OCSP_SINGLERESP_get_ext_count           2579	EXIST::FUNCTION:
@@ -2043,7 +2043,7 @@ ENGINE_register_RAND                    2609	EXIST::FUNCTION:
 OCSP_SERVICELOC_new                     2610	EXIST::FUNCTION:
 EC_POINT_set_affine_coordinates_GFp     2611	EXIST:!VMS:FUNCTION:EC
 EC_POINT_set_affine_coords_GFp          2611	EXIST:VMS:FUNCTION:EC
-_old_des_options                        2612	EXIST::FUNCTION:DES
+_ossl_old_des_options                   2612	EXIST::FUNCTION:DES
 SXNET_it                                2613	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 SXNET_it                                2613	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 UI_dup_input_boolean                    2614	EXIST::FUNCTION:
@@ -2089,13 +2089,13 @@ OCSP_BASICRESP_get_ext_by_crit          2646	EXIST:VMS:FUNCTION:
 OCSP_cert_status_str                    2647	EXIST::FUNCTION:
 d2i_OCSP_REQUEST                        2648	EXIST::FUNCTION:
 UI_dup_info_string                      2649	EXIST::FUNCTION:
-_old_des_xwhite_in2out                  2650	EXIST::FUNCTION:DES
+_ossl_old_des_xwhite_in2out             2650	EXIST::FUNCTION:DES
 PKCS12_it                               2651	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 PKCS12_it                               2651	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 OCSP_SINGLERESP_get_ext_by_critical     2652	EXIST:!VMS:FUNCTION:
 OCSP_SINGLERESP_get_ext_by_crit         2652	EXIST:VMS:FUNCTION:
 OCSP_CERTSTATUS_free                    2653	EXIST::FUNCTION:
-_old_des_crypt                          2654	EXIST::FUNCTION:DES
+_ossl_old_des_crypt                     2654	EXIST::FUNCTION:DES
 ASN1_item_i2d                           2655	EXIST::FUNCTION:
 EVP_DecryptFinal_ex                     2656	EXIST::FUNCTION:
 ENGINE_load_openssl                     2657	EXIST::FUNCTION:
@@ -2108,7 +2108,7 @@ X509_get0_pubkey_bitstr                 2662	EXIST::FUNCTION:
 asn1_ex_i2c                             2663	EXIST::FUNCTION:
 ENGINE_register_RSA                     2664	EXIST::FUNCTION:
 ENGINE_unregister_DSA                   2665	EXIST::FUNCTION:
-_old_des_key_sched                      2666	EXIST::FUNCTION:DES
+_ossl_old_des_key_sched                 2666	EXIST::FUNCTION:DES
 X509_EXTENSION_it                       2667	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 X509_EXTENSION_it                       2667	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 i2d_KRB5_AUTHENT                        2668	EXIST::FUNCTION:
@@ -2117,7 +2117,7 @@ SXNETID_it                              2669	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTI
 d2i_OCSP_SINGLERESP                     2670	EXIST::FUNCTION:
 EDIPARTYNAME_new                        2671	EXIST::FUNCTION:
 PKCS12_certbag2x509                     2672	EXIST::FUNCTION:
-_old_des_ofb64_encrypt                  2673	EXIST::FUNCTION:DES
+_ossl_old_des_ofb64_encrypt             2673	EXIST::FUNCTION:DES
 d2i_EXTENDED_KEY_USAGE                  2674	EXIST::FUNCTION:
 ERR_print_errors_cb                     2675	EXIST::FUNCTION:
 ENGINE_set_ciphers                      2676	EXIST::FUNCTION:
@@ -2125,7 +2125,7 @@ d2i_KRB5_APREQBODY                      2677	EXIST::FUNCTION:
 UI_method_get_flusher                   2678	EXIST::FUNCTION:
 X509_PUBKEY_it                          2679	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 X509_PUBKEY_it                          2679	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-_old_des_enc_read                       2680	EXIST::FUNCTION:DES
+_ossl_old_des_enc_read                  2680	EXIST::FUNCTION:DES
 PKCS7_ENCRYPT_it                        2681	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 PKCS7_ENCRYPT_it                        2681	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 i2d_OCSP_RESPONSE                       2682	EXIST::FUNCTION:
@@ -2153,7 +2153,7 @@ EC_GROUP_get_order                      2701	EXIST::FUNCTION:EC
 d2i_OCSP_RESPID                         2702	EXIST::FUNCTION:
 OCSP_request_verify                     2703	EXIST::FUNCTION:
 NCONF_get_number_e                      2704	EXIST::FUNCTION:
-_old_des_decrypt3                       2705	EXIST::FUNCTION:DES
+_ossl_old_des_decrypt3                  2705	EXIST::FUNCTION:DES
 X509_signature_print                    2706	EXIST::FUNCTION:EVP
 OCSP_SINGLERESP_free                    2707	EXIST::FUNCTION:
 ENGINE_load_builtin_engines             2708	EXIST::FUNCTION:
@@ -2177,13 +2177,13 @@ ASN1_IA5STRING_it                       2722	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIA
 ASN1_IA5STRING_it                       2722	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 UI_get_input_flags                      2723	EXIST::FUNCTION:
 EC_GROUP_set_generator                  2724	EXIST::FUNCTION:EC
-_old_des_string_to_2keys                2725	EXIST::FUNCTION:DES
+_ossl_old_des_string_to_2keys           2725	EXIST::FUNCTION:DES
 OCSP_CERTID_free                        2726	EXIST::FUNCTION:
 X509_CERT_AUX_it                        2727	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 X509_CERT_AUX_it                        2727	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 CERTIFICATEPOLICIES_it                  2728	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 CERTIFICATEPOLICIES_it                  2728	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-_old_des_ede3_cbc_encrypt               2729	EXIST::FUNCTION:DES
+_ossl_old_des_ede3_cbc_encrypt          2729	EXIST::FUNCTION:DES
 RAND_set_rand_engine                    2730	EXIST::FUNCTION:
 DSO_get_loaded_filename                 2731	EXIST::FUNCTION:
 X509_ATTRIBUTE_it                       2732	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
@@ -2243,7 +2243,7 @@ X509_it                                 2773	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIA
 X509_it                                 2773	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 BN_mod_add                              2774	EXIST::FUNCTION:
 KRB5_AUTHDATA_free                      2775	EXIST::FUNCTION:
-_old_des_cbc_cksum                      2776	EXIST::FUNCTION:DES
+_ossl_old_des_cbc_cksum                 2776	EXIST::FUNCTION:DES
 ASN1_item_verify                        2777	EXIST::FUNCTION:EVP
 CRYPTO_set_mem_ex_functions             2778	EXIST::FUNCTION:
 EC_POINT_get_Jprojective_coordinates_GFp 2779	EXIST:!VMS:FUNCTION:EC
@@ -2256,7 +2256,7 @@ ASN1_TIME_check                         2782	EXIST::FUNCTION:
 UI_get0_user_data                       2783	EXIST::FUNCTION:
 HMAC_CTX_cleanup                        2784	EXIST::FUNCTION:HMAC
 DSA_up_ref                              2785	EXIST::FUNCTION:DSA
-_old_des_ede3_cfb64_encrypt             2786	EXIST::FUNCTION:DES
+_ossl_old_des_ede3_cfb64_encrypt        2786	EXIST::FUNCTION:DES
 ASN1_BMPSTRING_it                       2787	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 ASN1_BMPSTRING_it                       2787	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 ASN1_tag2bit                            2788	EXIST::FUNCTION:
@@ -2287,7 +2287,7 @@ AUTHORITY_INFO_ACCESS_it                2805	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTI
 ASN1_FBOOLEAN_it                        2806	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 ASN1_FBOOLEAN_it                        2806	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 UI_set_ex_data                          2807	EXIST::FUNCTION:
-_old_des_string_to_key                  2808	EXIST::FUNCTION:DES
+_ossl_old_des_string_to_key             2808	EXIST::FUNCTION:DES
 ENGINE_register_all_RSA                 2809	EXIST::FUNCTION:
 d2i_KRB5_PRINCNAME                      2810	EXIST::FUNCTION:
 OCSP_RESPBYTES_it                       2811	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
@@ -2298,7 +2298,7 @@ ENGINE_unregister_digests               2813	EXIST::FUNCTION:
 d2i_EDIPARTYNAME                        2814	EXIST::FUNCTION:
 d2i_OCSP_SERVICELOC                     2815	EXIST::FUNCTION:
 ENGINE_get_digests                      2816	EXIST::FUNCTION:
-_old_des_set_odd_parity                 2817	EXIST::FUNCTION:DES
+_ossl_old_des_set_odd_parity            2817	EXIST::FUNCTION:DES
 OCSP_RESPDATA_free                      2818	EXIST::FUNCTION:
 d2i_KRB5_TICKET                         2819	EXIST::FUNCTION:
 OTHERNAME_it                            2820	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
@@ -2318,7 +2318,7 @@ EC_POINT_mul                            2831	EXIST::FUNCTION:EC
 X509V3_EXT_add_nconf                    2832	EXIST::FUNCTION:
 X509_TRUST_set                          2833	EXIST::FUNCTION:
 X509_CRL_add1_ext_i2d                   2834	EXIST::FUNCTION:
-_old_des_fcrypt                         2835	EXIST::FUNCTION:DES
+_ossl_old_des_fcrypt                    2835	EXIST::FUNCTION:DES
 DISPLAYTEXT_it                          2836	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 DISPLAYTEXT_it                          2836	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 X509_CRL_set_lastUpdate                 2837	EXIST::FUNCTION:
@@ -2340,7 +2340,7 @@ UI_get0_action_string                   2850	EXIST::FUNCTION:
 OCSP_ONEREQ_get_ext                     2851	EXIST::FUNCTION:
 EC_POINT_method_of                      2852	EXIST::FUNCTION:EC
 i2d_KRB5_APREQBODY                      2853	EXIST::FUNCTION:
-_old_des_ecb3_encrypt                   2854	EXIST::FUNCTION:DES
+_ossl_old_des_ecb3_encrypt              2854	EXIST::FUNCTION:DES
 CRYPTO_get_mem_ex_functions             2855	EXIST::FUNCTION:
 ENGINE_get_ex_data                      2856	EXIST::FUNCTION:
 UI_destroy_method                       2857	EXIST::FUNCTION:
@@ -2373,7 +2373,7 @@ ASN1_BIT_STRING_it                      2878	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIA
 ASN1_BIT_STRING_it                      2878	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 X509_REQ_it                             2879	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 X509_REQ_it                             2879	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-_old_des_cbc_encrypt                    2880	EXIST::FUNCTION:DES
+_ossl_old_des_cbc_encrypt               2880	EXIST::FUNCTION:DES
 ERR_unload_strings                      2881	EXIST::FUNCTION:
 PKCS7_SIGN_ENVELOPE_it                  2882	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 PKCS7_SIGN_ENVELOPE_it                  2882	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
@@ -2467,7 +2467,7 @@ OCSP_id_get0_info                       2960	EXIST::FUNCTION:
 BN_mod_sqrt                             2961	EXIST::FUNCTION:
 EC_GROUP_copy                           2962	EXIST::FUNCTION:EC
 KRB5_ENCDATA_free                       2963	EXIST::FUNCTION:
-_old_des_cfb_encrypt                    2964	EXIST::FUNCTION:DES
+_ossl_old_des_cfb_encrypt               2964	EXIST::FUNCTION:DES
 OCSP_SINGLERESP_get_ext_by_OBJ          2965	EXIST::FUNCTION:
 OCSP_cert_to_id                         2966	EXIST::FUNCTION:
 OCSP_RESPID_new                         2967	EXIST::FUNCTION:
@@ -2495,7 +2495,7 @@ KRB5_APREQ_new                          2984	EXIST::FUNCTION:
 EC_GROUP_get_curve_GFp                  2985	EXIST::FUNCTION:EC
 KRB5_ENCKEY_new                         2986	EXIST::FUNCTION:
 ASN1_template_d2i                       2987	EXIST::FUNCTION:
-_old_des_quad_cksum                     2988	EXIST::FUNCTION:DES
+_ossl_old_des_quad_cksum                2988	EXIST::FUNCTION:DES
 OCSP_single_get0_status                 2989	EXIST::FUNCTION:
 BN_swap                                 2990	EXIST::FUNCTION:
 POLICYINFO_it                           2991	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
@@ -2507,8 +2507,8 @@ OCSP_RESPID_it                          2994	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTI
 EC_GROUP_new                            2995	EXIST::FUNCTION:EC
 EVP_aes_256_cbc                         2996	EXIST::FUNCTION:AES
 i2d_KRB5_PRINCNAME                      2997	EXIST::FUNCTION:
-_old_des_encrypt2                       2998	EXIST::FUNCTION:DES
-_old_des_encrypt3                       2999	EXIST::FUNCTION:DES
+_ossl_old_des_encrypt2                  2998	EXIST::FUNCTION:DES
+_ossl_old_des_encrypt3                  2999	EXIST::FUNCTION:DES
 PKCS8_PRIV_KEY_INFO_it                  3000	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 PKCS8_PRIV_KEY_INFO_it                  3000	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 OCSP_REQINFO_it                         3001	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
@@ -2526,7 +2526,7 @@ ENGINE_get_cipher_engine                3008	EXIST::FUNCTION:
 ENGINE_register_all_ciphers             3009	EXIST::FUNCTION:
 EC_POINT_copy                           3010	EXIST::FUNCTION:EC
 BN_kronecker                            3011	EXIST::FUNCTION:
-_old_des_ede3_ofb64_encrypt             3012	EXIST::FUNCTION:DES
+_ossl_old_des_ede3_ofb64_encrypt        3012	EXIST::FUNCTION:DES
 UI_method_get_reader                    3013	EXIST::FUNCTION:
 OCSP_BASICRESP_get_ext_count            3014	EXIST::FUNCTION:
 ASN1_ENUMERATED_it                      3015	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
@@ -2538,7 +2538,7 @@ EVP_CIPHER_CTX_set_padding              3019	EXIST::FUNCTION:
 d2i_OCSP_RESPONSE                       3020	EXIST::FUNCTION:
 ASN1_UTCTIME_it                         3021	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 ASN1_UTCTIME_it                         3021	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-_old_des_enc_write                      3022	EXIST::FUNCTION:DES
+_ossl_old_des_enc_write                 3022	EXIST::FUNCTION:DES
 OCSP_RESPONSE_new                       3023	EXIST::FUNCTION:
 AES_set_encrypt_key                     3024	EXIST::FUNCTION:AES
 OCSP_resp_count                         3025	EXIST::FUNCTION:
@@ -2556,7 +2556,7 @@ OCSP_REQUEST_new                        3034	EXIST::FUNCTION:
 ASN1_ANY_it                             3035	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 ASN1_ANY_it                             3035	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 CRYPTO_ex_data_new_class                3036	EXIST::FUNCTION:
-_old_des_ncbc_encrypt                   3037	EXIST::FUNCTION:DES
+_ossl_old_des_ncbc_encrypt              3037	EXIST::FUNCTION:DES
 i2d_KRB5_TKTBODY                        3038	EXIST::FUNCTION:
 EC_POINT_clear_free                     3039	EXIST::FUNCTION:EC
 AES_decrypt                             3040	EXIST::FUNCTION:AES
@@ -2575,7 +2575,7 @@ i2d_EXTENDED_KEY_USAGE                  3052	EXIST::FUNCTION:
 i2d_OCSP_SIGNATURE                      3053	EXIST::FUNCTION:
 asn1_enc_save                           3054	EXIST::FUNCTION:
 ENGINE_load_nuron                       3055	EXIST::FUNCTION:
-_old_des_pcbc_encrypt                   3056	EXIST::FUNCTION:DES
+_ossl_old_des_pcbc_encrypt              3056	EXIST::FUNCTION:DES
 PKCS12_MAC_DATA_it                      3057	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 PKCS12_MAC_DATA_it                      3057	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 OCSP_accept_responses_new               3058	EXIST::FUNCTION:
@@ -2587,7 +2587,7 @@ KRB5_APREQBODY_it                       3061	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTI
 i2d_OCSP_SINGLERESP                     3062	EXIST::FUNCTION:
 ASN1_item_ex_new                        3063	EXIST::FUNCTION:
 UI_add_verify_string                    3064	EXIST::FUNCTION:
-_old_des_set_key                        3065	EXIST::FUNCTION:DES
+_ossl_old_des_set_key                   3065	EXIST::FUNCTION:DES
 KRB5_PRINCNAME_it                       3066	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 KRB5_PRINCNAME_it                       3066	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 EVP_DecryptInit_ex                      3067	EXIST::FUNCTION:
@@ -2611,9 +2611,9 @@ OCSP_BASICRESP_get_ext_by_NID           3083	EXIST::FUNCTION:
 DIST_POINT_NAME_it                      3084	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 DIST_POINT_NAME_it                      3084	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 X509V3_extensions_print                 3085	EXIST::FUNCTION:
-_old_des_cfb64_encrypt                  3086	EXIST::FUNCTION:DES
+_ossl_old_des_cfb64_encrypt             3086	EXIST::FUNCTION:DES
 X509_REVOKED_add1_ext_i2d               3087	EXIST::FUNCTION:
-_old_des_ofb_encrypt                    3088	EXIST::FUNCTION:DES
+_ossl_old_des_ofb_encrypt               3088	EXIST::FUNCTION:DES
 KRB5_TKTBODY_new                        3089	EXIST::FUNCTION:
 ASN1_OCTET_STRING_it                    3090	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 ASN1_OCTET_STRING_it                    3090	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
@@ -2702,13 +2702,13 @@ EVP_aes_192_cbc                         3155	EXIST::FUNCTION:AES
 KRB5_TICKET_free                        3156	EXIST::FUNCTION:
 UI_new                                  3157	EXIST::FUNCTION:
 OCSP_response_create                    3158	EXIST::FUNCTION:
-_old_des_xcbc_encrypt                   3159	EXIST::FUNCTION:DES
+_ossl_old_des_xcbc_encrypt              3159	EXIST::FUNCTION:DES
 PKCS7_it                                3160	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 PKCS7_it                                3160	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 OCSP_REQUEST_get_ext_by_critical        3161	EXIST:!VMS:FUNCTION:
 OCSP_REQUEST_get_ext_by_crit            3161	EXIST:VMS:FUNCTION:
 ENGINE_set_flags                        3162	EXIST::FUNCTION:
-_old_des_ecb_encrypt                    3163	EXIST::FUNCTION:DES
+_ossl_old_des_ecb_encrypt               3163	EXIST::FUNCTION:DES
 OCSP_response_get1_basic                3164	EXIST::FUNCTION:
 EVP_Digest                              3165	EXIST::FUNCTION:
 OCSP_ONEREQ_delete_ext                  3166	EXIST::FUNCTION: