From 435859e8753cbac89e3aa985b41d4ebb84457ee3 Mon Sep 17 00:00:00 2001 From: Eric Covener Date: Sat, 24 Oct 2015 23:37:10 +0000 Subject: block bcrypt on EBCDIC -- lots of ascii-isms in apr-util's bcrypt. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1710403 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 6 ++++++ support/passwd_common.h | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/CHANGES b/CHANGES index 028249ea59..3886ba01b6 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,12 @@ -*- coding: utf-8 -*- Changes with Apache 2.5.0 + *) htpasswd/htdigest: Disable support for bcrypt on EBCDIC platforms. + apr-util's bcrypt implementation doesn't tolerate EBCDIC. + + *) core: Make PR57785 REDIRECT_URL fix opt-in with directive + QualifyRedirectURL. [Eric Covener] + *) core: add ap_get_protocol_upgrades() to retrieve the list of protocols that a client could possibly upgrade to. Use in first request on a connection to announce protocol choices. diff --git a/support/passwd_common.h b/support/passwd_common.h index 01d5652024..660081e908 100644 --- a/support/passwd_common.h +++ b/support/passwd_common.h @@ -66,6 +66,11 @@ #define BCRYPT_ALGO_SUPPORTED 0 #endif +#if APR_CHARSET_EBCDIC +#undef BCRYPT_ALGO_SUPPORTED +#define BCRYPT_ALGO_SUPPORTED 0 +#endif + /* * Must be initialized with apr_file_open_stderr() before using any of the * below functions. -- cgit v1.2.3