]> granicus.if.org Git - apache/commit
Merge r1811976 from trunk:
authorJoe Orton <jorton@apache.org>
Fri, 9 Mar 2018 07:55:27 +0000 (07:55 +0000)
committerJoe Orton <jorton@apache.org>
Fri, 9 Mar 2018 07:55:27 +0000 (07:55 +0000)
commitea5c40d2273a1379bf42ac8d702ff97ca50c734c
tree36b11859ae5abce9f6d09753c3cc17f7077cae28
parent5445d36b2cad8a67095473c24fab18a0380afa2b
Merge r1811976 from trunk:

Add optional _RAW suffix to SSL_*_DN_xx attribute names, allowing
users to convert an attribute value without conversion to UTF-8.  (A
public CA has issued certs with attributes tagged as the wrong ASN.1
string types.)

* modules/ssl/ssl_util_ssl.c (asn1_string_convert): Rename from
  asn1_string_to_utf8; add raw argument. Reimplement _to_utf8 as
  macro.
  (modssl_X509_NAME_ENTRY_to_string): Add raw argument.

* modules/ssl/ssl_engine_vars.c (ssl_var_lookup_ssl_cert_dn): Use raw
  string conversion if _RAW suffix is present in DN component.

Submitted by: jorton
Reviewed by: jorton, jim, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1826300 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
docs/manual/mod/mod_ssl.xml
modules/ssl/ssl_engine_vars.c
modules/ssl/ssl_util_ssl.c
modules/ssl/ssl_util_ssl.h