projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Redirect clone digests to FIPS module for FIPS builds.
[oweals/openssl.git]
/
crypto
/
evp
/
m_dss.c
diff --git
a/crypto/evp/m_dss.c
b/crypto/evp/m_dss.c
index f50b35b07239c0e0427302c127d4f843e601e7e8..192a29884fc62675e45fda0fa913f2444b415aa3 100644
(file)
--- a/
crypto/evp/m_dss.c
+++ b/
crypto/evp/m_dss.c
@@
-61,12
+61,22
@@
#include <openssl/evp.h>
#include <openssl/objects.h>
#include <openssl/x509.h>
#include <openssl/evp.h>
#include <openssl/objects.h>
#include <openssl/x509.h>
+#ifndef OPENSSL_NO_DSA
+#include <openssl/dsa.h>
+#endif
#ifndef OPENSSL_NO_SHA
#ifndef OPENSSL_NO_SHA
+#ifdef OPENSSL_FIPS
+#include <openssl/fips.h>
+
+const EVP_MD *EVP_dss(void) { return FIPS_evp_dss(); }
+
+#else
+
static int init(EVP_MD_CTX *ctx)
{ return SHA1_Init(ctx->md_data); }
static int init(EVP_MD_CTX *ctx)
{ return SHA1_Init(ctx->md_data); }
-static int update(EVP_MD_CTX *ctx,const void *data,
unsigned long
count)
+static int update(EVP_MD_CTX *ctx,const void *data,
size_t
count)
{ return SHA1_Update(ctx->md_data,data,count); }
static int final(EVP_MD_CTX *ctx,unsigned char *md)
{ return SHA1_Update(ctx->md_data,data,count); }
static int final(EVP_MD_CTX *ctx,unsigned char *md)
@@
-77,11
+87,12
@@
static const EVP_MD dsa_md=
NID_dsaWithSHA,
NID_dsaWithSHA,
SHA_DIGEST_LENGTH,
NID_dsaWithSHA,
NID_dsaWithSHA,
SHA_DIGEST_LENGTH,
-
0
,
+
EVP_MD_FLAG_PKEY_DIGEST
,
init,
update,
final,
NULL,
init,
update,
final,
NULL,
+ NULL,
EVP_PKEY_DSA_method,
SHA_CBLOCK,
sizeof(EVP_MD *)+sizeof(SHA_CTX),
EVP_PKEY_DSA_method,
SHA_CBLOCK,
sizeof(EVP_MD *)+sizeof(SHA_CTX),
@@
-92,3
+103,4
@@
const EVP_MD *EVP_dss(void)
return(&dsa_md);
}
#endif
return(&dsa_md);
}
#endif
+#endif