Changeset b072204 in mod_gnutls

Timestamp:

Mar 3, 2008, 9:04:01 AM (15 years ago)

Author:

Nokis Mavrogiannopoulos <nmav@…>

Branches:

asyncio, debian/master, debian/stretch-backports, jessie-backports, main, master, msva, proxy-ticket, upstream

Children:

fc4c2e47

Parents:

b333517

git-author:

Nikos Mavrogiannopoulos <nmav@…> (03/03/08 09:04:01)

git-committer:

Nokis Mavrogiannopoulos <nmav@…> (03/03/08 09:04:01)

Message:

corrected SRP enable flag, and corrected the DBM hook support. It now free data needed by some DBM providers.

Files:

• autogen.sh (modified) (2 diffs)
• configure.ac (modified) (3 diffs)
• src/gnutls_cache.c (modified) (4 diffs)
• src/mod_gnutls.c (modified) (1 diff)

autogen.sh

@@ -1 +1 @@
 #!/bin/sh
 
-if [ -z $ACLOCAL ]; then
-        ACLOCAL=aclocal
-fi
-if [ -z $AUTOCONF ]; then 
-        AUTOCONF=autoconf
-fi
-if [ -z $AUTOHEADER ]; then
-        AUTOHEADER=autoheader
-fi
 if [ -z $AUTORECONF ]; then
         AUTORECONF=autoreconf
@@ -15 +6 @@
 
 #rm -rf autom4te.cache
-$AUTORECONF -f -i
+$AUTORECONF -f -v -i
 #touch stamp-h.in
 
-for x in providers/*; do
-        if [ -e $x/autogen.sh ]; then
-                echo Generating Config files in $x
-                (cd $x; ./autogen.sh $*)
-        fi
-done

configure.ac

@@ -42 +42 @@
                [unconditionally disable the SRP functionality]),
        use_srp=$enableval, use_srp=yes)
+
+SRP_CFLAGS=""
 if test "$use_srp" != "no"; then
-        AC_DEFINE_UNQUOTED(ENABLE_SRP, 1, [whether to enable SRP])
+        SRP_CFLAGS="-DENABLE_SRP=1"
 fi
 AC_MSG_CHECKING([whether to enable SRP functionality])
@@ -54 +56 @@
 AC_SUBST(have_apr_memcache)
 
-MODULE_CFLAGS="${LIBGNUTLS_EXTRA_CFLAGS} ${APR_MEMCACHE_CFLAGS} ${APXS_CFLAGS} ${AP_INCLUDES} ${APR_INCLUDES} ${APU_INCLUDES}"
+MODULE_CFLAGS="${LIBGNUTLS_EXTRA_CFLAGS} ${SRP_CFLAGS} ${APR_MEMCACHE_CFLAGS} ${APXS_CFLAGS} ${AP_INCLUDES} ${APR_INCLUDES} ${APU_INCLUDES}"
 MODULE_LIBS="${APR_MEMCACHE_LIBS} ${LIBGNUTLS_EXTRA_LIBS}"
 
@@ -69 +71 @@
 echo "   * Apache Modules directory:    ${AP_LIBEXECDIR}"
 echo "   * GnuTLS Library version:      ${LIBGNUTLS_VERSION}"
+echo "   * SRP Authentication:          ${use_srp}"
 echo ""
 echo "---"

src/gnutls_cache.c

@@ -1 +1 @@
 /**
  *  Copyright 2004-2005 Paul Querna
+ *  Portions Copyright 2008 Nikos Mavrogiannopoulos
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -346 +347 @@
                 }
             }
+            apr_dbm_freedatum( dbm, dbmval);
             
         }
@@ -402 +404 @@
 
     if (dbmval.dptr == NULL || dbmval.dsize <= sizeof(apr_time_t)) {
+        apr_dbm_freedatum( dbm, dbmval);
         apr_dbm_close(dbm);
         return data;
     }
-    apr_dbm_close(dbm);
 
     data.size = dbmval.dsize - sizeof(apr_time_t);
@@ -411 +413 @@
     data.data = gnutls_malloc(data.size);
     if (data.data == NULL) {
+        apr_dbm_freedatum( dbm, dbmval);
+        apr_dbm_close(dbm);
         return data;
     }
     
     memcpy(data.data, dbmval.dptr+sizeof(apr_time_t), data.size);
+
+    apr_dbm_freedatum( dbm, dbmval);
+    apr_dbm_close(dbm);
 
     return data;

src/mod_gnutls.c

@@ -17 +17 @@
 
 #include "mod_gnutls.h"
-
 
 static void gnutls_hooks(apr_pool_t * p)