Changeset dc1e7e6 in mod_gnutls

Timestamp:

Jan 11, 2013, 12:56:17 AM (10 years ago)

Author:

Daniel Kahn Gillmor <dkg@…>

Branches:

debian/master, debian/stretch-backports, jessie-backports, upstream

Children:

0ab45ea, 8df5b25

Parents:

2a2272d

Message:

Imported Upstream version 0.4.2.1

Files:

• Makefile.in (modified) (1 diff)
• README.ENV (modified) (4 diffs)
• configure (modified) (12 diffs)
• configure.ac (modified) (1 diff)
• data/Makefile.am (deleted)
• data/Makefile.in (deleted)
• src/gnutls_hooks.c (modified) (2 diffs)

Makefile.in

@@ -224 +224 @@
                 NOTICE LICENSE autogen.sh
 
-SUBDIRS = src data
+SUBDIRS = src
 ACLOCAL_AMFLAGS = -I m4
 all: all-recursive

README.ENV

@@ -20 +20 @@
 SSL_CLIENT_S_DN: The distinguished name of client's certificate in RFC2253 format.
 SSL_CLIENT_I_DN: The distinguished name of client's issuer certificate in RFC2253 format.
-SSL_CLIENT_S_SAN%: These will contain the alternative names of the client certificate 
+SSL_CLIENT_S_AN%: These will contain the alternative names of the client certificate 
   (% is a number starting from zero). The values will be prepended by "DNSNAME:", 
   "RFC822NAME:" or "URI:" depending on the type. If it is not supported the value 
@@ -31 +31 @@
 SSL_CLIENT_VERIFY: 
   whether the client's certificate was verified. (NONE if none was sent, or SUCCESS or FAILED)
-SSL_CLIENT_S_TYPE: The certificate type can be X.509 or OPENPGP.
+SSL_CLIENT_CERT_TYPE: The certificate type can be X.509 or OPENPGP.
 
 SSL_SERVER_V_START: The activation time of server's certificate.
@@ -37 +37 @@
 SSL_SERVER_S_DN: The distinguished name of the server's certificate in RFC2253 format.
 SSL_SERVER_I_DN: The distinguished name of the server's issuer certificate in RFC2253 format.
-SSL_SERVER_S_SAN%: These will contain the alternative names of the server certificate 
+SSL_SERVER_S_AN%: These will contain the alternative names of the server certificate 
   (% is a number starting from zero). The values will be prepended by "DNSNAME:", 
   "RFC822NAME:" or "URI:" depending on the type. If it is not supported the value 
@@ -46 +46 @@
 SSL_SERVER_A_KEY: The public key algorithm in server's certificate.
 SSL_SERVER_CERT: The PEM-encoded server certificate
-SSL_SERVER_S_TYPE: The certificate type can be X.509 or OPENPGP.
+SSL_SERVER_CERT_TYPE: The certificate type can be X.509 or OPENPGP.
 

configure

@@ -1 +1 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for mod_gnutls 0.4.2.
+# Generated by GNU Autoconf 2.61 for mod_gnutls 0.4.2.1.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -727 +727 @@
 PACKAGE_NAME='mod_gnutls'
 PACKAGE_TARNAME='mod_gnutls'
-PACKAGE_VERSION='0.4.2'
-PACKAGE_STRING='mod_gnutls 0.4.2'
+PACKAGE_VERSION='0.4.2.1'
+PACKAGE_STRING='mod_gnutls 0.4.2.1'
 PACKAGE_BUGREPORT=''
 
@@ -1426 +1426 @@
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures mod_gnutls 0.4.2 to adapt to many kinds of systems.
+\`configure' configures mod_gnutls 0.4.2.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1497 +1497 @@
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of mod_gnutls 0.4.2:";;
+     short | recursive ) echo "Configuration of mod_gnutls 0.4.2.1:";;
    esac
   cat <<\_ACEOF
@@ -1607 +1607 @@
 if $ac_init_version; then
   cat <<\_ACEOF
-mod_gnutls configure 0.4.2
+mod_gnutls configure 0.4.2.1
 generated by GNU Autoconf 2.61
 
@@ -1621 +1621 @@
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by mod_gnutls $as_me 0.4.2, which was
+It was created by mod_gnutls $as_me 0.4.2.1, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
@@ -1992 +1992 @@
   chmod +x config.nice
 
-MOD_GNUTLS_VERSION=0.4.2
+MOD_GNUTLS_VERSION=0.4.2.1
 
 
@@ -2493 +2493 @@
 # Define the identity of the package.
  PACKAGE=mod_gnutls
- VERSION=0.4.2
+ VERSION=0.4.2.1
 
 
@@ -20970 +20970 @@
 
 
-ac_config_files="$ac_config_files Makefile src/Makefile include/mod_gnutls.h data/Makefile"
+ac_config_files="$ac_config_files Makefile src/Makefile include/mod_gnutls.h"
 
 cat >confcache <<\_ACEOF
@@ -21396 +21396 @@
 # values after options handling.
 ac_log="
-This file was extended by mod_gnutls $as_me 0.4.2, which was
+This file was extended by mod_gnutls $as_me 0.4.2.1, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
@@ -21449 +21449 @@
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-mod_gnutls config.status 0.4.2
+mod_gnutls config.status 0.4.2.1
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -21568 +21568 @@
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "include/mod_gnutls.h") CONFIG_FILES="$CONFIG_FILES include/mod_gnutls.h" ;;
-    "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
 
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5

configure.ac

@@ -1 +1 @@
 dnl 
-AC_INIT(mod_gnutls, 0.4.2)
+AC_INIT(mod_gnutls, 0.4.2.1)
 OOO_CONFIG_NICE(config.nice)
 MOD_GNUTLS_VERSION=AC_PACKAGE_VERSION

src/gnutls_hooks.c

@@ -794 +794 @@
 
     apr_table_setn(env,
+       apr_pstrcat(r->pool, MGS_SIDE, "_CERT_TYPE", NULL), "X.509");
+#ifdef COMPAT
+    apr_table_setn(env,
        apr_pstrcat(r->pool, MGS_SIDE, "_S_TYPE", NULL), "X.509");
+#endif
 
     tmp =
@@ -836 +840 @@
             if (ret == GNUTLS_SAN_DNSNAME) {
                 apr_table_setn(env,
-                       apr_psprintf(r->pool, "%s_S_SAN%u", MGS_SIDE, i), 
+                       apr_psprintf(r->pool, "%s_S_AN%u", MGS_SIDE, i), 
                        apr_psprintf(r->pool, "DNSNAME:%s", tmp2));
             } else if (ret == GNUTLS_SAN_RFC822NAME) {
                 apr_table_setn(env,
-                       apr_psprintf(r->pool, "%s_S_SAN%u", MGS_SIDE, i), 
+                       apr_psprintf(r->pool, "%s_S_AN%u", MGS_SIDE, i), 
                        apr_psprintf(r->pool, "RFC822NAME:%s", tmp2));
             } else if (ret == GNUTLS_SAN_URI) {
                 apr_table_setn(env,
-                       apr_psprintf(r->pool, "%s_S_SAN%u", MGS_SIDE, i), 
+                       apr_psprintf(r->pool, "%s_S_AN%u", MGS_SIDE, i), 
                        apr_psprintf(r->pool, "URI:%s", tmp2));
             } else {
                 apr_table_setn(env,
-                       apr_psprintf(r->pool, "%s_S_SAN%u", MGS_SIDE, i), 
+                       apr_psprintf(r->pool, "%s_S_AN%u", MGS_SIDE, i), 
                        "UNSUPPORTED");
             }