diff options
| author | djm <> | 2005-04-29 05:39:33 +0000 |
|---|---|---|
| committer | djm <> | 2005-04-29 05:39:33 +0000 |
| commit | 68edd00d9258df93b1366c71ac124e0cadf7bc08 (patch) | |
| tree | 3ce4ae2a9747bbc11aed1f95f9bbea92c41f8683 /src/lib/libcrypto/sha/shatest.c | |
| parent | f396ed0f5ce0af56bfde2e75e15cf1f52924c779 (diff) | |
| download | openbsd-68edd00d9258df93b1366c71ac124e0cadf7bc08.tar.gz openbsd-68edd00d9258df93b1366c71ac124e0cadf7bc08.tar.bz2 openbsd-68edd00d9258df93b1366c71ac124e0cadf7bc08.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/sha/shatest.c')
| -rw-r--r-- | src/lib/libcrypto/sha/shatest.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/sha/shatest.c b/src/lib/libcrypto/sha/shatest.c index 5d2b1d3b1a..ff702aa53e 100644 --- a/src/lib/libcrypto/sha/shatest.c +++ b/src/lib/libcrypto/sha/shatest.c | |||
| @@ -62,10 +62,10 @@ | |||
| 62 | 62 | ||
| 63 | #include "../e_os.h" | 63 | #include "../e_os.h" |
| 64 | 64 | ||
| 65 | #ifdef OPENSSL_NO_SHA | 65 | #if defined(OPENSSL_NO_SHA) || defined(OPENSSL_NO_SHA0) |
| 66 | int main(int argc, char *argv[]) | 66 | int main(int argc, char *argv[]) |
| 67 | { | 67 | { |
| 68 | printf("No SHA support\n"); | 68 | printf("No SHA0 support\n"); |
| 69 | return(0); | 69 | return(0); |
| 70 | } | 70 | } |
| 71 | #else | 71 | #else |