Changeset 0ab45ea in mod_gnutls


Ignore:
Timestamp:
Jan 11, 2013, 12:56:17 AM (7 years ago)
Author:
Daniel Kahn Gillmor <dkg@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports
Children:
15ffe0b
Parents:
e86847d (diff), dc1e7e6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge tag 'upstream/0.4.2.1'

Upstream version 0.4.2.1

Files:
2 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • Makefile.in

    re86847d r0ab45ea  
    224224                NOTICE LICENSE autogen.sh
    225225
    226 SUBDIRS = src data
     226SUBDIRS = src
    227227ACLOCAL_AMFLAGS = -I m4
    228228all: all-recursive
  • README.ENV

    re86847d r0ab45ea  
    2020SSL_CLIENT_S_DN: The distinguished name of client's certificate in RFC2253 format.
    2121SSL_CLIENT_I_DN: The distinguished name of client's issuer certificate in RFC2253 format.
    22 SSL_CLIENT_S_SAN%: These will contain the alternative names of the client certificate
     22SSL_CLIENT_S_AN%: These will contain the alternative names of the client certificate
    2323  (% is a number starting from zero). The values will be prepended by "DNSNAME:",
    2424  "RFC822NAME:" or "URI:" depending on the type. If it is not supported the value
     
    3131SSL_CLIENT_VERIFY:
    3232  whether the client's certificate was verified. (NONE if none was sent, or SUCCESS or FAILED)
    33 SSL_CLIENT_S_TYPE: The certificate type can be X.509 or OPENPGP.
     33SSL_CLIENT_CERT_TYPE: The certificate type can be X.509 or OPENPGP.
    3434
    3535SSL_SERVER_V_START: The activation time of server's certificate.
     
    3737SSL_SERVER_S_DN: The distinguished name of the server's certificate in RFC2253 format.
    3838SSL_SERVER_I_DN: The distinguished name of the server's issuer certificate in RFC2253 format.
    39 SSL_SERVER_S_SAN%: These will contain the alternative names of the server certificate
     39SSL_SERVER_S_AN%: These will contain the alternative names of the server certificate
    4040  (% is a number starting from zero). The values will be prepended by "DNSNAME:",
    4141  "RFC822NAME:" or "URI:" depending on the type. If it is not supported the value
     
    4646SSL_SERVER_A_KEY: The public key algorithm in server's certificate.
    4747SSL_SERVER_CERT: The PEM-encoded server certificate
    48 SSL_SERVER_S_TYPE: The certificate type can be X.509 or OPENPGP.
     48SSL_SERVER_CERT_TYPE: The certificate type can be X.509 or OPENPGP.
    4949
  • configure

    re86847d r0ab45ea  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.61 for mod_gnutls 0.4.2.
     3# Generated by GNU Autoconf 2.61 for mod_gnutls 0.4.2.1.
    44#
    55# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
     
    727727PACKAGE_NAME='mod_gnutls'
    728728PACKAGE_TARNAME='mod_gnutls'
    729 PACKAGE_VERSION='0.4.2'
    730 PACKAGE_STRING='mod_gnutls 0.4.2'
     729PACKAGE_VERSION='0.4.2.1'
     730PACKAGE_STRING='mod_gnutls 0.4.2.1'
    731731PACKAGE_BUGREPORT=''
    732732
     
    14261426  # This message is too long to be a string in the A/UX 3.1 sh.
    14271427  cat <<_ACEOF
    1428 \`configure' configures mod_gnutls 0.4.2 to adapt to many kinds of systems.
     1428\`configure' configures mod_gnutls 0.4.2.1 to adapt to many kinds of systems.
    14291429
    14301430Usage: $0 [OPTION]... [VAR=VALUE]...
     
    14971497if test -n "$ac_init_help"; then
    14981498  case $ac_init_help in
    1499      short | recursive ) echo "Configuration of mod_gnutls 0.4.2:";;
     1499     short | recursive ) echo "Configuration of mod_gnutls 0.4.2.1:";;
    15001500   esac
    15011501  cat <<\_ACEOF
     
    16071607if $ac_init_version; then
    16081608  cat <<\_ACEOF
    1609 mod_gnutls configure 0.4.2
     1609mod_gnutls configure 0.4.2.1
    16101610generated by GNU Autoconf 2.61
    16111611
     
    16211621running configure, to aid debugging if configure makes a mistake.
    16221622
    1623 It was created by mod_gnutls $as_me 0.4.2, which was
     1623It was created by mod_gnutls $as_me 0.4.2.1, which was
    16241624generated by GNU Autoconf 2.61.  Invocation command line was
    16251625
     
    19921992  chmod +x config.nice
    19931993
    1994 MOD_GNUTLS_VERSION=0.4.2
     1994MOD_GNUTLS_VERSION=0.4.2.1
    19951995
    19961996
     
    24932493# Define the identity of the package.
    24942494 PACKAGE=mod_gnutls
    2495  VERSION=0.4.2
     2495 VERSION=0.4.2.1
    24962496
    24972497
     
    2097020970
    2097120971
    20972 ac_config_files="$ac_config_files Makefile src/Makefile include/mod_gnutls.h data/Makefile"
     20972ac_config_files="$ac_config_files Makefile src/Makefile include/mod_gnutls.h"
    2097320973
    2097420974cat >confcache <<\_ACEOF
     
    2139621396# values after options handling.
    2139721397ac_log="
    21398 This file was extended by mod_gnutls $as_me 0.4.2, which was
     21398This file was extended by mod_gnutls $as_me 0.4.2.1, which was
    2139921399generated by GNU Autoconf 2.61.  Invocation command line was
    2140021400
     
    2144921449cat >>$CONFIG_STATUS <<_ACEOF
    2145021450ac_cs_version="\\
    21451 mod_gnutls config.status 0.4.2
     21451mod_gnutls config.status 0.4.2.1
    2145221452configured by $0, generated by GNU Autoconf 2.61,
    2145321453  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
     
    2156821568    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
    2156921569    "include/mod_gnutls.h") CONFIG_FILES="$CONFIG_FILES include/mod_gnutls.h" ;;
    21570     "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
    2157121570
    2157221571  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
  • configure.ac

    re86847d r0ab45ea  
    11dnl
    2 AC_INIT(mod_gnutls, 0.4.2)
     2AC_INIT(mod_gnutls, 0.4.2.1)
    33OOO_CONFIG_NICE(config.nice)
    44MOD_GNUTLS_VERSION=AC_PACKAGE_VERSION
  • src/gnutls_hooks.c

    re86847d r0ab45ea  
    794794
    795795    apr_table_setn(env,
     796       apr_pstrcat(r->pool, MGS_SIDE, "_CERT_TYPE", NULL), "X.509");
     797#ifdef COMPAT
     798    apr_table_setn(env,
    796799       apr_pstrcat(r->pool, MGS_SIDE, "_S_TYPE", NULL), "X.509");
     800#endif
    797801
    798802    tmp =
     
    836840            if (ret == GNUTLS_SAN_DNSNAME) {
    837841                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),
    839843                       apr_psprintf(r->pool, "DNSNAME:%s", tmp2));
    840844            } else if (ret == GNUTLS_SAN_RFC822NAME) {
    841845                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),
    843847                       apr_psprintf(r->pool, "RFC822NAME:%s", tmp2));
    844848            } else if (ret == GNUTLS_SAN_URI) {
    845849                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),
    847851                       apr_psprintf(r->pool, "URI:%s", tmp2));
    848852            } else {
    849853                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),
    851855                       "UNSUPPORTED");
    852856            }
Note: See TracChangeset for help on using the changeset viewer.