[apache2] 02/04: Fix valule of SSL_CLIENT_S_DN_UID in mod_ssl.

[Stefan Fritsch]

This is an automated email from the git hooks/post-receive script.

sf pushed a commit to branch wheezy
in repository apache2.

commit 81a9c6396045121ddbdbb945c9a09f31542b76c3
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Tue Dec 23 23:26:10 2014 +0100

    Fix valule of SSL_CLIENT_S_DN_UID in mod_ssl.
---
 debian/changelog                                |  2 ++
 debian/patches/mod_ssl_SSL_CLIENT_S_DN_UID.diff | 13 +++++++++++++
 debian/patches/series                           |  1 +
 3 files changed, 16 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ce0213d..dff4e80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ apache2 (2.2.22-13+deb7u4) UNRELEASED; urgency=high
     A new directive "MergeTrailers" is introduced to restore the old
     behavior.
   * Fix hostname comparison with SNI to be case insensitive. Closes: #771199
+  * Fix valule of SSL_CLIENT_S_DN_UID in mod_ssl (broken in 2.2.15).
+    Closes: #773841
 
  -- Stefan Fritsch <sf at debian.org>  Sun, 09 Nov 2014 14:38:26 +0100
 
diff --git a/debian/patches/mod_ssl_SSL_CLIENT_S_DN_UID.diff b/debian/patches/mod_ssl_SSL_CLIENT_S_DN_UID.diff
new file mode 100644
index 0000000..46cebec
--- /dev/null
+++ b/debian/patches/mod_ssl_SSL_CLIENT_S_DN_UID.diff
@@ -0,0 +1,13 @@
+# http://svn.apache.org/viewvc?view=revision&revision=1445112
+# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=773841
+--- apache2.orig/modules/ssl/ssl_engine_vars.c
++++ apache2/modules/ssl/ssl_engine_vars.c
+@@ -431,7 +431,7 @@ static const struct {
+     { "S",     NID_surname,                1 },
+     { "D",     NID_description,            1 },
+ #ifdef NID_userId
+-    { "UID",   NID_x500UniqueIdentifier,   1 },
++    { "UID",   NID_userId,                 1 },
+ #endif
+     { "Email", NID_pkcs9_emailAddress,     1 },
+     { NULL,    0,                          0 }
diff --git a/debian/patches/series b/debian/patches/series
index e8fcdc7..807c605 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -47,3 +47,4 @@ CVE-2014-0231_mod_cgid-DoS.patch
 CVE-2014-0118_mod_deflate-DoS.patch
 CVE-2013-5704_trailers.patch
 SNI_case_insensitve.diff
+mod_ssl_SSL_CLIENT_S_DN_UID.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apache2.git