evp: prevent underflow in base64 decoding

[openssl.git] / crypto / evp / m_dss.c

diff --git a/crypto/evp/m_dss.c b/crypto/evp/m_dss.c
index c4c5f0bbe691f71fe9ff0d9b05489c5ebc68aa93..6fb7e9a8610517cba6ef88677ff4f0c8eb285dab 100644 (file)
--- a/crypto/evp/m_dss.c
+++ b/crypto/evp/m_dss.c
@@ -60,14 +60,18 @@
 #include "cryptlib.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
 
 #ifndef OPENSSL_NO_SHA
+#ifndef OPENSSL_FIPS
+
 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)
@@ -78,7 +82,7 @@ static const EVP_MD dsa_md=
        NID_dsaWithSHA,
        NID_dsaWithSHA,
        SHA_DIGEST_LENGTH,
-       0,
+       EVP_MD_FLAG_PKEY_DIGEST,
        init,
        update,
        final,
@@ -94,3 +98,4 @@ const EVP_MD *EVP_dss(void)
        return(&dsa_md);
        }
 #endif
+#endif