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)
downloadopenssh-git-dcc8312a197384167ddf55741090b7bddf92d34e.tar.gz
- (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 f17eb361..3d9c4e73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
CVS ID.
- (djm) Remove "noip6" option from RedHat spec file. This may now be
set at runtime using AddressFamily option.
+ - (djm) Fix use of macro before #define in cipher-aes.c
20030530
- (dtucker) Add missing semicolon in md5crypt.c, patch from openssh at
@@ -1632,4 +1633,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@
-$Id: ChangeLog,v 1.2758 2003/06/02 07:43:19 djm Exp $
+$Id: ChangeLog,v 1.2759 2003/06/02 08:57:59 djm Exp $
diff --git a/cipher-aes.c b/cipher-aes.c
index bbfbe721..c41def60 100644
--- a/cipher-aes.c
+++ b/cipher-aes.c
@@ -22,8 +22,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if OPENSSL_VERSION_NUMBER < 0x00907000L
#include "includes.h"
+#if OPENSSL_VERSION_NUMBER < 0x00907000L
RCSID("$OpenBSD: cipher-aes.c,v 1.1 2003/05/15 03:08:29 markus Exp $");
#include <openssl/evp.h>
@@ -153,4 +153,4 @@ evp_rijndael(void)
#endif
return (&rijndal_cbc);
}
-#endif
+#endif /* OPENSSL_VERSION_NUMBER */