aboutsummaryrefslogtreecommitdiffstats
path: root/src/gnutls_hooks.c
diff options
context:
space:
mode:
authorGravatar Nokis Mavrogiannopoulos 2007-12-10 22:49:20 +0000
committerGravatar Nokis Mavrogiannopoulos 2007-12-10 22:49:20 +0000
commita592fc96a77530e8c5e04e30389f90074b01d77b (patch)
tree603487a5d455a5ec7cfe6a2e27fbeaf938b6ac1a /src/gnutls_hooks.c
parentd45cdc5945cd6ff140890c8e8ea880443b26f4ea (diff)
Diffstat (limited to 'src/gnutls_hooks.c')
-rw-r--r--src/gnutls_hooks.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/gnutls_hooks.c b/src/gnutls_hooks.c
index 15b66fa..44b2bc1 100644
--- a/src/gnutls_hooks.c
+++ b/src/gnutls_hooks.c
@@ -793,7 +793,11 @@ mgs_add_common_cert_vars(request_rec * r, gnutls_x509_crt cert, int side,
793 apr_psprintf(r->pool, "%u", ret)); 793 apr_psprintf(r->pool, "%u", ret));
794 794
795 apr_table_setn(env, 795 apr_table_setn(env,
796 apr_pstrcat(r->pool, MGS_SIDE, "_CERT_TYPE", NULL), "X.509");
797#ifdef COMPAT
798 apr_table_setn(env,
796 apr_pstrcat(r->pool, MGS_SIDE, "_S_TYPE", NULL), "X.509"); 799 apr_pstrcat(r->pool, MGS_SIDE, "_S_TYPE", NULL), "X.509");
800#endif
797 801
798 tmp = 802 tmp =
799 mgs_time2sz(gnutls_x509_crt_get_expiration_time 803 mgs_time2sz(gnutls_x509_crt_get_expiration_time
@@ -835,19 +839,19 @@ mgs_add_common_cert_vars(request_rec * r, gnutls_x509_crt cert, int side,
835 839
836 if (ret == GNUTLS_SAN_DNSNAME) { 840 if (ret == GNUTLS_SAN_DNSNAME) {
837 apr_table_setn(env, 841 apr_table_setn(env,
838 apr_psprintf(r->pool, "%s_S_SAN%u", MGS_SIDE, i), 842 apr_psprintf(r->pool, "%s_S_AN%u", MGS_SIDE, i),
839 apr_psprintf(r->pool, "DNSNAME:%s", tmp2)); 843 apr_psprintf(r->pool, "DNSNAME:%s", tmp2));
840 } else if (ret == GNUTLS_SAN_RFC822NAME) { 844 } else if (ret == GNUTLS_SAN_RFC822NAME) {
841 apr_table_setn(env, 845 apr_table_setn(env,
842 apr_psprintf(r->pool, "%s_S_SAN%u", MGS_SIDE, i), 846 apr_psprintf(r->pool, "%s_S_AN%u", MGS_SIDE, i),
843 apr_psprintf(r->pool, "RFC822NAME:%s", tmp2)); 847 apr_psprintf(r->pool, "RFC822NAME:%s", tmp2));
844 } else if (ret == GNUTLS_SAN_URI) { 848 } else if (ret == GNUTLS_SAN_URI) {
845 apr_table_setn(env, 849 apr_table_setn(env,
846 apr_psprintf(r->pool, "%s_S_SAN%u", MGS_SIDE, i), 850 apr_psprintf(r->pool, "%s_S_AN%u", MGS_SIDE, i),
847 apr_psprintf(r->pool, "URI:%s", tmp2)); 851 apr_psprintf(r->pool, "URI:%s", tmp2));
848 } else { 852 } else {
849 apr_table_setn(env, 853 apr_table_setn(env,
850 apr_psprintf(r->pool, "%s_S_SAN%u", MGS_SIDE, i), 854 apr_psprintf(r->pool, "%s_S_AN%u", MGS_SIDE, i),
851 "UNSUPPORTED"); 855 "UNSUPPORTED");
852 } 856 }
853 } 857 }