Avoid yet another name clash with libdes, and make the declaration consistent

with the definition.

diff --git a/crypto/des/des_ver.h b/crypto/des/des_ver.h
index 0fa94d53682edace30906e36fcd8a349d404e7d8..379bbadda2a7c16ff578df7f7d4169c67b97d797 100644 (file)
--- a/crypto/des/des_ver.h
+++ b/crypto/des/des_ver.h
@@ -63,5 +63,9 @@
 # define OPENSSL_EXTERN OPENSSL_EXPORT
 #endif
 
-OPENSSL_EXTERN char *DES_version;      /* SSLeay version string */
-OPENSSL_EXTERN char *libdes_version;   /* old libdes version string */
+/* The following macros make sure the names are different from libdes names */
+#define DES_version OSSL_DES_version
+#define libdes_version OSSL_libdes_version
+
+OPENSSL_EXTERN const char *OSSL_DES_version;   /* SSLeay version string */
+OPENSSL_EXTERN const char *OSSL_libdes_version;        /* old libdes version string */

diff --git a/crypto/des/ecb_enc.c b/crypto/des/ecb_enc.c
index 4650f2fa0f5c5a1caa394e706d75b36c5e12c724..1b70f68806d9d91c4b1860a3c935b1635422ae73 100644 (file)
--- a/crypto/des/ecb_enc.c
+++ b/crypto/des/ecb_enc.c
@@ -57,6 +57,7 @@
  */
 
 #include "des_locl.h"
+#include "des_ver.h"
 #include "spr.h"
 #include <openssl/opensslv.h>