Inconsisten declaration of ssh_aes_ctr_iv()

[Damien Miller]

On Mon, 14 Jan 2013, Iain Morgan wrote:

> Hi,
> 
> The 20130110 snapshot fails to build against OpenSSL 0.9.8 and 1.0.0
> with the following error:
...

Try this:

Index: cipher-aes.c
===================================================================
RCS file: /var/cvs/openssh/cipher-aes.c,v
retrieving revision 1.9
diff -u -p -r1.9 cipher-aes.c
--- cipher-aes.c	7 Oct 2010 11:06:42 -0000	1.9
+++ cipher-aes.c	14 Jan 2013 21:14:23 -0000
@@ -46,9 +46,6 @@ struct ssh_rijndael_ctx
 	u_char		r_iv[RIJNDAEL_BLOCKSIZE];
 };
 
-const EVP_CIPHER * evp_rijndael(void);
-void ssh_rijndael_iv(EVP_CIPHER_CTX *, int, u_char *, u_int);
-
 static int
 ssh_rijndael_init(EVP_CIPHER_CTX *ctx, const u_char *key, const u_char *iv,
     int enc)
Index: cipher-ctr.c
===================================================================
RCS file: /var/cvs/openssh/cipher-ctr.c,v
retrieving revision 1.16
diff -u -p -r1.16 cipher-ctr.c
--- cipher-ctr.c	12 Dec 2012 21:18:56 -0000	1.16
+++ cipher-ctr.c	14 Jan 2013 21:13:03 -0000
@@ -34,9 +34,6 @@
 #include <openssl/aes.h>
 #endif
 
-const EVP_CIPHER *evp_aes_128_ctr(void);
-void ssh_aes_ctr_iv(EVP_CIPHER_CTX *, int, u_char *, size_t);
-
 struct ssh_aes_ctr_ctx
 {
 	AES_KEY		aes_ctx;
Index: openbsd-compat/openssl-compat.h
===================================================================
RCS file: /var/cvs/openssh/openbsd-compat/openssl-compat.h,v
retrieving revision 1.21
diff -u -p -r1.21 openssl-compat.h
--- openbsd-compat/openssl-compat.h	9 Jan 2013 05:42:49 -0000	1.21
+++ openbsd-compat/openssl-compat.h	14 Jan 2013 21:14:34 -0000
@@ -59,16 +59,16 @@
 # define EVP_aes_128_cbc evp_rijndael
 # define EVP_aes_192_cbc evp_rijndael
 # define EVP_aes_256_cbc evp_rijndael
-extern const EVP_CIPHER *evp_rijndael(void);
-extern void ssh_rijndael_iv(EVP_CIPHER_CTX *, int, u_char *, u_int);
+const EVP_CIPHER *evp_rijndael(void);
+void ssh_rijndael_iv(EVP_CIPHER_CTX *, int, u_char *, u_int);
 #endif
 
 #ifndef OPENSSL_HAVE_EVPCTR
 #define EVP_aes_128_ctr evp_aes_128_ctr
 #define EVP_aes_192_ctr evp_aes_128_ctr
 #define EVP_aes_256_ctr evp_aes_128_ctr
-extern const EVP_CIPHER *evp_aes_128_ctr(void);
-extern void ssh_aes_ctr_iv(EVP_CIPHER_CTX *, int, u_char *, u_int);
+const EVP_CIPHER *evp_aes_128_ctr(void);
+void ssh_aes_ctr_iv(EVP_CIPHER_CTX *, int, u_char *, size_t);
 #endif
 
 /* Avoid some #ifdef. Code that uses these is unreachable without GCM */