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/evp/m_sha1.c | |
| parent | f396ed0f5ce0af56bfde2e75e15cf1f52924c779 (diff) | |
| download | openbsd-68edd00d9258df93b1366c71ac124e0cadf7bc08.tar.gz openbsd-68edd00d9258df93b1366c71ac124e0cadf7bc08.tar.bz2 openbsd-68edd00d9258df93b1366c71ac124e0cadf7bc08.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/evp/m_sha1.c')
| -rw-r--r-- | src/lib/libcrypto/evp/m_sha1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/libcrypto/evp/m_sha1.c b/src/lib/libcrypto/evp/m_sha1.c index d6be3502f0..fe4402389a 100644 --- a/src/lib/libcrypto/evp/m_sha1.c +++ b/src/lib/libcrypto/evp/m_sha1.c | |||
| @@ -77,7 +77,7 @@ static const EVP_MD sha1_md= | |||
| 77 | NID_sha1, | 77 | NID_sha1, |
| 78 | NID_sha1WithRSAEncryption, | 78 | NID_sha1WithRSAEncryption, |
| 79 | SHA_DIGEST_LENGTH, | 79 | SHA_DIGEST_LENGTH, |
| 80 | 0, | 80 | EVP_MD_FLAG_FIPS, |
| 81 | init, | 81 | init, |
| 82 | update, | 82 | update, |
| 83 | final, | 83 | final, |