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/md2 | |
| 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/md2')
| -rw-r--r-- | openssl/crypto/md2/md2.h | 3 | ||||
| -rw-r--r-- | openssl/crypto/md2/md2_dgst.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/openssl/crypto/md2/md2.h b/openssl/crypto/md2/md2.h index a46120e7d..d59c9f259 100644 --- a/openssl/crypto/md2/md2.h +++ b/openssl/crypto/md2/md2.h @@ -81,6 +81,9 @@ typedef struct MD2state_st } MD2_CTX; const char *MD2_options(void); +#ifdef OPENSSL_FIPS +int private_MD2_Init(MD2_CTX *c); +#endif int MD2_Init(MD2_CTX *c); int MD2_Update(MD2_CTX *c, const unsigned char *data, size_t len); int MD2_Final(unsigned char *md, MD2_CTX *c); diff --git a/openssl/crypto/md2/md2_dgst.c b/openssl/crypto/md2/md2_dgst.c index c57b3da28..bf89def73 100644 --- a/openssl/crypto/md2/md2_dgst.c +++ b/openssl/crypto/md2/md2_dgst.c @@ -116,7 +116,7 @@ const char *MD2_options(void) return("md2(int)"); } -int MD2_Init(MD2_CTX *c) +fips_md_init(MD2) { c->num=0; memset(c->state,0,sizeof c->state); |