diff options
| author | djm <> | 2008-09-06 12:17:54 +0000 |
|---|---|---|
| committer | djm <> | 2008-09-06 12:17:54 +0000 |
| commit | 38ce604e3cc97706b876b0525ddff0121115456d (patch) | |
| tree | 7ccc28afe1789ea3dbedf72365f955d5b8e105b5 /src/lib/libcrypto/sha/sha_dgst.c | |
| parent | 12867252827c8efaa8ddd1fa3b3d6e321e2bcdef (diff) | |
| download | openbsd-38ce604e3cc97706b876b0525ddff0121115456d.tar.gz openbsd-38ce604e3cc97706b876b0525ddff0121115456d.tar.bz2 openbsd-38ce604e3cc97706b876b0525ddff0121115456d.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/sha/sha_dgst.c')
| -rw-r--r-- | src/lib/libcrypto/sha/sha_dgst.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/libcrypto/sha/sha_dgst.c b/src/lib/libcrypto/sha/sha_dgst.c index 5a4b3ab204..70eb56032c 100644 --- a/src/lib/libcrypto/sha/sha_dgst.c +++ b/src/lib/libcrypto/sha/sha_dgst.c | |||
| @@ -56,6 +56,7 @@ | |||
| 56 | * [including the GNU Public Licence.] | 56 | * [including the GNU Public Licence.] |
| 57 | */ | 57 | */ |
| 58 | 58 | ||
| 59 | #include <openssl/opensslconf.h> | ||
| 59 | #if !defined(OPENSSL_NO_SHA0) && !defined(OPENSSL_NO_SHA) | 60 | #if !defined(OPENSSL_NO_SHA0) && !defined(OPENSSL_NO_SHA) |
| 60 | 61 | ||
| 61 | #undef SHA_1 | 62 | #undef SHA_1 |
| @@ -63,7 +64,7 @@ | |||
| 63 | 64 | ||
| 64 | #include <openssl/opensslv.h> | 65 | #include <openssl/opensslv.h> |
| 65 | 66 | ||
| 66 | const char *SHA_version="SHA" OPENSSL_VERSION_PTEXT; | 67 | const char SHA_version[]="SHA" OPENSSL_VERSION_PTEXT; |
| 67 | 68 | ||
| 68 | /* The implementation is in ../md32_common.h */ | 69 | /* The implementation is in ../md32_common.h */ |
| 69 | 70 | ||