summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
-rw-r--r--NEWS4
-rw-r--r--README.ENV4
-rw-r--r--src/gnutls_hooks.c8
3 files changed, 8 insertions, 8 deletions
diff --git a/NEWS b/NEWS
index f091be6..30f67e4 100644
--- a/NEWS
+++ b/NEWS
@@ -3,5 +3,5 @@
3- Added support for subject alternative names in certificates. 3- Added support for subject alternative names in certificates.
4Only one per certificate is supported. 4Only one per certificate is supported.
5 5
6- New enviroment variables: SSL_CLIENT_M_VERSION, SSL_CLIENT_SAN%, 6- New enviroment variables: SSL_CLIENT_M_VERSION, SSL_CLIENT_S_SAN%,
7SSL_SERVER_M_VERSION, SSL_SERVER_SAN% \ No newline at end of file 7SSL_CLIENT_S_TYPE, SSL_SERVER_M_VERSION, SSL_SERVER_S_SAN%, SSL_SERVER_S_TYPE \ No newline at end of file
diff --git a/README.ENV b/README.ENV
index 35da82f..c055dfe 100644
--- a/README.ENV
+++ b/README.ENV
@@ -19,7 +19,7 @@ SSL_CLIENT_V_START: The activation time of client's certificate.
19SSL_CLIENT_V_END: The expiration time of client's certificate. 19SSL_CLIENT_V_END: The expiration time of client's certificate.
20SSL_CLIENT_S_DN: The distinguished name of client's certificate in RFC2253 format. 20SSL_CLIENT_S_DN: The distinguished name of client's certificate in RFC2253 format.
21SSL_CLIENT_I_DN: The distinguished name of client's issuer certificate in RFC2253 format. 21SSL_CLIENT_I_DN: The distinguished name of client's issuer certificate in RFC2253 format.
22SSL_CLIENT_SAN%: These will contain the alternative names of the client certificate 22SSL_CLIENT_S_SAN%: These will contain the alternative names of the client certificate
23 (% is a number starting from zero). The values will be prepended by "DNSNAME:", 23 (% is a number starting from zero). The values will be prepended by "DNSNAME:",
24 "RFC822NAME:" or "URI:" depending on the type. If it is not supported the value 24 "RFC822NAME:" or "URI:" depending on the type. If it is not supported the value
25 "UNSUPPORTED" will be set. 25 "UNSUPPORTED" will be set.
@@ -36,7 +36,7 @@ SSL_SERVER_V_START: The activation time of server's certificate.
36SSL_SERVER_V_END: The expiration time of server's certificate. 36SSL_SERVER_V_END: The expiration time of server's certificate.
37SSL_SERVER_S_DN: The distinguished name of the server's certificate in RFC2253 format. 37SSL_SERVER_S_DN: The distinguished name of the server's certificate in RFC2253 format.
38SSL_SERVER_I_DN: The distinguished name of the server's issuer certificate in RFC2253 format. 38SSL_SERVER_I_DN: The distinguished name of the server's issuer certificate in RFC2253 format.
39SSL_SERVER_SAN%: These will contain the alternative names of the server certificate 39SSL_SERVER_S_SAN%: These will contain the alternative names of the server certificate
40 (% is a number starting from zero). The values will be prepended by "DNSNAME:", 40 (% is a number starting from zero). The values will be prepended by "DNSNAME:",
41 "RFC822NAME:" or "URI:" depending on the type. If it is not supported the value 41 "RFC822NAME:" or "URI:" depending on the type. If it is not supported the value
42 "UNSUPPORTED" will be set. 42 "UNSUPPORTED" will be set.
diff --git a/src/gnutls_hooks.c b/src/gnutls_hooks.c
index c1a1c52..1af82a7 100644
--- a/src/gnutls_hooks.c
+++ b/src/gnutls_hooks.c
@@ -891,19 +891,19 @@ mgs_add_common_cert_vars(request_rec * r, gnutls_x509_crt cert, int side,
891 891
892 if (ret == GNUTLS_SAN_DNSNAME) { 892 if (ret == GNUTLS_SAN_DNSNAME) {
893 apr_table_setn(env, 893 apr_table_setn(env,
894 apr_psprintf(r->pool, "%s_SAN%u", MGS_SIDE, i), 894 apr_psprintf(r->pool, "%s_S_SAN%u", MGS_SIDE, i),
895 apr_psprintf(r->pool, "DNSNAME:%s", tmp2)); 895 apr_psprintf(r->pool, "DNSNAME:%s", tmp2));
896 } else if (ret == GNUTLS_SAN_RFC822NAME) { 896 } else if (ret == GNUTLS_SAN_RFC822NAME) {
897 apr_table_setn(env, 897 apr_table_setn(env,
898 apr_psprintf(r->pool, "%s_SAN%u", MGS_SIDE, i), 898 apr_psprintf(r->pool, "%s_S_SAN%u", MGS_SIDE, i),
899 apr_psprintf(r->pool, "RFC822NAME:%s", tmp2)); 899 apr_psprintf(r->pool, "RFC822NAME:%s", tmp2));
900 } else if (ret == GNUTLS_SAN_URI) { 900 } else if (ret == GNUTLS_SAN_URI) {
901 apr_table_setn(env, 901 apr_table_setn(env,
902 apr_psprintf(r->pool, "%s_SAN%u", MGS_SIDE, i), 902 apr_psprintf(r->pool, "%s_S_SAN%u", MGS_SIDE, i),
903 apr_psprintf(r->pool, "URI:%s", tmp2)); 903 apr_psprintf(r->pool, "URI:%s", tmp2));
904 } else { 904 } else {
905 apr_table_setn(env, 905 apr_table_setn(env,
906 apr_psprintf(r->pool, "%s_SAN%u", MGS_SIDE, i), 906 apr_psprintf(r->pool, "%s_S_SAN%u", MGS_SIDE, i),
907 "UNSUPPORTED"); 907 "UNSUPPORTED");
908 } 908 }
909 } 909 }