projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add RFC 3779 support, contributed by ARIN.
[oweals/openssl.git]
/
crypto
/
asn1
/
f_string.c
diff --git
a/crypto/asn1/f_string.c
b/crypto/asn1/f_string.c
index e6e9b9d5e2911242b1b1ad8273e7ccbd94e8e8a7..968698a79887744ac35c194f78b0c09071cddf00 100644
(file)
--- a/
crypto/asn1/f_string.c
+++ b/
crypto/asn1/f_string.c
@@
-59,7
+59,7
@@
#include <stdio.h>
#include "cryptlib.h"
#include <openssl/buffer.h>
#include <stdio.h>
#include "cryptlib.h"
#include <openssl/buffer.h>
-#include <openssl/
x509
.h>
+#include <openssl/
asn1
.h>
int i2a_ASN1_STRING(BIO *bp, ASN1_STRING *a, int type)
{
int i2a_ASN1_STRING(BIO *bp, ASN1_STRING *a, int type)
{
@@
-158,15
+158,15
@@
int a2i_ASN1_STRING(BIO *bp, ASN1_STRING *bs, char *buf, int size)
if (num+i > slen)
{
if (s == NULL)
if (num+i > slen)
{
if (s == NULL)
- sp=(unsigned char *)
M
alloc(
+ sp=(unsigned char *)
OPENSSL_m
alloc(
(unsigned int)num+i*2);
else
(unsigned int)num+i*2);
else
- sp=(unsigned char *)
R
ealloc(s,
+ sp=(unsigned char *)
OPENSSL_r
ealloc(s,
(unsigned int)num+i*2);
if (sp == NULL)
{
ASN1err(ASN1_F_A2I_ASN1_STRING,ERR_R_MALLOC_FAILURE);
(unsigned int)num+i*2);
if (sp == NULL)
{
ASN1err(ASN1_F_A2I_ASN1_STRING,ERR_R_MALLOC_FAILURE);
- if (s != NULL)
Free((char *)
s);
+ if (s != NULL)
OPENSSL_free(
s);
goto err;
}
s=sp;
goto err;
}
s=sp;