diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | openbsd-compat/sha2.h | 6 |
2 files changed, 6 insertions, 4 deletions
@@ -252,6 +252,8 @@ | |||
252 | - (djm) [md-sha256.c configure.ac] md-sha256.c needs sha2.h if present | 252 | - (djm) [md-sha256.c configure.ac] md-sha256.c needs sha2.h if present |
253 | - (djm) [regress/.cvsignore] Ignore Makefile here | 253 | - (djm) [regress/.cvsignore] Ignore Makefile here |
254 | - (djm) [loginrec.c] Need stat.h | 254 | - (djm) [loginrec.c] Need stat.h |
255 | - (djm) [openbsd-compat/sha2.h] Avoid include macro clash with | ||
256 | system sha2.h | ||
255 | 257 | ||
256 | 20060313 | 258 | 20060313 |
257 | - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) | 259 | - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) |
@@ -4153,4 +4155,4 @@ | |||
4153 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 4155 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
4154 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 4156 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
4155 | 4157 | ||
4156 | $Id: ChangeLog,v 1.4213 2006/03/15 03:01:11 djm Exp $ | 4158 | $Id: ChangeLog,v 1.4214 2006/03/15 03:02:01 djm Exp $ |
diff --git a/openbsd-compat/sha2.h b/openbsd-compat/sha2.h index fb40bde43..5e2641c4b 100644 --- a/openbsd-compat/sha2.h +++ b/openbsd-compat/sha2.h | |||
@@ -36,8 +36,8 @@ | |||
36 | 36 | ||
37 | /* OPENBSD ORIGINAL: include/sha2.h */ | 37 | /* OPENBSD ORIGINAL: include/sha2.h */ |
38 | 38 | ||
39 | #ifndef _SHA2_H | 39 | #ifndef _SSHSHA2_H |
40 | #define _SHA2_H | 40 | #define _SSHSHA2_H |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | 43 | ||
@@ -122,4 +122,4 @@ char *SHA512_Data(const u_int8_t *, size_t, char *) | |||
122 | 122 | ||
123 | #endif /* !defined(HAVE_SHA256_UPDATE) && !defined(HAVE_EVP_SHA256) */ | 123 | #endif /* !defined(HAVE_SHA256_UPDATE) && !defined(HAVE_EVP_SHA256) */ |
124 | 124 | ||
125 | #endif /* _SHA2_H */ | 125 | #endif /* _SSHSHA2_H */ |