projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DSO_load() should also work when it is passed a NULL - a new DSO is created
[oweals/openssl.git]
/
crypto
/
pem
/
pem_seal.c
diff --git
a/crypto/pem/pem_seal.c
b/crypto/pem/pem_seal.c
index 5f5d2c0e43ddada4212f3b10843e23e763624583..2a6c5133481afeea02762f983ace99ed1cb96bf1 100644
(file)
--- a/
crypto/pem/pem_seal.c
+++ b/
crypto/pem/pem_seal.c
@@
-56,6
+56,7
@@
* [including the GNU Public Licence.]
*/
* [including the GNU Public Licence.]
*/
+#ifndef NO_RSA
#include <stdio.h>
#include "cryptlib.h"
#include <openssl/evp.h>
#include <stdio.h>
#include "cryptlib.h"
#include <openssl/evp.h>
@@
-83,7
+84,7
@@
int PEM_SealInit(PEM_ENCODE_SEAL_CTX *ctx, EVP_CIPHER *type, EVP_MD *md_type,
j=RSA_size(pubk[i]->pkey.rsa);
if (j > max) max=j;
}
j=RSA_size(pubk[i]->pkey.rsa);
if (j > max) max=j;
}
- s=(char *)
M
alloc(max*2);
+ s=(char *)
OPENSSL_m
alloc(max*2);
if (s == NULL)
{
PEMerr(PEM_F_PEM_SEALINIT,ERR_R_MALLOC_FAILURE);
if (s == NULL)
{
PEMerr(PEM_F_PEM_SEALINIT,ERR_R_MALLOC_FAILURE);
@@
-107,7
+108,7
@@
int PEM_SealInit(PEM_ENCODE_SEAL_CTX *ctx, EVP_CIPHER *type, EVP_MD *md_type,
ret=npubk;
err:
ret=npubk;
err:
- if (s != NULL)
F
ree(s);
+ if (s != NULL)
OPENSSL_f
ree(s);
memset(key,0,EVP_MAX_KEY_LENGTH);
return(ret);
}
memset(key,0,EVP_MAX_KEY_LENGTH);
return(ret);
}
@@
-150,7
+151,7
@@
int PEM_SealFinal(PEM_ENCODE_SEAL_CTX *ctx, unsigned char *sig, int *sigl,
}
i=RSA_size(priv->pkey.rsa);
if (i < 100) i=100;
}
i=RSA_size(priv->pkey.rsa);
if (i < 100) i=100;
- s=(unsigned char *)
M
alloc(i*2);
+ s=(unsigned char *)
OPENSSL_m
alloc(i*2);
if (s == NULL)
{
PEMerr(PEM_F_PEM_SEALFINAL,ERR_R_MALLOC_FAILURE);
if (s == NULL)
{
PEMerr(PEM_F_PEM_SEALFINAL,ERR_R_MALLOC_FAILURE);
@@
-171,6
+172,13
@@
int PEM_SealFinal(PEM_ENCODE_SEAL_CTX *ctx, unsigned char *sig, int *sigl,
err:
memset((char *)&(ctx->md),0,sizeof(ctx->md));
memset((char *)&(ctx->cipher),0,sizeof(ctx->cipher));
err:
memset((char *)&(ctx->md),0,sizeof(ctx->md));
memset((char *)&(ctx->cipher),0,sizeof(ctx->cipher));
- if (s != NULL)
F
ree(s);
+ if (s != NULL)
OPENSSL_f
ree(s);
return(ret);
}
return(ret);
}
+#else /* !NO_RSA */
+
+# if PEDANTIC
+static void *dummy=&dummy;
+# endif
+
+#endif