projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make "make depend" work on MacOS out of the box.
[openssl.git]
/
crypto
/
evp
/
m_dss1.c
diff --git
a/crypto/evp/m_dss1.c
b/crypto/evp/m_dss1.c
index be27d63da05946568690317fa571b210284a2fe9..5216ffd977795a2824337bb4b7184a215673f499 100644
(file)
--- a/
crypto/evp/m_dss1.c
+++ b/
crypto/evp/m_dss1.c
@@
-56,17
+56,22
@@
* [including the GNU Public Licence.]
*/
* [including the GNU Public Licence.]
*/
-#ifndef OPENSSL_NO_SHA
#include <stdio.h>
#include "cryptlib.h"
#include <stdio.h>
#include "cryptlib.h"
+
+#ifndef OPENSSL_NO_SHA
+
#include <openssl/evp.h>
#include <openssl/objects.h>
#include <openssl/evp.h>
#include <openssl/objects.h>
-#include <openssl/x509.h>
+#include <openssl/sha.h>
+#ifndef OPENSSL_NO_DSA
+#include <openssl/dsa.h>
+#endif
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,12
+82,13
@@
static const EVP_MD dss1_md=
NID_dsa,
NID_dsaWithSHA1,
SHA_DIGEST_LENGTH,
NID_dsa,
NID_dsaWithSHA1,
SHA_DIGEST_LENGTH,
-
0
,
+
EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_PKEY_DIGEST|EVP_MD_FLAG_FIPS
,
init,
update,
final,
NULL,
init,
update,
final,
NULL,
- EVP_PKEY_DSA_method,
+ NULL,
+ EVP_PKEY_NULL_method,
SHA_CBLOCK,
sizeof(EVP_MD *)+sizeof(SHA_CTX),
};
SHA_CBLOCK,
sizeof(EVP_MD *)+sizeof(SHA_CTX),
};