summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2003-12-09 19:05:42 +1100
committerDarren Tucker <dtucker@zip.com.au>2003-12-09 19:05:42 +1100
commit37afa9d9a463a45b0d8ac62c577deac95bc79c2b (patch)
treeb8e701dcef137ceb442c6cf57ee4c5c6994bbfa7
parent4c56843e44a7dfa10bce91a2440eaac0d918124e (diff)
- djm@cvs.openbsd.org 2003/11/26 21:44:29
[cipher-aes.c] fix #ifdef before #define; ok markus@ (RCS ID sync only, Portable already had this)
-rw-r--r--ChangeLog6
-rw-r--r--cipher-aes.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9f3835558..545e5c382 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
3 - matthieu@cvs.openbsd.org 2003/11/25 23:10:08 3 - matthieu@cvs.openbsd.org 2003/11/25 23:10:08
4 [ssh-add.1] 4 [ssh-add.1]
5 ssh-add doesn't need to be a descendant of ssh-agent. Ok markus@, jmc@. 5 ssh-add doesn't need to be a descendant of ssh-agent. Ok markus@, jmc@.
6 - djm@cvs.openbsd.org 2003/11/26 21:44:29
7 [cipher-aes.c]
8 fix #ifdef before #define; ok markus@
9 (RCS ID sync only, Portable already had this)
6 10
720031208 1120031208
8 - (tim) [configure.ac] Bug 770. Fix --without-rpath. 12 - (tim) [configure.ac] Bug 770. Fix --without-rpath.
@@ -1541,4 +1545,4 @@
1541 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1545 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1542 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1546 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1543 1547
1544$Id: ChangeLog,v 1.3132 2003/12/09 08:01:51 dtucker Exp $ 1548$Id: ChangeLog,v 1.3133 2003/12/09 08:05:42 dtucker Exp $
diff --git a/cipher-aes.c b/cipher-aes.c
index 7ba950191..22d500d42 100644
--- a/cipher-aes.c
+++ b/cipher-aes.c
@@ -24,7 +24,7 @@
24 24
25#include "includes.h" 25#include "includes.h"
26#if OPENSSL_VERSION_NUMBER < 0x00907000L 26#if OPENSSL_VERSION_NUMBER < 0x00907000L
27RCSID("$OpenBSD: cipher-aes.c,v 1.1 2003/05/15 03:08:29 markus Exp $"); 27RCSID("$OpenBSD: cipher-aes.c,v 1.2 2003/11/26 21:44:29 djm Exp $");
28 28
29#include <openssl/evp.h> 29#include <openssl/evp.h>
30#include "rijndael.h" 30#include "rijndael.h"