diff options
| author | djm <> | 2009-01-09 12:15:52 +0000 |
|---|---|---|
| committer | djm <> | 2009-01-09 12:15:52 +0000 |
| commit | 23f8d96f0f508b8bef2602049feee9c44228d34c (patch) | |
| tree | a2a7787bc00e8f6a29153b8c6d9eb5e8f73d6269 /src/lib/libcrypto/evp/m_dss.c | |
| parent | 30562050421d947c3eb3c10edde6e87730b17471 (diff) | |
| download | openbsd-23f8d96f0f508b8bef2602049feee9c44228d34c.tar.gz openbsd-23f8d96f0f508b8bef2602049feee9c44228d34c.tar.bz2 openbsd-23f8d96f0f508b8bef2602049feee9c44228d34c.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/evp/m_dss.c')
| -rw-r--r-- | src/lib/libcrypto/evp/m_dss.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/libcrypto/evp/m_dss.c b/src/lib/libcrypto/evp/m_dss.c index a948c77fa4..6b0c0aa7a3 100644 --- a/src/lib/libcrypto/evp/m_dss.c +++ b/src/lib/libcrypto/evp/m_dss.c | |||
| @@ -81,7 +81,7 @@ static const EVP_MD dsa_md= | |||
| 81 | NID_dsaWithSHA, | 81 | NID_dsaWithSHA, |
| 82 | NID_dsaWithSHA, | 82 | NID_dsaWithSHA, |
| 83 | SHA_DIGEST_LENGTH, | 83 | SHA_DIGEST_LENGTH, |
| 84 | 0, | 84 | EVP_MD_FLAG_FIPS, |
| 85 | init, | 85 | init, |
| 86 | update, | 86 | update, |
| 87 | final, | 87 | final, |