rpms/httpd/devel httpd-2.0.54-openssl-098.patch,1.1,1.2

[fedora-cvs-commits at redhat.com]

Author: tmraz

Update of /cvs/dist/rpms/httpd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21472

Modified Files:
	httpd-2.0.54-openssl-098.patch 
Log Message:
- one more place where PEM_F_DEF_CALLBACK is used


httpd-2.0.54-openssl-098.patch:
 ssl_engine_pphrase.c |    8 ++++++++
 1 files changed, 8 insertions(+)

Index: httpd-2.0.54-openssl-098.patch
===================================================================
RCS file: /cvs/dist/rpms/httpd/devel/httpd-2.0.54-openssl-098.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- httpd-2.0.54-openssl-098.patch	9 Nov 2005 11:40:33 -0000	1.1
+++ httpd-2.0.54-openssl-098.patch	9 Nov 2005 12:50:54 -0000	1.2
@@ -1,5 +1,5 @@
---- httpd-2.0.54/modules/ssl/ssl_engine_pphrase.c.openssl-098	2005-11-04 17:52:43.000000000 +0100
-+++ httpd-2.0.54/modules/ssl/ssl_engine_pphrase.c	2005-11-09 12:39:46.000000000 +0100
+--- httpd-2.0.54/modules/ssl/ssl_engine_pphrase.c.openssl-098	2005-11-09 13:44:16.000000000 +0100
++++ httpd-2.0.54/modules/ssl/ssl_engine_pphrase.c	2005-11-09 13:49:27.000000000 +0100
 @@ -681,7 +681,11 @@
                      ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
                                   "Init: Failed to create pass phrase pipe '%s'",
@@ -12,3 +12,15 @@
                      memset(buf, 0, (unsigned int)bufsize);
                      return (-1);
                  }
+@@ -742,7 +746,11 @@
+                 i = EVP_read_pw_string(buf, bufsize, "", FALSE); 
+             }  
+             if (i != 0) {
++#ifdef PEM_F_DEF_CALLBACK
+                 PEMerr(PEM_F_DEF_CALLBACK,PEM_R_PROBLEMS_GETTING_PASSWORD);
++#else
++                PEMerr(PEM_F_PEM_DEF_CALLBACK,PEM_R_PROBLEMS_GETTING_PASSWORD);
++#endif
+                 memset(buf, 0, (unsigned int)bufsize);
+                 return (-1);
+             }