transparently handle X9.42 DH parameters

[openssl.git] / crypto / pem / pem_sign.c

diff --git a/crypto/pem/pem_sign.c b/crypto/pem/pem_sign.c
index 0df99a3d84e981f9ddffe2c6266186c7f8f5447a..80fb6e71ba8aac33e35175c70fa23fa1501cbcde 100644 (file)
--- a/crypto/pem/pem_sign.c
+++ b/crypto/pem/pem_sign.c
@@ -1,5 +1,5 @@
 /* crypto/pem/pem_sign.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
@@ -58,38 +58,31 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "rand.h"
-#include "evp.h"
-#include "objects.h"
-#include "x509.h"
-#include "pem.h"
+#include <openssl/rand.h>
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
 
-void PEM_SignInit(ctx,type)
-EVP_MD_CTX *ctx;
-EVP_MD *type;
+int PEM_SignInit(EVP_MD_CTX *ctx, EVP_MD *type)
        {
-       EVP_DigestInit(ctx,type);
+       return EVP_DigestInit_ex(ctx, type, NULL);
        }
 
-void PEM_SignUpdate(ctx,data,count)
-EVP_MD_CTX *ctx;
-unsigned char *data;
-unsigned int count;
+int PEM_SignUpdate(EVP_MD_CTX *ctx, unsigned char *data,
+            unsigned int count)
        {
-       EVP_DigestUpdate(ctx,data,count);
+       return EVP_DigestUpdate(ctx,data,count);
        }
 
-int PEM_SignFinal(ctx,sigret,siglen,pkey)
-EVP_MD_CTX *ctx;
-unsigned char *sigret;
-unsigned int *siglen;
-EVP_PKEY *pkey;
+int PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, unsigned int *siglen,
+            EVP_PKEY *pkey)
        {
        unsigned char *m;
        int i,ret=0;
        unsigned int m_len;
 
-       m=(unsigned char *)Malloc(EVP_PKEY_size(pkey)+2);
+       m=(unsigned char *)OPENSSL_malloc(EVP_PKEY_size(pkey)+2);
        if (m == NULL)
                {
                PEMerr(PEM_F_PEM_SIGNFINAL,ERR_R_MALLOC_FAILURE);
@@ -103,7 +96,7 @@ EVP_PKEY *pkey;
        ret=1;
 err:
        /* ctx has been zeroed by EVP_SignFinal() */
-       if (m != NULL) Free(m);
+       if (m != NULL) OPENSSL_free(m);
        return(ret);
        }