#include <stdio.h>
#include "cryptlib.h"
-#include "objects.h"
-#include "evp.h"
+#include <openssl/objects.h>
+#include <openssl/evp.h>
-void EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type)
+void EVP_MD_CTX_init(EVP_MD_CTX *ctx)
{
- ctx->digest=type;
- type->init(&(ctx->md));
+ memset(ctx,'\0',sizeof *ctx);
}
-void EVP_DigestUpdate(EVP_MD_CTX *ctx, const unsigned char *data,
+EVP_MD_CTX *EVP_MD_CTX_create(void)
+ {
+ EVP_MD_CTX *ctx=OPENSSL_malloc(sizeof *ctx);
+
+ EVP_MD_CTX_init(ctx);
+
+ return ctx;
+ }
+
+#ifdef CRYPTO_MDEBUG
+int EVP_DigestInit_dbg(EVP_MD_CTX *ctx, const EVP_MD *type,const char *file,
+ int line)
+#else
+int EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type)
+#endif
+ {
+ if(ctx->digest != type)
+ {
+ OPENSSL_free(ctx->md_data);
+ ctx->digest=type;
+#ifdef CRYPTO_MDEBUG
+ ctx->md_data=CRYPTO_malloc(type->ctx_size,file,line);
+#else
+ ctx->md_data=OPENSSL_malloc(type->ctx_size);
+#endif
+ }
+ return type->init(ctx->md_data);
+ }
+
+int EVP_DigestUpdate(EVP_MD_CTX *ctx, const void *data,
unsigned int count)
{
- ctx->digest->update(&(ctx->md.base[0]),data,(unsigned long)count);
+ return ctx->digest->update(ctx->md_data,data,(unsigned long)count);
}
-void EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md, unsigned int *size)
+/* The caller can assume that this removes any secret data from the context */
+int EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md, unsigned int *size)
{
- ctx->digest->final(md,&(ctx->md.base[0]));
+ int ret;
+ ret=ctx->digest->final(md,ctx->md_data);
if (size != NULL)
*size=ctx->digest->md_size;
- memset(&(ctx->md),0,sizeof(ctx->md));
+ /* FIXME: add a cleanup function to the ctx? */
+ memset(ctx->md_data,0,ctx->digest->ctx_size);
+ return ret;
}
-int EVP_MD_CTX_copy(EVP_MD_CTX *out, EVP_MD_CTX *in)
+int EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in)
{
if ((in == NULL) || (in->digest == NULL)) {
EVPerr(EVP_F_EVP_MD_CTX_COPY,EVP_R_INPUT_NOT_INITIALIZED);
return 0;
}
- memcpy((char *)out,(char *)in,in->digest->ctx_size);
+ EVP_MD_CTX_cleanup(out);
+ memcpy(out,in,sizeof *out);
+ out->md_data=OPENSSL_malloc(out->digest->ctx_size);
+ /* FIXME: we really need a per-MD copy function */
+ memcpy(out->md_data,in->md_data,out->digest->ctx_size);
return 1;
-}
+}
+
+int EVP_Digest(void *data, unsigned int count,
+ unsigned char *md, unsigned int *size, const EVP_MD *type)
+{
+ EVP_MD_CTX ctx;
+ int ret;
+
+ EVP_MD_CTX_init(&ctx);
+ ret=EVP_DigestInit(&ctx, type)
+ && EVP_DigestUpdate(&ctx, data, count)
+ && EVP_DigestFinal(&ctx, md, size);
+ EVP_MD_CTX_cleanup(&ctx);
+
+ return ret;
+}
+
+void EVP_MD_CTX_destroy(EVP_MD_CTX *ctx)
+ {
+ EVP_MD_CTX_cleanup(ctx);
+ OPENSSL_free(ctx);
+ }
+
+/* This call frees resources associated with the context */
+int EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx)
+ {
+ /* Don't assume ctx->md_data was cleaned in EVP_Digest_Final,
+ * because sometimes only copies of the context are ever finalised.
+ */
+ if(ctx->md_data)
+ memset(ctx->md_data,0,ctx->digest->ctx_size);
+
+ OPENSSL_free(ctx->md_data);
+ memset(ctx,'\0',sizeof *ctx);
+
+ return 1;
+ }