summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2012-12-13 08:25:07 +1100
committerDamien Miller <djm@mindrot.org>2012-12-13 08:25:07 +1100
commit13cbff1e009c2a1f786e5d84bf78099c70949bf0 (patch)
treeaaaabb467e972c0e011ef5cffd3ca0231fb236c9
parent25a02b0c95e01bc331267a1db0f62d3cbd7a0897 (diff)
- (djm) [cipher.c] Fix missing prototype for compat code
-rw-r--r--ChangeLog1
-rw-r--r--cipher.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 2c6da413f..16a6489e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@
11 counter mode code; ok djm@ 11 counter mode code; ok djm@
12 - (djm) [configure.ac cipher-ctr.c] Adapt EVP AES CTR change to retain our 12 - (djm) [configure.ac cipher-ctr.c] Adapt EVP AES CTR change to retain our
13 compat code for older OpenSSL 13 compat code for older OpenSSL
14 - (djm) [cipher.c] Fix missing prototype for compat code
14 15
1520121212 1620121212
16 - (djm) OpenBSD CVS Sync 17 - (djm) OpenBSD CVS Sync
diff --git a/cipher.c b/cipher.c
index d15c226ae..aae69c347 100644
--- a/cipher.c
+++ b/cipher.c
@@ -58,6 +58,7 @@ extern void ssh1_3des_iv(EVP_CIPHER_CTX *, int, u_char *, int);
58#define EVP_aes_128_ctr evp_aes_128_ctr 58#define EVP_aes_128_ctr evp_aes_128_ctr
59#define EVP_aes_192_ctr evp_aes_128_ctr 59#define EVP_aes_192_ctr evp_aes_128_ctr
60#define EVP_aes_256_ctr evp_aes_128_ctr 60#define EVP_aes_256_ctr evp_aes_128_ctr
61extern const EVP_CIPHER *evp_aes_128_ctr(void);
61extern void ssh_aes_ctr_iv(EVP_CIPHER_CTX *, int, u_char *, u_int); 62extern void ssh_aes_ctr_iv(EVP_CIPHER_CTX *, int, u_char *, u_int);
62#endif 63#endif
63 64