Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 88953 invoked from network); 22 Sep 2004 11:35:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 22 Sep 2004 11:35:13 -0000 Received: (qmail 21123 invoked by uid 500); 22 Sep 2004 11:34:58 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 20992 invoked by uid 500); 22 Sep 2004 11:34:57 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 20901 invoked by uid 500); 22 Sep 2004 11:34:56 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Received: (qmail 20883 invoked by uid 99); 22 Sep 2004 11:34:56 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Wed, 22 Sep 2004 04:34:55 -0700 Received: (qmail 88650 invoked by uid 1582); 22 Sep 2004 11:34:54 -0000 Date: 22 Sep 2004 11:34:54 -0000 Message-ID: <20040922113454.88649.qmail@minotaur.apache.org> From: jorton@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0/modules/ssl ssl_engine_vars.c X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N jorton 2004/09/22 04:34:54 Modified: modules/ssl ssl_engine_vars.c Log: * modules/ssl/ssl_engine_vars.c: Map "UID" suffix to the same OID (2.5.4.45) for old and new versions of OpenSSL. Revision Changes Path 1.44 +3 -2 httpd-2.0/modules/ssl/ssl_engine_vars.c Index: ssl_engine_vars.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_vars.c,v retrieving revision 1.43 retrieving revision 1.44 diff -d -w -u -r1.43 -r1.44 --- ssl_engine_vars.c 18 Aug 2004 11:05:22 -0000 1.43 +++ ssl_engine_vars.c 22 Sep 2004 11:34:53 -0000 1.44 @@ -386,8 +386,9 @@ { "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 },