Changeset 9c4a7444 in mod_gnutls


Ignore:
Timestamp:
Jan 11, 2013, 12:58:11 AM (9 years ago)
Author:
Daniel Kahn Gillmor <dkg@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports
Children:
619c6bf
Parents:
ae015fa (diff), 5508683 (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.5.8'

Upstream version 0.5.8

Files:
14 edited

Legend:

Unmodified
Added
Removed

  • Makefile.in

    rae015fa r9c4a7444  
    1 # Makefile.in generated by automake 1.11 from Makefile.am.
     1# Makefile.in generated by automake 1.11.1 from Makefile.am.
    22# @configure_input@
    33
    … …  
    347347# (2) otherwise, pass the desired values on the `make' command line.
    348348$(RECURSIVE_TARGETS):
    349         @failcom='exit 1'; \
     349        @fail= failcom='exit 1'; \
    350350        for f in x $$MAKEFLAGS; do \
    351351          case $$f in \
    … …  
    372372
    373373$(RECURSIVE_CLEAN_TARGETS):
    374         @failcom='exit 1'; \
     374        @fail= failcom='exit 1'; \
    375375        for f in x $$MAKEFLAGS; do \
    376376          case $$f in \
    … …  
    536536        done
    537537        -test -n "$(am__skip_mode_fix)" \
    538         || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
     538        || find "$(distdir)" -type d ! -perm -755 \
     539                -exec chmod u+rwx,go+rx {} \; -o \
    539540          ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
    540541          ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
    … …  
    580581        case '$(DIST_ARCHIVES)' in \
    581582        *.tar.gz*) \
    582           GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
     583          GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
    583584        *.tar.bz2*) \
    584           bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
     585          bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
    585586        *.tar.lzma*) \
    586           unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
     587          lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
    587588        *.tar.xz*) \
    588589          xz -dc $(distdir).tar.xz | $(am__untar) ;;\
    … …  
    590591          uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
    591592        *.shar.gz*) \
    592           GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
     593          GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
    593594        *.zip*) \
    594595          unzip $(distdir).zip ;;\

  • NEWS

    rae015fa r9c4a7444  
     1** Version 0.5.8 (2010-08-18)
     2- Session tickets are enabled by default.
     3
     4- Fixes some segmentation faults noticed in some
     5  configurations.
     6
    17** Version 0.5.7 (2010-07-01)
    28- Force usage of SDBM. For some reason the default in

  • aclocal.m4

    rae015fa r9c4a7444  
    1 # generated automatically by aclocal 1.11 -*- Autoconf -*-
     1# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
    22
    33# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
    … …  
    1414m4_ifndef([AC_AUTOCONF_VERSION],
    1515  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
    16 m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
    17 [m4_warning([this file was generated for autoconf 2.64.
     16m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
     17[m4_warning([this file was generated for autoconf 2.65.
    1818You have another version of autoconf.  It may work, but is not guaranteed to.
    1919If you have problems, you may need to regenerate the build system entirely.
    … …  
    3535dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
    3636dnl require some minimum version.  Point them to the right macro.
    37 m4_if([$1], [1.11], [],
     37m4_if([$1], [1.11.1], [],
    3838      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
    3939])
    … …  
    5151# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
    5252AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
    53 [AM_AUTOMAKE_VERSION([1.11])dnl
     53[AM_AUTOMAKE_VERSION([1.11.1])dnl
    5454m4_ifndef([AC_AUTOCONF_VERSION],
    5555  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl

  • config/config.guess

    rae015fa r9c4a7444  
    22# Attempt to guess a canonical system name.
    33#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
    4 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
     4#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
    55#   Free Software Foundation, Inc.
    66
    7 timestamp='2009-04-27'
     7timestamp='2009-06-10'
    88
    99# This file is free software; you can redistribute it and/or modify it
    … …  
    171171                eval $set_cc_for_build
    172172                if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
    173                         | grep __ELF__ >/dev/null
     173                        | grep -q __ELF__
    174174                then
    175175                    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
    … …  
    657657
    658658            if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
    659                 grep __LP64__ >/dev/null
     659                grep -q __LP64__
    660660            then
    661661                HP_ARCH="hppa2.0w"
    … …  
    823823        echo i${UNAME_MACHINE}-pc-mks
    824824        exit ;;
     825    8664:Windows_NT:*)
     826        echo x86_64-pc-mks
     827        exit ;;
    825828    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
    826829        # How do we know it's Interix rather than the generic POSIX subsystem?
    … …  
    883886        echo ${UNAME_MACHINE}-unknown-linux-gnu
    884887        exit ;;
    885     mips:Linux:*:*)
     888    mips:Linux:*:* | mips64:Linux:*:*)
    886889        eval $set_cc_for_build
    887890        sed 's/^        //' << EOF >$dummy.c
    888891        #undef CPU
    889         #undef mips
    890         #undef mipsel
     892        #undef ${UNAME_MACHINE}
     893        #undef ${UNAME_MACHINE}el
    891894        #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
    892         CPU=mipsel
     895        CPU=${UNAME_MACHINE}el
    893896        #else
    894897        #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
    895         CPU=mips
    896         #else
    897         CPU=
    898         #endif
    899         #endif
    900 EOF
    901         eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
    902             /^CPU/{
    903                 s: ::g
    904                 p
    905             }'`"
    906         test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
    907         ;;
    908     mips64:Linux:*:*)
    909         eval $set_cc_for_build
    910         sed 's/^        //' << EOF >$dummy.c
    911         #undef CPU
    912         #undef mips64
    913         #undef mips64el
    914         #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
    915         CPU=mips64el
    916         #else
    917         #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
    918         CPU=mips64
     898        CPU=${UNAME_MACHINE}
    919899        #else
    920900        CPU=
    … …  
    948928          EV68*) UNAME_MACHINE=alphaev68 ;;
    949929        esac
    950         objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
     930        objdump --private-headers /bin/sh | grep -q ld.so.1
    951931        if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
    952932        echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
    … …  
    1002982                TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
    1003983                ;;
    1004           a.out-i386-linux)
    1005                 echo "${UNAME_MACHINE}-pc-linux-gnuaout"
    1006                 exit ;;
    1007           "")
    1008                 # Either a pre-BFD a.out linker (linux-gnuoldld) or
    1009                 # one that does not give us useful --help.
    1010                 echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
    1011                 exit ;;
    1012984        esac
    1013985        # Determine whether the default compiler is a.out or elf
    … …  
    10751047        echo ${UNAME_MACHINE}-pc-syllable
    10761048        exit ;;
    1077     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
     1049    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
    10781050        echo i386-unknown-lynxos${UNAME_RELEASE}
    10791051        exit ;;
    … …  
    11831155        echo rs6000-unknown-lynxos${UNAME_RELEASE}
    11841156        exit ;;
    1185     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
     1157    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
    11861158        echo powerpc-unknown-lynxos${UNAME_RELEASE}
    11871159        exit ;;

  • config/config.sub

    rae015fa r9c4a7444  
    22# Configuration validation subroutine script.
    33#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
    4 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
     4#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
    55#   Free Software Foundation, Inc.
    66
    7 timestamp='2009-04-17'
     7timestamp='2009-06-11'
    88
    99# This file is (in principle) common to ALL GNU software.
    … …  
    153153                os=
    154154                basic_machine=$1
     155                ;;
     156        -bluegene*)
     157                os=-cnk
    155158                ;;
    156159        -sim | -cisco | -oki | -wec | -winbond)
    … …  
    468471                os=-linux
    469472                ;;
     473        bluegene*)
     474                basic_machine=powerpc-ibm
     475                os=-cnk
     476                ;;
    470477        c90)
    471478                basic_machine=c90-cray
    … …  
    12611268        # -sysv* is not here because it comes later, after sysvr4.
    12621269        -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
    1263               | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
     1270              | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
    12641271              | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
    12651272              | -kopensolaris* \
    … …  
    16141621                                vendor=sun
    16151622                                ;;
    1616                         -aix*)
     1623                        -cnk*|-aix*)
    16171624                                vendor=ibm
    16181625                                ;;

  • config/ltmain.sh

    rae015fa r9c4a7444  
    11# Generated from ltmain.m4sh.
    22
    3 # ltmain.sh (GNU libtool) 2.2.6
     3# ltmain.sh (GNU libtool) 2.2.6b
    44# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
    55
    … …  
    6666#       compiler flags:         $LTCFLAGS
    6767#       linker:         $LD (gnu? $with_gnu_ld)
    68 #       $progname:              (GNU libtool) 2.2.6 Debian-2.2.6a-4
     68#       $progname:              (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
    6969#       automake:               $automake_version
    7070#       autoconf:               $autoconf_version
    … …  
    7474PROGRAM=ltmain.sh
    7575PACKAGE=libtool
    76 VERSION="2.2.6 Debian-2.2.6a-4"
     76VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"
    7777TIMESTAMP=""
    78 package_revision=1.3012
     78package_revision=1.3017
    7979
    8080# Be Bourne compatible

  • configure

    rae015fa r9c4a7444  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.64 for mod_gnutls 0.5.7.
     3# Generated by GNU Autoconf 2.65 for mod_gnutls 0.5.8.
     4#
    45#
    56# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
    6 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
    7 # Foundation, Inc.
     7# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
     8# Inc.
     9#
    810#
    911# This configure script is free software; the Free Software Foundation
    … …  
    674676
    675677
    676 exec 7<&0 </dev/null 6>&1
     678test -n "$DJDIR" || exec 7<&0 </dev/null
     679exec 6>&1
    677680
    678681# Name of the host.
    … …  
    696699PACKAGE_NAME='mod_gnutls'
    697700PACKAGE_TARNAME='mod_gnutls'
    698 PACKAGE_VERSION='0.5.7'
    699 PACKAGE_STRING='mod_gnutls 0.5.7'
     701PACKAGE_VERSION='0.5.8'
     702PACKAGE_STRING='mod_gnutls 0.5.8'
    700703PACKAGE_BUGREPORT=''
    701704PACKAGE_URL=''
    … …  
    14621465  # This message is too long to be a string in the A/UX 3.1 sh.
    14631466  cat <<_ACEOF
    1464 \`configure' configures mod_gnutls 0.5.7 to adapt to many kinds of systems.
     1467\`configure' configures mod_gnutls 0.5.8 to adapt to many kinds of systems.
    14651468
    14661469Usage: $0 [OPTION]... [VAR=VALUE]...
    … …  
    15331536if test -n "$ac_init_help"; then
    15341537  case $ac_init_help in
    1535      short | recursive ) echo "Configuration of mod_gnutls 0.5.7:";;
     1538     short | recursive ) echo "Configuration of mod_gnutls 0.5.8:";;
    15361539   esac
    15371540  cat <<\_ACEOF
    … …  
    15761579              nonstandard directory <lib dir>
    15771580  LIBS        libraries to pass to the linker, e.g. -l<library>
    1578   CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
     1581  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
    15791582              you have headers in a nonstandard directory <include dir>
    15801583  CPP         C preprocessor
    … …  
    16461649if $ac_init_version; then
    16471650  cat <<\_ACEOF
    1648 mod_gnutls configure 0.5.7
    1649 generated by GNU Autoconf 2.64
     1651mod_gnutls configure 0.5.8
     1652generated by GNU Autoconf 2.65
    16501653
    16511654Copyright (C) 2009 Free Software Foundation, Inc.
    … …  
    16941697fi
    16951698  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
    1696   return $ac_retval
     1699  as_fn_set_status $ac_retval
    16971700
    16981701} # ac_fn_c_try_compile
    … …  
    17401743  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
    17411744  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
    1742   return $ac_retval
     1745  as_fn_set_status $ac_retval
    17431746
    17441747} # ac_fn_c_try_link
    … …  
    18081811fi
    18091812  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
    1810   return $ac_retval
     1813  as_fn_set_status $ac_retval
    18111814
    18121815} # ac_fn_c_try_cpp
    … …  
    18501853  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
    18511854  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
    1852   return $ac_retval
     1855  as_fn_set_status $ac_retval
    18531856
    18541857} # ac_fn_c_try_run
    … …  
    19631966running configure, to aid debugging if configure makes a mistake.
    19641967
    1965 It was created by mod_gnutls $as_me 0.5.7, which was
    1966 generated by GNU Autoconf 2.64.  Invocation command line was
     1968It was created by mod_gnutls $as_me 0.5.8, which was
     1969generated by GNU Autoconf 2.65.  Invocation command line was
    19671970
    19681971  $ $0 $@
    … …  
    22172220do
    22182221  test "x$ac_site_file" = xNONE && continue
    2219   if test -r "$ac_site_file"; then
     2222  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
    22202223    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
    22212224$as_echo "$as_me: loading site script $ac_site_file" >&6;}
    … …  
    22262229
    22272230if test -r "$cache_file"; then
    2228   # Some versions of bash will fail to source /dev/null (special
    2229   # files actually), so we avoid doing that.
    2230   if test -f "$cache_file"; then
     2231  # Some versions of bash will fail to source /dev/null (special files
     2232  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
     2233  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
    22312234    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
    22322235$as_echo "$as_me: loading cache $cache_file" >&6;}
    … …  
    23282331  chmod +x config.nice
    23292332
    2330 MOD_GNUTLS_VERSION=0.5.7
     2333MOD_GNUTLS_VERSION=0.5.8
    23312334
    23322335
    … …  
    28142817fi
    28152818
     2819  test -d ./--version && rmdir ./--version
    28162820  if test "${ac_cv_path_mkdir+set}" = set; then
    28172821    MKDIR_P="$ac_cv_path_mkdir -p"
    … …  
    28212825    # break other packages using the cache if that directory is
    28222826    # removed, or if the value is a relative name.
    2823     test -d ./--version && rmdir ./--version
    28242827    MKDIR_P="$ac_install_sh -d"
    28252828  fi
    … …  
    29382941# Define the identity of the package.
    29392942 PACKAGE=mod_gnutls
    2940  VERSION=0.5.7
     2943 VERSION=0.5.8
    29412944
    29422945
    … …  
    33053308         10q' conftest.err >conftest.er1
    33063309    cat conftest.er1 >&5
    3307     rm -f conftest.er1 conftest.err
    33083310  fi
     3311  rm -f conftest.er1 conftest.err
    33093312  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    33103313  test $ac_status = 0; }
    … …  
    33133316cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    33143317/* end confdefs.h.  */
    3315 #include <stdio.h>
     3318
    33163319int
    33173320main ()
    33183321{
    3319 FILE *f = fopen ("conftest.out", "w");
    3320  return ferror (f) || fclose (f) != 0;
    33213322
    33223323  ;
    … …  
    33253326_ACEOF
    33263327ac_clean_files_save=$ac_clean_files
    3327 ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
     3328ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
    33283329# Try to create an executable without -o first, disregard a.out.
    33293330# It will help us diagnose broken compilers, and finding out an intuition
    33303331# of exeext.
    3331 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
    3332 $as_echo_n "checking for C compiler default output file name... " >&6; }
     3332{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
     3333$as_echo_n "checking whether the C compiler works... " >&6; }
    33333334ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
    33343335
    … …  
    33923393  ac_file=''
    33933394fi
    3394 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
    3395 $as_echo "$ac_file" >&6; }
    33963395if test -z "$ac_file"; then :
    3397   $as_echo "$as_me: failed program was:" >&5
     3396  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     3397$as_echo "no" >&6; }
     3398$as_echo "$as_me: failed program was:" >&5
    33983399sed 's/^/| /' conftest.$ac_ext >&5
    33993400
    … …  
    34033404as_fn_error "C compiler cannot create executables
    34043405See \`config.log' for more details." "$LINENO" 5; }; }
    3405 fi
     3406else
     3407  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
     3408$as_echo "yes" >&6; }
     3409fi
     3410{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
     3411$as_echo_n "checking for C compiler default output file name... " >&6; }
     3412{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
     3413$as_echo "$ac_file" >&6; }
    34063414ac_exeext=$ac_cv_exeext
    34073415
    3408 # Check that the compiler produces executables we can run.  If not, either
    3409 # the compiler is broken, or we cross compile.
    3410 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
    3411 $as_echo_n "checking whether the C compiler works... " >&6; }
    3412 # If not cross compiling, check that we can run a simple program.
    3413 if test "$cross_compiling" != yes; then
    3414   if { ac_try='./$ac_file'
    3415   { { case "(($ac_try" in
    3416   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    3417   *) ac_try_echo=$ac_try;;
    3418 esac
    3419 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
    3420 $as_echo "$ac_try_echo"; } >&5
    3421   (eval "$ac_try") 2>&5
    3422   ac_status=$?
    3423   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    3424   test $ac_status = 0; }; }; then
    3425     cross_compiling=no
    3426   else
    3427     if test "$cross_compiling" = maybe; then
    3428         cross_compiling=yes
    3429     else
    3430         { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    3431 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    3432 as_fn_error "cannot run C compiled programs.
    3433 If you meant to cross compile, use \`--host'.
    3434 See \`config.log' for more details." "$LINENO" 5; }
    3435     fi
    3436   fi
    3437 fi
    3438 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
    3439 $as_echo "yes" >&6; }
    3440 
    3441 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
     3416rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
    34423417ac_clean_files=$ac_clean_files_save
    3443 # Check that the compiler produces executables we can run.  If not, either
    3444 # the compiler is broken, or we cross compile.
    3445 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
    3446 $as_echo_n "checking whether we are cross compiling... " >&6; }
    3447 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
    3448 $as_echo "$cross_compiling" >&6; }
    3449 
    34503418{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
    34513419$as_echo_n "checking for suffix of executables... " >&6; }
    … …  
    34803448See \`config.log' for more details." "$LINENO" 5; }
    34813449fi
    3482 rm -f conftest$ac_cv_exeext
     3450rm -f conftest conftest$ac_cv_exeext
    34833451{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
    34843452$as_echo "$ac_cv_exeext" >&6; }
    … …  
    34873455EXEEXT=$ac_cv_exeext
    34883456ac_exeext=$EXEEXT
     3457cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     3458/* end confdefs.h.  */
     3459#include <stdio.h>
     3460int
     3461main ()
     3462{
     3463FILE *f = fopen ("conftest.out", "w");
     3464 return ferror (f) || fclose (f) != 0;
     3465
     3466  ;
     3467  return 0;
     3468}
     3469_ACEOF
     3470ac_clean_files="$ac_clean_files conftest.out"
     3471# Check that the compiler produces executables we can run.  If not, either
     3472# the compiler is broken, or we cross compile.
     3473{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
     3474$as_echo_n "checking whether we are cross compiling... " >&6; }
     3475if test "$cross_compiling" != yes; then
     3476  { { ac_try="$ac_link"
     3477case "(($ac_try" in
     3478  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     3479  *) ac_try_echo=$ac_try;;
     3480esac
     3481eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
     3482$as_echo "$ac_try_echo"; } >&5
     3483  (eval "$ac_link") 2>&5
     3484  ac_status=$?
     3485  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     3486  test $ac_status = 0; }
     3487  if { ac_try='./conftest$ac_cv_exeext'
     3488  { { case "(($ac_try" in
     3489  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     3490  *) ac_try_echo=$ac_try;;
     3491esac
     3492eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
     3493$as_echo "$ac_try_echo"; } >&5
     3494  (eval "$ac_try") 2>&5
     3495  ac_status=$?
     3496  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     3497  test $ac_status = 0; }; }; then
     3498    cross_compiling=no
     3499  else
     3500    if test "$cross_compiling" = maybe; then
     3501        cross_compiling=yes
     3502    else
     3503        { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
     3504$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
     3505as_fn_error "cannot run C compiled programs.
     3506If you meant to cross compile, use \`--host'.
     3507See \`config.log' for more details." "$LINENO" 5; }
     3508    fi
     3509  fi
     3510fi
     3511{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
     3512$as_echo "$cross_compiling" >&6; }
     3513
     3514rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
     3515ac_clean_files=$ac_clean_files_save
    34893516{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
    34903517$as_echo_n "checking for suffix of object files... " >&6; }
    … …  
    43584385
    43594386
    4360 macro_version='2.2.6'
    4361 macro_revision='1.3012'
     4387macro_version='2.2.6b'
     4388macro_revision='1.3017'
    43624389
    43634390
    … …  
    45494576  lt_cv_nm_interface="BSD nm"
    45504577  echo "int some_variable = 0;" > conftest.$ac_ext
    4551   (eval echo "\"\$as_me:4551: $ac_compile\"" >&5)
     4578  (eval echo "\"\$as_me:4578: $ac_compile\"" >&5)
    45524579  (eval "$ac_compile" 2>conftest.err)
    45534580  cat conftest.err >&5
    4554   (eval echo "\"\$as_me:4554: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
     4581  (eval echo "\"\$as_me:4581: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
    45554582  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
    45564583  cat conftest.err >&5
    4557   (eval echo "\"\$as_me:4557: output\"" >&5)
     4584  (eval echo "\"\$as_me:4584: output\"" >&5)
    45584585  cat conftest.out >&5
    45594586  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
    … …  
    50215048
    50225049# This must be Linux ELF.
    5023 linux* | k*bsd*-gnu)
     5050linux* | k*bsd*-gnu | kopensolaris*-gnu)
    50245051  lt_cv_deplibs_check_method=pass_all
    50255052  ;;
    … …  
    57615788*-*-irix6*)
    57625789  # Find out which ABI we are using.
    5763   echo '#line 5763 "configure"' > conftest.$ac_ext
     5790  echo '#line 5790 "configure"' > conftest.$ac_ext
    57645791  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
    57655792  (eval $ac_compile) 2>&5
    … …  
    72917318   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    72927319   -e 's:$: $lt_compiler_flag:'`
    7293    (eval echo "\"\$as_me:7293: $lt_compile\"" >&5)
     7320   (eval echo "\"\$as_me:7320: $lt_compile\"" >&5)
    72947321   (eval "$lt_compile" 2>conftest.err)
    72957322   ac_status=$?
    72967323   cat conftest.err >&5
    7297    echo "$as_me:7297: \$? = $ac_status" >&5
     7324   echo "$as_me:7324: \$? = $ac_status" >&5
    72987325   if (exit $ac_status) && test -s "$ac_outfile"; then
    72997326     # The compiler can only warn and ignore the option if not recognized
    … …  
    74607487      ;;
    74617488
    7462     linux* | k*bsd*-gnu)
     7489    linux* | k*bsd*-gnu | kopensolaris*-gnu)
    74637490      case $cc_basename in
    74647491      # old Intel for x86_64 which still supported -KPIC.
    … …  
    76307657   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    76317658   -e 's:$: $lt_compiler_flag:'`
    7632    (eval echo "\"\$as_me:7632: $lt_compile\"" >&5)
     7659   (eval echo "\"\$as_me:7659: $lt_compile\"" >&5)
    76337660   (eval "$lt_compile" 2>conftest.err)
    76347661   ac_status=$?
    76357662   cat conftest.err >&5
    7636    echo "$as_me:7636: \$? = $ac_status" >&5
     7663   echo "$as_me:7663: \$? = $ac_status" >&5
    76377664   if (exit $ac_status) && test -s "$ac_outfile"; then
    76387665     # The compiler can only warn and ignore the option if not recognized
    … …  
    77357762   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    77367763   -e 's:$: $lt_compiler_flag:'`
    7737    (eval echo "\"\$as_me:7737: $lt_compile\"" >&5)
     7764   (eval echo "\"\$as_me:7764: $lt_compile\"" >&5)
    77387765   (eval "$lt_compile" 2>out/conftest.err)
    77397766   ac_status=$?
    77407767   cat out/conftest.err >&5
    7741    echo "$as_me:7741: \$? = $ac_status" >&5
     7768   echo "$as_me:7768: \$? = $ac_status" >&5
    77427769   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    77437770   then
    … …  
    77907817   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    77917818   -e 's:$: $lt_compiler_flag:'`
    7792    (eval echo "\"\$as_me:7792: $lt_compile\"" >&5)
     7819   (eval echo "\"\$as_me:7819: $lt_compile\"" >&5)
    77937820   (eval "$lt_compile" 2>out/conftest.err)
    77947821   ac_status=$?
    77957822   cat out/conftest.err >&5
    7796    echo "$as_me:7796: \$? = $ac_status" >&5
     7823   echo "$as_me:7823: \$? = $ac_status" >&5
    77977824   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    77987825   then
    … …  
    79337960    supports_anon_versioning=no
    79347961    case `$LD -v 2>&1` in
     7962      *GNU\ gold*) supports_anon_versioning=yes ;;
    79357963      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
    79367964      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
    … …  
    80248052      ;;
    80258053
    8026     gnu* | linux* | tpf* | k*bsd*-gnu)
     8054    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
    80278055      tmp_diet=no
    80288056      if test "$host_os" = linux-dietlibc; then
    … …  
    94869514
    94879515# This must be Linux ELF.
    9488 linux* | k*bsd*-gnu)
     9516linux* | k*bsd*-gnu | kopensolaris*-gnu)
    94899517  version_type=linux
    94909518  need_lib_prefix=no
    … …  
    1017310201  lt_status=$lt_dlunknown
    1017410202  cat > conftest.$ac_ext <<_LT_EOF
    10175 #line 10175 "configure"
     10203#line 10203 "configure"
    1017610204#include "confdefs.h"
    1017710205
    … …  
    1026910297  lt_status=$lt_dlunknown
    1027010298  cat > conftest.$ac_ext <<_LT_EOF
    10271 #line 10271 "configure"
     10299#line 10299 "configure"
    1027210300#include "confdefs.h"
    1027310301
    … …  
    1188811916# values after options handling.
    1188911917ac_log="
    11890 This file was extended by mod_gnutls $as_me 0.5.7, which was
    11891 generated by GNU Autoconf 2.64.  Invocation command line was
     11918This file was extended by mod_gnutls $as_me 0.5.8, which was
     11919generated by GNU Autoconf 2.65.  Invocation command line was
    1189211920
    1189311921  CONFIG_FILES    = $CONFIG_FILES
    … …  
    1192911957  -h, --help       print this help, then exit
    1193011958  -V, --version    print version number and configuration settings, then exit
     11959      --config     print configuration, then exit
    1193111960  -q, --quiet, --silent
    1193211961                   do not print progress messages
    … …  
    1195111980_ACEOF
    1195211981cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
     11982ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
    1195311983ac_cs_version="\\
    11954 mod_gnutls config.status 0.5.7
    11955 configured by $0, generated by GNU Autoconf 2.64,
    11956   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
     11984mod_gnutls config.status 0.5.8
     11985configured by $0, generated by GNU Autoconf 2.65,
     11986  with options \\"\$ac_cs_config\\"
    1195711987
    1195811988Copyright (C) 2009 Free Software Foundation, Inc.
    … …  
    1199212022  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
    1199312023    $as_echo "$ac_cs_version"; exit ;;
     12024  --config | --confi | --conf | --con | --co | --c )
     12025    $as_echo "$ac_cs_config"; exit ;;
    1199412026  --debug | --debu | --deb | --de | --d | -d )
    1199512027    debug=: ;;
    … …  
    1243712469:nl
    1243812470h
    12439 s/\(.\{148\}\).*/\1/
     12471s/\(.\{148\}\)..*/\1/
    1244012472t more1
    1244112473s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
    … …  
    1245112483:delim
    1245212484h
    12453 s/\(.\{148\}\).*/\1/
     12485s/\(.\{148\}\)..*/\1/
    1245412486t more2
    1245512487s/["\\]/\\&/g; s/^/"/; s/$/"/

  • configure.ac

    rae015fa r9c4a7444  
    11dnl
    2 AC_INIT(mod_gnutls, 0.5.7)
     2AC_INIT(mod_gnutls, 0.5.8)
    33OOO_CONFIG_NICE(config.nice)
    44MOD_GNUTLS_VERSION=AC_PACKAGE_VERSION

  • m4/libtool.m4

    rae015fa r9c4a7444  
    24462446
    24472447# This must be Linux ELF.
    2448 linux* | k*bsd*-gnu)
     2448linux* | k*bsd*-gnu | kopensolaris*-gnu)
    24492449  version_type=linux
    24502450  need_lib_prefix=no
    … …  
    30853085
    30863086# This must be Linux ELF.
    3087 linux* | k*bsd*-gnu)
     3087linux* | k*bsd*-gnu | kopensolaris*-gnu)
    30883088  lt_cv_deplibs_check_method=pass_all
    30893089  ;;
    … …  
    37063706        esac
    37073707        ;;
    3708       linux* | k*bsd*-gnu)
     3708      linux* | k*bsd*-gnu | kopensolaris*-gnu)
    37093709        case $cc_basename in
    37103710          KCC*)
    … …  
    39903990      ;;
    39913991
    3992     linux* | k*bsd*-gnu)
     3992    linux* | k*bsd*-gnu | kopensolaris*-gnu)
    39933993      case $cc_basename in
    39943994      # old Intel for x86_64 which still supported -KPIC.
    … …  
    42864286    supports_anon_versioning=no
    42874287    case `$LD -v 2>&1` in
     4288      *GNU\ gold*) supports_anon_versioning=yes ;;
    42884289      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
    42894290      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
    … …  
    43774378      ;;
    43784379
    4379     gnu* | linux* | tpf* | k*bsd*-gnu)
     4380    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
    43804381      tmp_diet=no
    43814382      if test "$host_os" = linux-dietlibc; then
    … …  
    58615862        ;;
    58625863
    5863       linux* | k*bsd*-gnu)
     5864      linux* | k*bsd*-gnu | kopensolaris*-gnu)
    58645865        case $cc_basename in
    58655866          KCC*)

  • m4/ltversion.m4

    rae015fa r9c4a7444  
    1010# Generated from ltversion.in.
    1111
    12 # serial 3012 ltversion.m4
     12# serial 3017 ltversion.m4
    1313# This file is part of GNU Libtool
    1414
    15 m4_define([LT_PACKAGE_VERSION], [2.2.6])
    16 m4_define([LT_PACKAGE_REVISION], [1.3012])
     15m4_define([LT_PACKAGE_VERSION], [2.2.6b])
     16m4_define([LT_PACKAGE_REVISION], [1.3017])
    1717
    1818AC_DEFUN([LTVERSION_VERSION],
    19 [macro_version='2.2.6'
    20 macro_revision='1.3012'
     19[macro_version='2.2.6b'
     20macro_revision='1.3017'
    2121_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
    2222_LT_DECL(, macro_revision, 0)

  • src/Makefile.in

    rae015fa r9c4a7444  
    1 # Makefile.in generated by automake 1.11 from Makefile.am.
     1# Makefile.in generated by automake 1.11.1 from Makefile.am.
    22# @configure_input@
    33

  • src/gnutls_config.c

    rae015fa r9c4a7444  
    607607    sc->cache_type = mgs_cache_none;
    608608    sc->cache_config = ap_server_root_relative(p, "conf/gnutls_cache");
     609    sc->tickets = 1; /* by default enable session tickets */
    609610
    610611    sc->client_verify_mode = GNUTLS_CERT_IGNORE;

  • src/gnutls_hooks.c

    rae015fa r9c4a7444  
    487487const char *mgs_hook_http_scheme(const request_rec * r)
    488488{
    489     mgs_srvconf_rec *sc =
     489    mgs_srvconf_rec *sc;
     490   
     491    if (r == NULL)
     492        return NULL;
     493   
     494    sc =
    490495        (mgs_srvconf_rec *) ap_get_module_config(r->server->module_config,
    491496                                                 &gnutls_module);
    … …  
    501506apr_port_t mgs_hook_default_port(const request_rec * r)
    502507{
    503     mgs_srvconf_rec *sc =
     508    mgs_srvconf_rec *sc;
     509   
     510    if (r == NULL)
     511        return 0;
     512   
     513    sc =
    504514        (mgs_srvconf_rec *) ap_get_module_config(r->server->module_config,
    505515                                                 &gnutls_module);
    … …  
    580590#endif
    581591
     592    if (session == NULL)
     593        return NULL;
     594
    582595    _gnutls_log(debug_log_fp,   "%s: %d\n", __func__, __LINE__);
    583596    ctxt = gnutls_transport_get_ptr(session);
    … …  
    694707{
    695708    mgs_handle_t *ctxt;
    696     mgs_srvconf_rec *sc =
     709    mgs_srvconf_rec *sc;
     710
     711    _gnutls_log(debug_log_fp,   "%s: %d\n", __func__, __LINE__);
     712   
     713    if (c == NULL)
     714        return DECLINED;
     715   
     716    sc =
    697717        (mgs_srvconf_rec *) ap_get_module_config(c->base_server->
    698718                                                 module_config,
    699719                                                 &gnutls_module);
    700720
    701     _gnutls_log(debug_log_fp,   "%s: %d\n", __func__, __LINE__);
    702721    if (!(sc && (sc->enabled == GNUTLS_ENABLED_TRUE))) {
    703722        return DECLINED;
    … …  
    733752    int rv = OK;
    734753
     754    if (r == NULL)
     755        return DECLINED;
     756
    735757    _gnutls_log(debug_log_fp,   "%s: %d\n", __func__, __LINE__);
    736758    apr_table_t *env = r->subprocess_env;
    … …  
    739761        ap_get_module_config(r->connection->conn_config, &gnutls_module);
    740762
    741     if (!ctxt) {
     763    if (!ctxt || ctxt->session == NULL) {
    742764        return DECLINED;
    743765    }
    … …  
    805827    int rv;
    806828    mgs_handle_t *ctxt;
    807     mgs_dirconf_rec *dc = ap_get_module_config(r->per_dir_config,
     829    mgs_dirconf_rec *dc;
     830   
     831    if (r == NULL)
     832        return DECLINED;
     833   
     834    dc = ap_get_module_config(r->per_dir_config,
    808835                                               &gnutls_module);
    809836
    … …  
    812839        ap_get_module_config(r->connection->conn_config, &gnutls_module);
    813840
    814     if (!ctxt) {
     841    if (!ctxt || ctxt->session == NULL) {
    815842        return DECLINED;
    816843    }
    … …  
    875902    size_t len;
    876903    int ret, i;
     904
     905    if (r == NULL)
     906        return;
    877907
    878908    apr_table_t *env = r->subprocess_env;
    … …  
    9841014    size_t len;
    9851015    int ret;
     1016   
     1017    if (r == NULL)
     1018        return;
    9861019
    9871020    _gnutls_log(debug_log_fp,   "%s: %d\n", __func__, __LINE__);
    … …  
    10441077{
    10451078    const gnutls_datum_t *cert_list;
    1046     unsigned int cert_list_size, status, expired;
     1079    unsigned int cert_list_size, status;
    10471080    int rv = GNUTLS_E_NO_CERTIFICATE_FOUND, ret;
    10481081    unsigned int ch_size = 0;
    … …  
    10511084      gnutls_openpgp_crt_t pgp;
    10521085    } cert;
    1053     apr_time_t activation_time, expiration_time, cur_time;
     1086    apr_time_t expiration_time, cur_time;
     1087
     1088    if (r == NULL || ctxt == NULL || ctxt->session == NULL)
     1089        return HTTP_FORBIDDEN;
    10541090
    10551091    _gnutls_log(debug_log_fp, "%s: %d\n", __func__, __LINE__);
    … …  
    11171153        apr_time_ansi_put(&expiration_time,
    11181154                      gnutls_x509_crt_get_expiration_time(cert.x509[0]));
    1119         apr_time_ansi_put(&activation_time,
    1120                       gnutls_x509_crt_get_activation_time(cert.x509[0]));
    11211155
    11221156        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
    … …  
    11281162        apr_time_ansi_put(&expiration_time,
    11291163                      gnutls_openpgp_crt_get_expiration_time(cert.pgp));
    1130         apr_time_ansi_put(&activation_time,
    1131                       gnutls_openpgp_crt_get_creation_time(cert.pgp));
    11321164
    11331165        rv = gnutls_openpgp_crt_verify_ring(cert.pgp, ctxt->sc->pgp_list,
    … …  
    11511183    /* ret = gnutls_x509_crt_check_revocation(crt, crl_list, crl_list_size); */
    11521184
    1153     expired = 0;
    11541185    cur_time = apr_time_now();
    1155     if (activation_time > cur_time) {
    1156         ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
    1157                       "GnuTLS: Failed to Verify Peer: "
    1158                       "Peer Certificate is not yet activated.");
    1159         expired = 1;
    1160     }
    1161 
    1162     if (gnutls_certificate_type_get( ctxt->session) != GNUTLS_CRT_OPENPGP || expiration_time != 0) {
    1163         if (expiration_time < cur_time) {
    1164             ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
    1165                       "GnuTLS: Failed to Verify Peer: "
    1166                       "Peer Certificate is expired.");
    1167             expired = 1;
    1168         }
    1169     }
    11701186
    11711187    if (status & GNUTLS_CERT_SIGNER_NOT_FOUND) {
    … …  
    11771193        ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
    11781194                      "GnuTLS: Peer's Certificate signer is not a CA");
     1195    }
     1196
     1197    if (status & GNUTLS_CERT_INSECURE_ALGORITHM) {
     1198        ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
     1199                      "GnuTLS: Peer's Certificate is using insecure algorithms");
     1200    }
     1201
     1202    if (status & GNUTLS_CERT_EXPIRED || status & GNUTLS_CERT_NOT_ACTIVATED) {
     1203        ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
     1204                      "GnuTLS: Peer's Certificate signer is expired or not yet activated");
    11791205    }
    11801206
    … …  
    12031229    }
    12041230
    1205     if (status == 0 && expired == 0) {
     1231    if (status == 0) {
    12061232        apr_table_setn(r->subprocess_env, "SSL_CLIENT_VERIFY", "SUCCESS");
    12071233        ret = OK;

  • src/gnutls_io.c

    rae015fa r9c4a7444  
    222222        }
    223223    }
     224   
     225    if (ctxt->session == NULL) {
     226        return APR_EGENERAL;
     227    }
    224228
    225229    while (1) {
    … …  
    361365    int maxtries = HANDSHAKE_MAX_TRIES;
    362366
    363     if (ctxt->status != 0) {
     367    if (ctxt->status != 0 || ctxt->session == NULL) {
    364368        return -1;
    365369    }
    … …  
    442446{
    443447    int rv;
     448   
     449    if (ctxt->session == NULL)
     450        return -1;
    444451
    445452    rv = gnutls_rehandshake(ctxt->session);
    … …  
    566573            apr_bucket_copy(bucket, &e);
    567574            APR_BRIGADE_INSERT_TAIL(ctxt->output_bb, e);
    568             
     575 
    569576            if ((status = ap_pass_brigade(f->next, tmpb)) != APR_SUCCESS) {
    570577                apr_brigade_cleanup(ctxt->output_bb);
    … …  
    610617            if (len > 0) {
    611618
    612                 do {
    613                     ret = gnutls_record_send(ctxt->session, data, len);
    614                 }
    615                 while(ret == GNUTLS_E_INTERRUPTED || ret == GNUTLS_E_AGAIN);
     619                if (ctxt->session == NULL) {
     620                    ret = GNUTLS_E_INVALID_REQUEST;
     621                } else {
     622                    do {
     623                        ret = gnutls_record_send(ctxt->session, data, len);
     624                    }
     625                    while(ret == GNUTLS_E_INTERRUPTED || ret == GNUTLS_E_AGAIN);
     626                }
    616627
    617628                if (ret < 0) {
    … …  
    675686                return 0;
    676687            } else {
    677                 gnutls_transport_set_errno(ctxt->session, EINTR);
     688                if (ctxt->session)
     689                    gnutls_transport_set_errno(ctxt->session, EINTR);
    678690                return -1;
    679691            }
    … …  
    698710        || APR_STATUS_IS_EINTR(ctxt->input_rc)) {
    699711        if (len == 0) {
    700             gnutls_transport_set_errno(ctxt->session, EINTR);
     712            if (ctxt->session)
     713                gnutls_transport_set_errno(ctxt->session, EINTR);
    701714            return -1;
    702715        }
Note: See TracChangeset for help on using the changeset viewer.