diff options
| author | marha <marha@users.sourceforge.net> | 2012-04-10 11:54:31 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-04-10 11:54:31 +0200 |
| commit | 5564e91e3cf4ba5cb2fbebbc2d63d18f588016b8 (patch) | |
| tree | c800a66664ea3af61eb13928db45a26275930b0b /openssl/crypto/evp/m_ecdsa.c | |
| parent | d79e641dea89c0d5d651b11971c4c9e14df34629 (diff) | |
| parent | 67326634496ef21b4acbf4cef2f05040d34aef9b (diff) | |
| download | vcxsrv-5564e91e3cf4ba5cb2fbebbc2d63d18f588016b8.tar.gz vcxsrv-5564e91e3cf4ba5cb2fbebbc2d63d18f588016b8.tar.bz2 vcxsrv-5564e91e3cf4ba5cb2fbebbc2d63d18f588016b8.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
openssl/Configure
openssl/Makefile
openssl/crypto/opensslconf.h
openssl/util/mk1mf.pl
openssl/util/pl/VC-32.pl
Diffstat (limited to 'openssl/crypto/evp/m_ecdsa.c')
| -rw-r--r-- | openssl/crypto/evp/m_ecdsa.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/openssl/crypto/evp/m_ecdsa.c b/openssl/crypto/evp/m_ecdsa.c index 8d87a49eb..4b15fb0f6 100644 --- a/openssl/crypto/evp/m_ecdsa.c +++ b/openssl/crypto/evp/m_ecdsa.c @@ -116,6 +116,8 @@ #include <openssl/x509.h> #ifndef OPENSSL_NO_SHA +#ifndef OPENSSL_FIPS + static int init(EVP_MD_CTX *ctx) { return SHA1_Init(ctx->md_data); } @@ -146,3 +148,4 @@ const EVP_MD *EVP_ecdsa(void) return(&ecdsa_md); } #endif +#endif |