diff options
| author | Joe Orton <jorton@apache.org> | 2004-09-22 11:34:53 +0000 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2004-09-22 11:34:53 +0000 |
| commit | e18f24f0ca0fbb7f5334837d30485650ba693b5d (patch) | |
| tree | dc18b017afc7d5026f0c5ed252ba4fe9f6e5bbcd | |
| parent | c713bfe55a214e4e3ad96c8c625930573a5ff0b7 (diff) | |
| download | httpd-e18f24f0ca0fbb7f5334837d30485650ba693b5d.tar.gz | |
* 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/modules/ssl@105244 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | ssl_engine_vars.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ssl_engine_vars.c b/ssl_engine_vars.c index ab1d98a25b..ec6e683a25 100644 --- a/ssl_engine_vars.c +++ b/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 }, |