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 e370758574873e3a46a89335cc1f44eaaa3de380..80fb6e71ba8aac33e35175c70fa23fa1501cbcde 100644 (file)
--- a/crypto/pem/pem_sign.c
+++ b/crypto/pem/pem_sign.c
@@ -58,21 +58,21 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
 
 #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(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(EVP_MD_CTX *ctx, unsigned char *data,
+int PEM_SignUpdate(EVP_MD_CTX *ctx, unsigned char *data,

             unsigned int count)
        {
             unsigned int count)
        {

-       EVP_DigestUpdate(ctx,data,count);
+       return EVP_DigestUpdate(ctx,data,count);

        }
 
 int PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, unsigned int *siglen,
        }
 
 int PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, unsigned int *siglen,


@@ -82,7 +82,7 @@ int PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, unsigned int *siglen,
        int i,ret=0;
        unsigned int m_len;
 
        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);
        if (m == NULL)
                {
                PEMerr(PEM_F_PEM_SIGNFINAL,ERR_R_MALLOC_FAILURE);


@@ -96,7 +96,7 @@ int PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, unsigned int *siglen,
        ret=1;
 err:
        /* ctx has been zeroed by EVP_SignFinal() */
        ret=1;
 err:
        /* ctx has been zeroed by EVP_SignFinal() */

-       if (m != NULL) Free(m);
+       if (m != NULL) OPENSSL_free(m);

        return(ret);
        }
 
        return(ret);
        }