From 3db2ff02b9142db6e3b78b26d4bd4f7d3e42920c Mon Sep 17 00:00:00 2001 From: Joey Schulze Date: Thu, 15 May 2008 10:59:12 +0000 Subject: [PATCH] Forward ported patch from Andi to Apache 2.x --- debian/patches/010-enctype-apache.dpatch | 29 ++++++++++++++---------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/debian/patches/010-enctype-apache.dpatch b/debian/patches/010-enctype-apache.dpatch index 86b1149..62e7875 100644 --- a/debian/patches/010-enctype-apache.dpatch +++ b/debian/patches/010-enctype-apache.dpatch @@ -1,14 +1,15 @@ #! /bin/sh /usr/share/dpatch/dpatch-run ## 010-enctype-apache.dpatch by Andreas Barth +## Joey Schulze ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Provide an Apache authentication method @DPATCH@ diff -urNad mod-auth-mysql~/DIRECTIVES mod-auth-mysql/DIRECTIVES ---- mod-auth-mysql~/DIRECTIVES 2008-05-14 16:59:28.000000000 +0200 -+++ mod-auth-mysql/DIRECTIVES 2008-05-15 09:49:06.000000000 +0200 -@@ -203,6 +203,10 @@ +--- mod-auth-mysql~/DIRECTIVES 2008-05-15 12:55:28.000000000 +0200 ++++ mod-auth-mysql/DIRECTIVES 2008-05-15 12:55:29.000000000 +0200 +@@ -194,6 +194,10 @@ MySQL The hashing scheme used by the MySQL PASSWORD() function. @@ -17,32 +18,36 @@ diff -urNad mod-auth-mysql~/DIRECTIVES mod-auth-mysql/DIRECTIVES + The hashing scheme used by htpasswd utility. Compatible to + authuserfile. - AuthMySQL_Encryption_Types - Synonym for Auth_MySQL_Encryption_Types. + Auth_MySQL_Encrypted_Passwords (DEPRECATED) + Equivalent to: Auth_MySQL_Encryption_Types Crypt_DES diff -urNad mod-auth-mysql~/mod_auth_mysql.c mod-auth-mysql/mod_auth_mysql.c ---- mod-auth-mysql~/mod_auth_mysql.c 2008-05-14 18:46:21.000000000 +0200 -+++ mod-auth-mysql/mod_auth_mysql.c 2008-05-15 09:49:06.000000000 +0200 -@@ -102,6 +102,7 @@ +--- mod-auth-mysql~/mod_auth_mysql.c 2008-05-15 12:55:28.000000000 +0200 ++++ mod-auth-mysql/mod_auth_mysql.c 2008-05-15 12:56:28.000000000 +0200 +@@ -103,6 +103,7 @@ #define CRYPT_ENCRYPTION_FLAG 1<<5 #endif #define SHA1SUM_ENCRYPTION_FLAG 1<<6 +#define APACHE_ENCRYPTION_FLAG 1<<7 - static int check_no_encryption(const char *passwd, char *enc_passwd) - { -@@ -235,6 +236,11 @@ + /* from include/sha1.h from the mysql-server source distribution */ + #define SHA1_HASH_SIZE 20 /* Hash size in bytes */ +@@ -239,6 +240,15 @@ return (!strcmp(scrambled_passwd, enc_passwd)); } +static int check_apache_encryption(const char *passwd, char *enc_passwd) +{ ++#ifdef APACHE2 ++ return (!apr_password_validate(passwd, enc_passwd)); ++#else + return (!ap_validate_password(passwd, enc_passwd)); ++#endif +} + typedef struct { char *name; int (*check_function)(const char *passwd, char *enc_passwd); -@@ -253,6 +259,7 @@ +@@ -257,6 +267,7 @@ { "Crypt", check_crypt_encryption, CRYPT_ENCRYPTION_FLAG }, { "PHP_MD5", check_PHP_MD5_encryption, PHP_MD5_ENCRYPTION_FLAG }, { "SHA1Sum", check_SHA1Sum_encryption, SHA1SUM_ENCRYPTION_FLAG}, -- 2.20.1