]> granicus.if.org Git - apache/commit
Merge r1650047 from trunk:
authorKaspar Brand <kbrand@apache.org>
Sun, 26 Apr 2015 07:03:31 +0000 (07:03 +0000)
committerKaspar Brand <kbrand@apache.org>
Sun, 26 Apr 2015 07:03:31 +0000 (07:03 +0000)
commitb177ea9fcc4273a2dc5962d9889de5a8c4407e09
tree93e4ab19bee4ccca1abcda1917d1e5526bcdd4b4
parent700ffbf9bf602dbeb41e6ef114e699cc5be1a9e2
Merge r1650047 from trunk:

Add support for extracting subjectAltName entries of type
rfc822Name and dNSName into SSL_{CLIENT,SERVER}_SAN_{Email,DNS}_n
variables.

* docs/manual/mod/mod_ssl.xml: add SSL_*_SAN_*_n entries to the
  environment variables table

* modules/ssl/ssl_engine_kernel.c: in ssl_hook_Fixup, add extraction
  of subjectAltName entries for the "StdEnvVars" case

* modules/ssl/ssl_engine_vars.c: add support for retrieving the
  SSL_{CLIENT,SERVER}_SAN_{Email,DNS}_n variables, either with
  individual on-demand lookup (ssl_var_lookup_ssl_cert_san),
  or with full-list extraction to the environment ("StdEnvVars")

* modules/ssl/ssl_private.h: add modssl_var_extract_san_entries prototype

* modules/ssl/ssl_util_ssl.c: implement SSL_X509_getSAN and
  SSL_ASN1_STRING_to_utf8 helper functions, with factoring out common
  code from SSL_X509_getIDs and SSL_X509_NAME_ENTRY_to_string where
  suitable. Limit SSL_X509_getSAN to the two most common subjectAltName
  entry types appearing in user or server certificates (i.e., rfc822Name
  and dNSName), for the time being.

* modules/ssl/ssl_util_ssl.h: add SSL_ASN1_STRING_to_utf8
  and SSL_X509_getSAN prototypes

Proposed by: kbrand
Reviewed by: ylavic, druggeri

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1676087 13f79535-47bb-0310-9956-ffa450edef68
CHANGES