rpms/vsftpd
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- rebuilt with new openssl

Browse Source
This commit is contained in:
Tomáš Mráz 2009-08-22 18:43:51 +00:00
parent 0ca5bb290d
commit 5aab3039e5
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
vsftpd-2.2.0-openssl.patch Normal file
View File

@ -0,0 +1,15 @@
diff -up vsftpd-2.2.0/ssl.c.openssl vsftpd-2.2.0/ssl.c
--- vsftpd-2.2.0/ssl.c.openssl 2009-01-09 21:47:05.000000000 +0100
+++ vsftpd-2.2.0/ssl.c 2009-08-22 20:41:58.000000000 +0200
@@ -537,7 +537,11 @@ get_ssl(struct vsf_session* p_sess, int
if (tunable_debug_ssl)
{
const char* p_ssl_version = SSL_get_cipher_version(p_ssl);
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+ const SSL_CIPHER* p_ssl_cipher = SSL_get_current_cipher(p_ssl);
+#else
SSL_CIPHER* p_ssl_cipher = SSL_get_current_cipher(p_ssl);
+#endif
const char* p_cipher_name = SSL_CIPHER_get_name(p_ssl_cipher);
X509* p_ssl_cert = SSL_get_peer_certificate(p_ssl);
int reused = SSL_session_reused(p_ssl);

4
vsftpd.spec
View File

@ -48,6 +48,7 @@ Patch9: vsftpd-2.1.0-userlist_log.patch
Patch10: vsftpd-2.1.0-trim.patch
Patch12: vsftpd-2.1.1-daemonize_plus.patch
Patch13: vsftpd-2.2.0-openssl.patch
%description
vsftpd is a Very Secure FTP daemon. It was written completely from
@ -71,6 +72,7 @@ cp %{SOURCE1} .
%patch9 -p1 -b .userlist_log
%patch10 -p1 -b .trim
%patch12 -p1 -b .daemonize_plus
%patch13 -p1 -b .openssl
%build
%ifarch s390x sparcv9 sparc64
@ -135,7 +137,7 @@ fi
%changelog
* Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 2.2.0-0.2.pre4
* Sat Aug 22 2009 Tomas Mraz <tmraz@redhat.com> - 2.2.0-0.2.pre4
- rebuilt with new openssl
* Tue Aug 04 2009 Martin Nagy <mnagy@redhat.com> - 2.2.0-0.1.pre4