Changeset 66b608e in mod_gnutls for src


Ignore:
Timestamp:
Jan 11, 2013, 12:57:51 AM (8 years ago)
Author:
Daniel Kahn Gillmor <dkg@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports, upstream
Children:
bbb9bb1, e03f404
Parents:
52b649e
Message:

Imported Upstream version 0.5.6

Location:
src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • src/Makefile.in

    r52b649e r66b608e  
    1 # Makefile.in generated by automake 1.10.2 from Makefile.am.
     1# Makefile.in generated by automake 1.11 from Makefile.am.
    22# @configure_input@
    33
    44# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
    5 # 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
     5# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
     6# Inc.
    67# This Makefile.in is free software; the Free Software Foundation
    78# gives unlimited permission to copy and/or distribute it,
     
    1718VPATH = @srcdir@
    1819pkgdatadir = $(datadir)/@PACKAGE@
     20pkgincludedir = $(includedir)/@PACKAGE@
    1921pkglibdir = $(libdir)/@PACKAGE@
    20 pkgincludedir = $(includedir)/@PACKAGE@
     22pkglibexecdir = $(libexecdir)/@PACKAGE@
    2123am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
    2224install_sh_DATA = $(install_sh) -c -m 644
     
    4951CONFIG_HEADER = $(top_builddir)/include/mod_gnutls_config.h
    5052CONFIG_CLEAN_FILES =
     53CONFIG_CLEAN_VPATH_FILES =
    5154am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
    5255am__vpath_adj = case $$p in \
     
    5457    *) f=$$p;; \
    5558  esac;
    56 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
     59am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
     60am__install_max = 40
     61am__nobase_strip_setup = \
     62  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
     63am__nobase_strip = \
     64  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
     65am__nobase_list = $(am__nobase_strip_setup); \
     66  for p in $$list; do echo "$$p $$p"; done | \
     67  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
     68  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
     69    if (++n[$$2] == $(am__install_max)) \
     70      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
     71    END { for (dir in files) print dir, files[dir] }'
     72am__base_list = \
     73  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
     74  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
    5775am__installdirs = "$(DESTDIR)$(libdir)"
    58 libLTLIBRARIES_INSTALL = $(INSTALL)
    5976LTLIBRARIES = $(lib_LTLIBRARIES)
    6077libmod_gnutls_la_LIBADD =
     
    7087depcomp = $(SHELL) $(top_srcdir)/config/depcomp
    7188am__depfiles_maybe = depfiles
     89am__mv = mv -f
    7290COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
    7391        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
     
    171189PACKAGE_STRING = @PACKAGE_STRING@
    172190PACKAGE_TARNAME = @PACKAGE_TARNAME@
     191PACKAGE_URL = @PACKAGE_URL@
    173192PACKAGE_VERSION = @PACKAGE_VERSION@
    174193PATH_SEPARATOR = @PATH_SEPARATOR@
     
    256275          esac; \
    257276        done; \
    258         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
    259         cd $(top_srcdir) && \
    260           $(AUTOMAKE) --gnu  src/Makefile
     277        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
     278        $(am__cd) $(top_srcdir) && \
     279          $(AUTOMAKE) --gnu src/Makefile
    261280.PRECIOUS: Makefile
    262281Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
     
    276295$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
    277296        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
     297$(am__aclocal_m4_deps):
    278298install-libLTLIBRARIES: $(lib_LTLIBRARIES)
    279299        @$(NORMAL_INSTALL)
    280300        test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
    281         @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
     301        @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
     302        list2=; for p in $$list; do \
    282303          if test -f $$p; then \
    283             f=$(am__strip_dir) \
    284             echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
    285             $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
     304            list2="$$list2 $$p"; \
    286305          else :; fi; \
    287         done
     306        done; \
     307        test -z "$$list2" || { \
     308          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
     309          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
     310        }
    288311
    289312uninstall-libLTLIBRARIES:
    290313        @$(NORMAL_UNINSTALL)
    291         @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    292           p=$(am__strip_dir) \
    293           echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
    294           $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
     314        @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
     315        for p in $$list; do \
     316          $(am__strip_dir) \
     317          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
     318          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
    295319        done
    296320
     
    320344.c.o:
    321345@am__fastdepCC_TRUE@    $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
    322 @am__fastdepCC_TRUE@    mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
     346@am__fastdepCC_TRUE@    $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
    323347@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    324348@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     
    327351.c.obj:
    328352@am__fastdepCC_TRUE@    $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
    329 @am__fastdepCC_TRUE@    mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
     353@am__fastdepCC_TRUE@    $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
    330354@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    331355@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     
    334358.c.lo:
    335359@am__fastdepCC_TRUE@    $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
    336 @am__fastdepCC_TRUE@    mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
     360@am__fastdepCC_TRUE@    $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
    337361@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
    338362@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     
    340364
    341365libmod_gnutls_la-mod_gnutls.lo: mod_gnutls.c
    342 @am__fastdepCC_TRUE@    $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_gnutls_la_CFLAGS) $(CFLAGS) -MT libmod_gnutls_la-mod_gnutls.lo -MD -MP -MF $(DEPDIR)/libmod_gnutls_la-mod_gnutls.Tpo -c -o libmod_gnutls_la-mod_gnutls.lo `test -f 'mod_gnutls.c' || echo '$(srcdir)/'`mod_gnutls.c
    343 @am__fastdepCC_TRUE@    mv -f $(DEPDIR)/libmod_gnutls_la-mod_gnutls.Tpo $(DEPDIR)/libmod_gnutls_la-mod_gnutls.Plo
     366@am__fastdepCC_TRUE@    $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_gnutls_la_CFLAGS) $(CFLAGS) -MT libmod_gnutls_la-mod_gnutls.lo -MD -MP -MF $(DEPDIR)/libmod_gnutls_la-mod_gnutls.Tpo -c -o libmod_gnutls_la-mod_gnutls.lo `test -f 'mod_gnutls.c' || echo '$(srcdir)/'`mod_gnutls.c
     367@am__fastdepCC_TRUE@    $(am__mv) $(DEPDIR)/libmod_gnutls_la-mod_gnutls.Tpo $(DEPDIR)/libmod_gnutls_la-mod_gnutls.Plo
    344368@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='mod_gnutls.c' object='libmod_gnutls_la-mod_gnutls.lo' libtool=yes @AMDEPBACKSLASH@
    345369@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    346 @am__fastdepCC_FALSE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_gnutls_la_CFLAGS) $(CFLAGS) -c -o libmod_gnutls_la-mod_gnutls.lo `test -f 'mod_gnutls.c' || echo '$(srcdir)/'`mod_gnutls.c
     370@am__fastdepCC_FALSE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_gnutls_la_CFLAGS) $(CFLAGS) -c -o libmod_gnutls_la-mod_gnutls.lo `test -f 'mod_gnutls.c' || echo '$(srcdir)/'`mod_gnutls.c
    347371
    348372libmod_gnutls_la-gnutls_io.lo: gnutls_io.c
    349 @am__fastdepCC_TRUE@    $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_gnutls_la_CFLAGS) $(CFLAGS) -MT libmod_gnutls_la-gnutls_io.lo -MD -MP -MF $(DEPDIR)/libmod_gnutls_la-gnutls_io.Tpo -c -o libmod_gnutls_la-gnutls_io.lo `test -f 'gnutls_io.c' || echo '$(srcdir)/'`gnutls_io.c
    350 @am__fastdepCC_TRUE@    mv -f $(DEPDIR)/libmod_gnutls_la-gnutls_io.Tpo $(DEPDIR)/libmod_gnutls_la-gnutls_io.Plo
     373@am__fastdepCC_TRUE@    $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_gnutls_la_CFLAGS) $(CFLAGS) -MT libmod_gnutls_la-gnutls_io.lo -MD -MP -MF $(DEPDIR)/libmod_gnutls_la-gnutls_io.Tpo -c -o libmod_gnutls_la-gnutls_io.lo `test -f 'gnutls_io.c' || echo '$(srcdir)/'`gnutls_io.c
     374@am__fastdepCC_TRUE@    $(am__mv) $(DEPDIR)/libmod_gnutls_la-gnutls_io.Tpo $(DEPDIR)/libmod_gnutls_la-gnutls_io.Plo
    351375@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='gnutls_io.c' object='libmod_gnutls_la-gnutls_io.lo' libtool=yes @AMDEPBACKSLASH@
    352376@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    353 @am__fastdepCC_FALSE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_gnutls_la_CFLAGS) $(CFLAGS) -c -o libmod_gnutls_la-gnutls_io.lo `test -f 'gnutls_io.c' || echo '$(srcdir)/'`gnutls_io.c
     377@am__fastdepCC_FALSE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_gnutls_la_CFLAGS) $(CFLAGS) -c -o libmod_gnutls_la-gnutls_io.lo `test -f 'gnutls_io.c' || echo '$(srcdir)/'`gnutls_io.c
    354378
    355379libmod_gnutls_la-gnutls_cache.lo: gnutls_cache.c
    356 @am__fastdepCC_TRUE@    $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_gnutls_la_CFLAGS) $(CFLAGS) -MT libmod_gnutls_la-gnutls_cache.lo -MD -MP -MF $(DEPDIR)/libmod_gnutls_la-gnutls_cache.Tpo -c -o libmod_gnutls_la-gnutls_cache.lo `test -f 'gnutls_cache.c' || echo '$(srcdir)/'`gnutls_cache.c
    357 @am__fastdepCC_TRUE@    mv -f $(DEPDIR)/libmod_gnutls_la-gnutls_cache.Tpo $(DEPDIR)/libmod_gnutls_la-gnutls_cache.Plo
     380@am__fastdepCC_TRUE@    $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_gnutls_la_CFLAGS) $(CFLAGS) -MT libmod_gnutls_la-gnutls_cache.lo -MD -MP -MF $(DEPDIR)/libmod_gnutls_la-gnutls_cache.Tpo -c -o libmod_gnutls_la-gnutls_cache.lo `test -f 'gnutls_cache.c' || echo '$(srcdir)/'`gnutls_cache.c
     381@am__fastdepCC_TRUE@    $(am__mv) $(DEPDIR)/libmod_gnutls_la-gnutls_cache.Tpo $(DEPDIR)/libmod_gnutls_la-gnutls_cache.Plo
    358382@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='gnutls_cache.c' object='libmod_gnutls_la-gnutls_cache.lo' libtool=yes @AMDEPBACKSLASH@
    359383@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    360 @am__fastdepCC_FALSE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_gnutls_la_CFLAGS) $(CFLAGS) -c -o libmod_gnutls_la-gnutls_cache.lo `test -f 'gnutls_cache.c' || echo '$(srcdir)/'`gnutls_cache.c
     384@am__fastdepCC_FALSE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_gnutls_la_CFLAGS) $(CFLAGS) -c -o libmod_gnutls_la-gnutls_cache.lo `test -f 'gnutls_cache.c' || echo '$(srcdir)/'`gnutls_cache.c
    361385
    362386libmod_gnutls_la-gnutls_config.lo: gnutls_config.c
    363 @am__fastdepCC_TRUE@    $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_gnutls_la_CFLAGS) $(CFLAGS) -MT libmod_gnutls_la-gnutls_config.lo -MD -MP -MF $(DEPDIR)/libmod_gnutls_la-gnutls_config.Tpo -c -o libmod_gnutls_la-gnutls_config.lo `test -f 'gnutls_config.c' || echo '$(srcdir)/'`gnutls_config.c
    364 @am__fastdepCC_TRUE@    mv -f $(DEPDIR)/libmod_gnutls_la-gnutls_config.Tpo $(DEPDIR)/libmod_gnutls_la-gnutls_config.Plo
     387@am__fastdepCC_TRUE@    $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_gnutls_la_CFLAGS) $(CFLAGS) -MT libmod_gnutls_la-gnutls_config.lo -MD -MP -MF $(DEPDIR)/libmod_gnutls_la-gnutls_config.Tpo -c -o libmod_gnutls_la-gnutls_config.lo `test -f 'gnutls_config.c' || echo '$(srcdir)/'`gnutls_config.c
     388@am__fastdepCC_TRUE@    $(am__mv) $(DEPDIR)/libmod_gnutls_la-gnutls_config.Tpo $(DEPDIR)/libmod_gnutls_la-gnutls_config.Plo
    365389@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='gnutls_config.c' object='libmod_gnutls_la-gnutls_config.lo' libtool=yes @AMDEPBACKSLASH@
    366390@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    367 @am__fastdepCC_FALSE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_gnutls_la_CFLAGS) $(CFLAGS) -c -o libmod_gnutls_la-gnutls_config.lo `test -f 'gnutls_config.c' || echo '$(srcdir)/'`gnutls_config.c
     391@am__fastdepCC_FALSE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_gnutls_la_CFLAGS) $(CFLAGS) -c -o libmod_gnutls_la-gnutls_config.lo `test -f 'gnutls_config.c' || echo '$(srcdir)/'`gnutls_config.c
    368392
    369393libmod_gnutls_la-gnutls_hooks.lo: gnutls_hooks.c
    370 @am__fastdepCC_TRUE@    $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_gnutls_la_CFLAGS) $(CFLAGS) -MT libmod_gnutls_la-gnutls_hooks.lo -MD -MP -MF $(DEPDIR)/libmod_gnutls_la-gnutls_hooks.Tpo -c -o libmod_gnutls_la-gnutls_hooks.lo `test -f 'gnutls_hooks.c' || echo '$(srcdir)/'`gnutls_hooks.c
    371 @am__fastdepCC_TRUE@    mv -f $(DEPDIR)/libmod_gnutls_la-gnutls_hooks.Tpo $(DEPDIR)/libmod_gnutls_la-gnutls_hooks.Plo
     394@am__fastdepCC_TRUE@    $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_gnutls_la_CFLAGS) $(CFLAGS) -MT libmod_gnutls_la-gnutls_hooks.lo -MD -MP -MF $(DEPDIR)/libmod_gnutls_la-gnutls_hooks.Tpo -c -o libmod_gnutls_la-gnutls_hooks.lo `test -f 'gnutls_hooks.c' || echo '$(srcdir)/'`gnutls_hooks.c
     395@am__fastdepCC_TRUE@    $(am__mv) $(DEPDIR)/libmod_gnutls_la-gnutls_hooks.Tpo $(DEPDIR)/libmod_gnutls_la-gnutls_hooks.Plo
    372396@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='gnutls_hooks.c' object='libmod_gnutls_la-gnutls_hooks.lo' libtool=yes @AMDEPBACKSLASH@
    373397@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    374 @am__fastdepCC_FALSE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_gnutls_la_CFLAGS) $(CFLAGS) -c -o libmod_gnutls_la-gnutls_hooks.lo `test -f 'gnutls_hooks.c' || echo '$(srcdir)/'`gnutls_hooks.c
     398@am__fastdepCC_FALSE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_gnutls_la_CFLAGS) $(CFLAGS) -c -o libmod_gnutls_la-gnutls_hooks.lo `test -f 'gnutls_hooks.c' || echo '$(srcdir)/'`gnutls_hooks.c
    375399
    376400mostlyclean-libtool:
     
    392416TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
    393417                $(TAGS_FILES) $(LISP)
    394         tags=; \
     418        set x; \
    395419        here=`pwd`; \
    396420        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
     
    400424          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
    401425              END { if (nonempty) { for (i in files) print i; }; }'`; \
    402         if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
     426        shift; \
     427        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
    403428          test -n "$$unique" || unique=$$empty_fix; \
    404           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
    405             $$tags $$unique; \
     429          if test $$# -gt 0; then \
     430            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     431              "$$@" $$unique; \
     432          else \
     433            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     434              $$unique; \
     435          fi; \
    406436        fi
    407437ctags: CTAGS
    408438CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
    409439                $(TAGS_FILES) $(LISP)
    410         tags=; \
    411440        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
    412441        unique=`for i in $$list; do \
     
    415444          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
    416445              END { if (nonempty) { for (i in files) print i; }; }'`; \
    417         test -z "$(CTAGS_ARGS)$$tags$$unique" \
     446        test -z "$(CTAGS_ARGS)$$unique" \
    418447          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
    419              $$tags $$unique
     448             $$unique
    420449
    421450GTAGS:
    422451        here=`$(am__cd) $(top_builddir) && pwd` \
    423           && cd $(top_srcdir) \
    424           && gtags -i $(GTAGS_ARGS) $$here
     452          && $(am__cd) $(top_srcdir) \
     453          && gtags -i $(GTAGS_ARGS) "$$here"
    425454
    426455distclean-tags:
     
    443472          if test -d $$d/$$file; then \
    444473            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
     474            if test -d "$(distdir)/$$file"; then \
     475              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
     476            fi; \
    445477            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
    446               cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
     478              cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
     479              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
    447480            fi; \
    448             cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
     481            cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
    449482          else \
    450             test -f $(distdir)/$$file \
    451             || cp -p $$d/$$file $(distdir)/$$file \
     483            test -f "$(distdir)/$$file" \
     484            || cp -p $$d/$$file "$(distdir)/$$file" \
    452485            || exit 1; \
    453486          fi; \
     
    480513distclean-generic:
    481514        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
     515        -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
    482516
    483517maintainer-clean-generic:
     
    499533html: html-am
    500534
     535html-am:
     536
    501537info: info-am
    502538
     
    507543install-dvi: install-dvi-am
    508544
     545install-dvi-am:
     546
    509547install-exec-am: install-libLTLIBRARIES
    510548
    511549install-html: install-html-am
    512550
     551install-html-am:
     552
    513553install-info: install-info-am
    514554
     555install-info-am:
     556
    515557install-man:
    516558
    517559install-pdf: install-pdf-am
    518560
     561install-pdf-am:
     562
    519563install-ps: install-ps-am
     564
     565install-ps-am:
    520566
    521567installcheck-am:
     
    578624        @echo "***********************************************"
    579625        @echo ""
     626
    580627# Tell versions [3.59,3.63) of GNU make to not export all variables.
    581628# Otherwise a system limit (for SysV at least) may be exceeded.
  • src/gnutls_cache.c

    r52b649e r66b608e  
    3838#define MC_TAG_LEN sizeof(MC_TAG)
    3939#define STR_SESSION_LEN (GNUTLS_SESSION_ID_STRING_LEN + MC_TAG_LEN)
     40
     41#if MODULE_MAGIC_NUMBER_MAJOR < 20081201
     42#define ap_unixd_config unixd_config
     43#endif
    4044
    4145char *mgs_session_id2sz(unsigned char *id, int idlen,
     
    545549    /* Running as Root */
    546550    if (geteuid() == 0)  {
    547         chown(path1, unixd_config.user_id, -1);
     551        chown(path1, ap_unixd_config.user_id, -1);
    548552        if (path2 != NULL) {
    549             chown(path2, unixd_config.user_id, -1);
     553            chown(path2, ap_unixd_config.user_id, -1);
    550554        }
    551555    }
  • src/gnutls_hooks.c

    r52b649e r66b608e  
    124124
    125125    gnutls_certificate_server_set_request(session,
    126                                           ctxt->sc->client_verify_mode);
     126                                              ctxt->sc->client_verify_mode);
    127127
    128128    /* set the new server credentials
     
    751751
    752752#ifdef ENABLE_SRP
    753     apr_table_setn(env, "SSL_SRP_USER",
    754                    gnutls_srp_server_get_username(ctxt->session));
     753    tmp = gnutls_srp_server_get_username(ctxt->session);
     754    apr_table_setn(env, "SSL_SRP_USER", (tmp!=NULL)?tmp:"");
    755755#endif
    756756
     
    809809                          dc->client_verify_mode);
    810810
     811            /* If we already have a client certificate, there's no point in
     812             * re-handshaking... */
     813            rv = mgs_cert_verify(r, ctxt);
     814            if (rv != DECLINED && rv != HTTP_FORBIDDEN)
     815                return rv;
     816
    811817            gnutls_certificate_server_set_request(ctxt->session,
    812818                                                  dc->client_verify_mode);
     
    820826                          "GnuTLS: Peer is set to IGNORE");
    821827#endif
    822         } else {
    823             rv = mgs_cert_verify(r, ctxt);
    824             if (rv != DECLINED) {
    825                 return rv;
    826             }
     828            return DECLINED;
     829        }
     830        rv = mgs_cert_verify(r, ctxt);
     831        if (rv != DECLINED &&
     832            (rv != HTTP_FORBIDDEN ||
     833             dc->client_verify_mode == GNUTLS_CERT_REQUIRE)) {
     834            return rv;
    827835        }
    828836    }
     
    10211029    unsigned int cert_list_size, status, expired;
    10221030    int rv, ret;
     1031    unsigned int ch_size = 0;
    10231032    union {
    1024       gnutls_x509_crt_t x509;
     1033      gnutls_x509_crt_t x509[MAX_CHAIN_SIZE];
    10251034      gnutls_openpgp_crt_t pgp;
    10261035    } cert;
     
    10441053    }
    10451054
    1046     if (cert_list_size > 1) {
    1047         ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
     1055    if (gnutls_certificate_type_get( ctxt->session) == GNUTLS_CRT_X509) {
     1056        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
     1057            "GnuTLS: A Chain of %d certificate(s) was provided for validation", cert_list_size);
     1058
     1059        for (ch_size =0; ch_size<cert_list_size; ch_size++) {
     1060            gnutls_x509_crt_init(&cert.x509[ch_size]);
     1061            rv = gnutls_x509_crt_import(cert.x509[ch_size], &cert_list[ch_size], GNUTLS_X509_FMT_DER);
     1062            // When failure to import, leave the loop
     1063            if ( rv != GNUTLS_E_SUCCESS ) {
     1064                if (ch_size < 1) {
     1065                    ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
     1066                            "GnuTLS: Failed to Verify Peer: "
     1067                            "Failed to import peer certificates.");
     1068                    ret = HTTP_FORBIDDEN;
     1069                    goto exit;
     1070                }
     1071                ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
     1072                        "GnuTLS: Failed to import some peer certificates. Using %d certificates",
     1073                        ch_size);
     1074                rv = GNUTLS_E_SUCCESS;
     1075                break;
     1076            }
     1077        }
     1078    } else if (gnutls_certificate_type_get( ctxt->session) == GNUTLS_CRT_OPENPGP) {
     1079        if (cert_list_size > 1) {
     1080            ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
    10481081                      "GnuTLS: Failed to Verify Peer: "
    10491082                      "Chained Client Certificates are not supported.");
    1050         return HTTP_FORBIDDEN;
    1051     }
    1052 
    1053     if (gnutls_certificate_type_get( ctxt->session) == GNUTLS_CRT_X509) {
    1054         gnutls_x509_crt_init(&cert.x509);
    1055         rv = gnutls_x509_crt_import(cert.x509, &cert_list[0], GNUTLS_X509_FMT_DER);
    1056     } else if (gnutls_certificate_type_get( ctxt->session) == GNUTLS_CRT_OPENPGP) {
     1083            return HTTP_FORBIDDEN;
     1084        }
     1085
    10571086        gnutls_openpgp_crt_init(&cert.pgp);
    10581087        rv = gnutls_openpgp_crt_import(cert.pgp, &cert_list[0], GNUTLS_OPENPGP_FMT_RAW);
     1088
    10591089    } else return HTTP_FORBIDDEN;
    10601090 
     
    10691099    if (gnutls_certificate_type_get( ctxt->session) == GNUTLS_CRT_X509) {
    10701100        apr_time_ansi_put(&expiration_time,
    1071                       gnutls_x509_crt_get_expiration_time(cert.x509));
     1101                      gnutls_x509_crt_get_expiration_time(cert.x509[0]));
    10721102        apr_time_ansi_put(&activation_time,
    1073                       gnutls_x509_crt_get_activation_time(cert.x509));
    1074 
    1075         rv = gnutls_x509_crt_verify(cert.x509, ctxt->sc->ca_list,
    1076                                 ctxt->sc->ca_list_size, 0, &status);
     1103                      gnutls_x509_crt_get_activation_time(cert.x509[0]));
     1104
     1105        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
     1106            "GnuTLS: Verifying list of  %d certificate(s)", ch_size);
     1107        rv = gnutls_x509_crt_list_verify(cert.x509, ch_size,
     1108                ctxt->sc->ca_list, ctxt->sc->ca_list_size,
     1109                NULL, 0, 0, &status);
    10771110    } else {
    10781111        apr_time_ansi_put(&expiration_time,
     
    11101143    }
    11111144
    1112     if (expiration_time < cur_time) {
    1113         ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
     1145    if (gnutls_certificate_type_get( ctxt->session) != GNUTLS_CRT_OPENPGP || expiration_time != 0) {
     1146        if (expiration_time < cur_time) {
     1147            ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
    11141148                      "GnuTLS: Failed to Verify Peer: "
    11151149                      "Peer Certificate is expired.");
    1116         expired = 1;
     1150            expired = 1;
     1151        }
    11171152    }
    11181153
     
    11361171
    11371172    if (gnutls_certificate_type_get( ctxt->session) == GNUTLS_CRT_X509)
    1138         mgs_add_common_cert_vars(r, cert.x509, 1,
     1173        mgs_add_common_cert_vars(r, cert.x509[0], 1,
    11391174                             ctxt->sc->export_certificates_enabled);
    11401175    else if (gnutls_certificate_type_get( ctxt->session) == GNUTLS_CRT_OPENPGP)
     
    11631198
    11641199  exit:
    1165     if (gnutls_certificate_type_get( ctxt->session) == GNUTLS_CRT_X509)
    1166         gnutls_x509_crt_deinit(cert.x509);
    1167     else if (gnutls_certificate_type_get( ctxt->session) == GNUTLS_CRT_OPENPGP)
     1200    if (gnutls_certificate_type_get( ctxt->session) == GNUTLS_CRT_X509) {
     1201        int i;
     1202        for (i=0; i<ch_size; i++) {
     1203            gnutls_x509_crt_deinit(cert.x509[i]);
     1204        }
     1205    } else if (gnutls_certificate_type_get( ctxt->session) == GNUTLS_CRT_OPENPGP)
    11681206        gnutls_openpgp_crt_deinit(cert.pgp);
    11691207    return ret;
  • src/gnutls_io.c

    r52b649e r66b608e  
    369369        ret = gnutls_handshake(ctxt->session);
    370370        maxtries--;
    371     } while (ret == GNUTLS_E_AGAIN && maxtries > 0);
     371    } while ((ret == GNUTLS_E_INTERRUPTED || ret == GNUTLS_E_AGAIN) && maxtries > 0);
    372372
    373373    if (maxtries < 1) {
     
    380380                     "GnuTLS: Handshake Failed. Hit Maximum Attempts");
    381381#endif
    382         gnutls_alert_send(ctxt->session, GNUTLS_AL_FATAL,
    383                           gnutls_error_to_alert(ret, NULL));
    384         gnutls_deinit(ctxt->session);
     382        if (ctxt->session) {
     383            gnutls_alert_send(ctxt->session, GNUTLS_AL_FATAL,
     384                          gnutls_error_to_alert(GNUTLS_E_INTERNAL_ERROR, NULL));
     385            gnutls_deinit(ctxt->session);
     386        }
     387        ctxt->session = NULL;
    385388        return -1;
    386389    }
     
    411414#endif
    412415        ctxt->status = -1;
    413         gnutls_alert_send(ctxt->session, GNUTLS_AL_FATAL,
     416        if (ctxt->session) {
     417            gnutls_alert_send(ctxt->session, GNUTLS_AL_FATAL,
    414418                          gnutls_error_to_alert(ret, NULL));
    415         gnutls_deinit(ctxt->session);
     419            gnutls_deinit(ctxt->session);
     420        }
     421        ctxt->session = NULL;
    416422        return ret;
    417423    }
     
    542548    while (!APR_BRIGADE_EMPTY(bb)) {
    543549        apr_bucket *bucket = APR_BRIGADE_FIRST(bb);
    544         if (AP_BUCKET_IS_EOC(bucket)) {
    545             do {
    546                 ret = gnutls_bye( ctxt->session, GNUTLS_SHUT_WR);
    547             } while(ret == GNUTLS_E_INTERRUPTED || ret == GNUTLS_E_AGAIN);
     550       
     551        if (AP_BUCKET_IS_EOC(bucket) || APR_BUCKET_IS_EOS(bucket)) {
     552            apr_bucket_brigade * tmpb;
     553           
     554            if (APR_BUCKET_IS_EOS(bucket)) {
     555                tmpb = bb;
     556            } else {
     557                tmpb = ctxt->output_bb;
     558            }
     559           
     560            if (ctxt->session != NULL) {
     561                do {
     562                    ret = gnutls_bye( ctxt->session, GNUTLS_SHUT_WR);
     563                } while(ret == GNUTLS_E_INTERRUPTED || ret == GNUTLS_E_AGAIN);
     564            }
    548565
    549566            apr_bucket_copy(bucket, &e);
    550567            APR_BRIGADE_INSERT_TAIL(ctxt->output_bb, e);
    551568           
    552             if ((status = ap_pass_brigade(f->next, ctxt->output_bb)) != APR_SUCCESS) {
     569            if ((status = ap_pass_brigade(f->next, tmpb)) != APR_SUCCESS) {
    553570                apr_brigade_cleanup(ctxt->output_bb);
    554571                return status;
     
    556573
    557574            apr_brigade_cleanup(ctxt->output_bb);
    558             gnutls_deinit(ctxt->session);
     575            if (ctxt->session) {
     576                gnutls_deinit(ctxt->session);
     577                ctxt->session = NULL;
     578            }
    559579            continue;
    560 
    561         } else if (APR_BUCKET_IS_FLUSH(bucket) || APR_BUCKET_IS_EOS(bucket)) {
     580        } else if (APR_BUCKET_IS_FLUSH(bucket)) {
    562581
    563582            apr_bucket_copy(bucket, &e);
     
    652671        if (APR_STATUS_IS_EAGAIN(rc) || APR_STATUS_IS_EINTR(rc)
    653672            || (rc == APR_SUCCESS && APR_BRIGADE_EMPTY(ctxt->input_bb))) {
    654             return 0;
    655         }
     673           
     674            if (APR_STATUS_IS_EOF(ctxt->input_rc)) {
     675                return 0;
     676            } else {
     677                gnutls_transport_set_errno(ctxt->session, EINTR);
     678                return -1;
     679            }
     680        }
     681       
    656682
    657683        if (rc != APR_SUCCESS) {
     
    671697    if (APR_STATUS_IS_EAGAIN(ctxt->input_rc)
    672698        || APR_STATUS_IS_EINTR(ctxt->input_rc)) {
     699        if (len == 0) {
     700            gnutls_transport_set_errno(ctxt->session, EINTR);
     701            return -1;
     702        }
     703
    673704        return (ssize_t) len;
    674705    }
Note: See TracChangeset for help on using the changeset viewer.