From abb49b2202609e5a893161d56951dc074d427308 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Tue, 23 Jun 2009 14:10:06 +0000 Subject: [PATCH] * modules/ssl/ssl_engine_vars.c (ssl_var_lookup_ssl_cert_dn_rec): Map the _UID variable to NID_userId, where defined by OpenSSL. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit PR: 45107 Submitted by: Michael Ströder , Peter Sylvester git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@787683 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 4 ++++ modules/ssl/ssl_engine_vars.c | 6 ++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index 0f8befba75..6d911b4bc8 100644 --- a/CHANGES +++ b/CHANGES @@ -5,6 +5,10 @@ Changes with Apache 2.3.3 *) SECURITY: CVE-2009-1191 (cve.mitre.org) mod_proxy_ajp: Avoid delivering content from a previous request which failed to send a request body. PR 46949 [Ruediger Pluem] + + *) mod_ssl: Fix SSL_*_DN_UID variables to use the 'userID' attribute + type. PR 45107. [Michael Ströder , + Peter Sylvester ] *) mod_proxy_http: fix case sensitivity checking transfer encoding PR 47383 [Ryuzo Yamamoto ] diff --git a/modules/ssl/ssl_engine_vars.c b/modules/ssl/ssl_engine_vars.c index a4c696e7aa..10fd8a0e70 100644 --- a/modules/ssl/ssl_engine_vars.c +++ b/modules/ssl/ssl_engine_vars.c @@ -428,10 +428,8 @@ static const struct { { "G", NID_givenName, 1 }, { "S", NID_surname, 1 }, { "D", NID_description, 1 }, -#ifdef NID_x500UniqueIdentifier /* new name as of Openssl 0.9.7 */ - { "UID", NID_x500UniqueIdentifier, 1 }, -#else /* old name, OpenSSL < 0.9.7 */ - { "UID", NID_uniqueIdentifier, 1 }, +#ifdef NID_userId + { "UID", NID_userId, 1 }, #endif { "Email", NID_pkcs9_emailAddress, 1 }, { NULL, 0 } -- 2.40.0