From 837beb6730bc8e847dc3c92f45d575ba6859169d Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Wed, 22 Sep 2004 11:34:53 +0000 Subject: [PATCH] * 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 --- modules/ssl/ssl_engine_vars.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/ssl/ssl_engine_vars.c b/modules/ssl/ssl_engine_vars.c index ab1d98a25b..ec6e683a25 100644 --- 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 }, -- 2.40.0