[prev in list] [next in list] [prev in thread] [next in thread] 

List:       proftpd-committers
Subject:    [ProFTPD-committers] proftpd/contrib/mod_sftp crypto.c,1.27,1.28
From:       TJ Saunders <castaglia () users ! sourceforge ! net>
Date:       2013-03-15 2:35:54
Message-ID: E1UGKUu-0007uv-9j () sfs-ml-2 ! v29 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Update of /cvsroot/proftp/proftpd/contrib/mod_sftp
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17656/contrib/mod_sftp

Modified Files:
	crypto.c 
Log Message:

Quell compiler warnings (Bug#3919) caused by changes in callback signatures
between OpenSSL-0.9.x and OpenSSL-1.0.x.  Since the latter now has ABI
compatibility rules, it will become more widespread, and thus we will change
our callbacks to match the newer signatures.  This will cause compiler
warnings about mismatched signatures for older OpenSSL installations, but that
is the price of keeping up to date.


Index: crypto.c
===================================================================
RCS file: /cvsroot/proftp/proftpd/contrib/mod_sftp/crypto.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- crypto.c	10 Dec 2012 23:01:18 -0000	1.27
+++ crypto.c	15 Mar 2013 02:35:52 -0000	1.28
@@ -1,6 +1,6 @@
 /*
  * ProFTPD - mod_sftp OpenSSL interface
- * Copyright (c) 2008-2012 TJ Saunders
+ * Copyright (c) 2008-2013 TJ Saunders
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -232,7 +232,7 @@
 }
 
 static int do_bf_ctr(EVP_CIPHER_CTX *ctx, unsigned char *dst,
-    const unsigned char *src, unsigned int len) {
+    const unsigned char *src, size_t len) {
   struct bf_ctr_ex *bce;
   unsigned int n;
   unsigned char buf[BF_BLOCK];
@@ -386,7 +386,7 @@
 }
 
 static int do_des3_ctr(EVP_CIPHER_CTX *ctx, unsigned char *dst,
-    const unsigned char *src, unsigned int len) {
+    const unsigned char *src, size_t len) {
   struct des3_ctr_ex *dce;
   unsigned int n;
   unsigned char buf[8];
@@ -522,7 +522,7 @@
 }
 
 static int do_aes_ctr(EVP_CIPHER_CTX *ctx, unsigned char *dst,
-    const unsigned char *src, unsigned int len) {
+    const unsigned char *src, size_t len) {
   struct aes_ctr_ex *ace;
 # if OPENSSL_VERSION_NUMBER <= 0x0090704fL
   unsigned int n;


------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_mar
_______________________________________________
ProFTPD Committers Mailing List
proftpd-committers@proftpd.org
https://lists.sourceforge.net/lists/listinfo/proftp-committers
[prev in list] [next in list] [prev in thread] [next in thread]