You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2004/09/22 13:34:54 UTC
cvs commit: httpd-2.0/modules/ssl ssl_engine_vars.c
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 },