summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-06-02 18:57:59 +1000
committerDamien Miller <djm@mindrot.org>2003-06-02 18:57:59 +1000
commitdcc8312a197384167ddf55741090b7bddf92d34e (patch)
treef471066737df58e4fe7dfecf6f885489f1046c36
parentdba59508205febc2f0dbf5e1cc9c3f9268af2f70 (diff)
- (djm) Fix use of macro before #define in cipher-aes.c
-rw-r--r--ChangeLog3
-rw-r--r--cipher-aes.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f17eb361f..3d9c4e734 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
6 CVS ID. 6 CVS ID.
7 - (djm) Remove "noip6" option from RedHat spec file. This may now be 7 - (djm) Remove "noip6" option from RedHat spec file. This may now be
8 set at runtime using AddressFamily option. 8 set at runtime using AddressFamily option.
9 - (djm) Fix use of macro before #define in cipher-aes.c
9 10
1020030530 1120030530
11 - (dtucker) Add missing semicolon in md5crypt.c, patch from openssh at 12 - (dtucker) Add missing semicolon in md5crypt.c, patch from openssh at
@@ -1632,4 +1633,4 @@
1632 save auth method before monitor_reset_key_state(); bugzilla bug #284; 1633 save auth method before monitor_reset_key_state(); bugzilla bug #284;
1633 ok provos@ 1634 ok provos@
1634 1635
1635$Id: ChangeLog,v 1.2758 2003/06/02 07:43:19 djm Exp $ 1636$Id: ChangeLog,v 1.2759 2003/06/02 08:57:59 djm Exp $
diff --git a/cipher-aes.c b/cipher-aes.c
index bbfbe7210..c41def600 100644
--- a/cipher-aes.c
+++ b/cipher-aes.c
@@ -22,8 +22,8 @@
22 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 22 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23 */ 23 */
24 24
25#if OPENSSL_VERSION_NUMBER < 0x00907000L
26#include "includes.h" 25#include "includes.h"
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.1 2003/05/15 03:08:29 markus Exp $");
28 28
29#include <openssl/evp.h> 29#include <openssl/evp.h>
@@ -153,4 +153,4 @@ evp_rijndael(void)
153#endif 153#endif
154 return (&rijndal_cbc); 154 return (&rijndal_cbc);
155} 155}
156#endif 156#endif /* OPENSSL_VERSION_NUMBER */