You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
48 lines
2.2 KiB
48 lines
2.2 KiB
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
|
|
#
|
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
|
# Please add additional copyright information _after_ the line containing
|
|
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
|
|
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
|
|
#
|
|
# ROCK Linux: rock-src/package/base/apache/openssl.patch
|
|
# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
|
|
#
|
|
# This patch file is dual-licensed. It is available under the license the
|
|
# patched project is licensed under, as long as it is an OpenSource license
|
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
|
# of the GNU General Public License as published by the Free Software
|
|
# Foundation; either version 2 of the License, or (at your option) any later
|
|
# version.
|
|
#
|
|
# --- ROCK-COPYRIGHT-NOTE-END ---
|
|
|
|
--- ./modules/ssl/ssl_engine_pphrase.c.orig 2005-07-18 14:47:47.000000000 +0200
|
|
+++ ./modules/ssl/ssl_engine_pphrase.c 2005-07-18 14:48:13.000000000 +0200
|
|
@@ -681,7 +681,7 @@
|
|
ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
|
|
"Init: Failed to create pass phrase pipe '%s'",
|
|
sc->server->pphrase_dialog_path);
|
|
- PEMerr(PEM_F_DEF_CALLBACK,PEM_R_PROBLEMS_GETTING_PASSWORD);
|
|
+ PEMerr(PEM_F_PEM_DEF_CALLBACK,PEM_R_PROBLEMS_GETTING_PASSWORD);
|
|
memset(buf, 0, (unsigned int)bufsize);
|
|
return (-1);
|
|
}
|
|
@@ -691,7 +691,7 @@
|
|
}
|
|
else { /* sc->server->pphrase_dialog_type == SSL_PPTYPE_BUILTIN */
|
|
#ifdef WIN32
|
|
- PEMerr(PEM_F_DEF_CALLBACK,PEM_R_PROBLEMS_GETTING_PASSWORD);
|
|
+ PEMerr(PEM_F_PEM_DEF_CALLBACK,PEM_R_PROBLEMS_GETTING_PASSWORD);
|
|
memset(buf, 0, (unsigned int)bufsize);
|
|
return (-1);
|
|
#else
|
|
@@ -742,7 +742,7 @@
|
|
i = EVP_read_pw_string(buf, bufsize, "", FALSE);
|
|
}
|
|
if (i != 0) {
|
|
- PEMerr(PEM_F_DEF_CALLBACK,PEM_R_PROBLEMS_GETTING_PASSWORD);
|
|
+ PEMerr(PEM_F_PEM_DEF_CALLBACK,PEM_R_PROBLEMS_GETTING_PASSWORD);
|
|
memset(buf, 0, (unsigned int)bufsize);
|
|
return (-1);
|
|
}
|