* modules/ssl/ssl_engine_vars.c: Map "UID" suffix to the same OID

(2.5.4.45) for old and new versions of OpenSSL.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105244 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/ssl/ssl_engine_vars.c b/modules/ssl/ssl_engine_vars.c
index ab1d98a25b8df38e0fe9ac4d5b71867dd629e1ee..ec6e683a259173216e14c6ae3e75899da0f58407 100644 (file)
--- a/modules/ssl/ssl_engine_vars.c
+++ b/modules/ssl/ssl_engine_vars.c
@@ -386,8 +386,9 @@ static const struct {
     { "G",     NID_givenName              },
     { "S",     NID_surname                },
     { "D",     NID_description            },
-/* This has been removed in OpenSSL 0.9.8-dev. */
-#ifdef NID_uniqueIdentifier
+#ifdef NID_x500UniqueIdentifier /* new name as of Openssl 0.9.7 */
+    { "UID",   NID_x500UniqueIdentifier   },
+#else /* old name, OpenSSL < 0.9.7 */
     { "UID",   NID_uniqueIdentifier       },
 #endif
     { "Email", NID_pkcs9_emailAddress     },