projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove trailing '\'
[oweals/openssl.git]
/
crypto
/
pem
/
pem_sign.c
diff --git
a/crypto/pem/pem_sign.c
b/crypto/pem/pem_sign.c
index d56f9f9e147864554bd085769d74cdc68037050d..c3b9808cb20475016329bf3578b74be8bc156afe 100644
(file)
--- a/
crypto/pem/pem_sign.c
+++ b/
crypto/pem/pem_sign.c
@@
-58,38
+58,31
@@
#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(ctx,type)
-EVP_MD_CTX *ctx;
-EVP_MD *type;
+void PEM_SignInit(EVP_MD_CTX *ctx, EVP_MD *type)
{
{
- EVP_DigestInit
(ctx,type
);
+ EVP_DigestInit
_ex(ctx, type, NULL
);
}
}
-void PEM_SignUpdate(ctx,data,count)
-EVP_MD_CTX *ctx;
-unsigned char *data;
-unsigned int count;
+void PEM_SignUpdate(EVP_MD_CTX *ctx, unsigned char *data,
+ unsigned int count)
{
EVP_DigestUpdate(ctx,data,count);
}
{
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;
{
unsigned char *m;
int i,ret=0;
unsigned int m_len;
- m=(unsigned char *)
M
alloc(EVP_PKEY_size(pkey)+2);
+ m=(unsigned char *)
OPENSSL_m
alloc(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);
@@
-103,7
+96,7
@@
EVP_PKEY *pkey;
ret=1;
err:
/* ctx has been zeroed by EVP_SignFinal() */
ret=1;
err:
/* ctx has been zeroed by EVP_SignFinal() */
- if (m != NULL)
F
ree(m);
+ if (m != NULL)
OPENSSL_f
ree(m);
return(ret);
}
return(ret);
}