projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
There have been a number of complaints from a number of sources that names
[openssl.git]
/
crypto
/
asn1
/
a_enum.c
diff --git
a/crypto/asn1/a_enum.c
b/crypto/asn1/a_enum.c
index ccf62e5a044011e95c6f04be609f6b2517d0ae11..572ba2e1b2c867c03d80c3f491c886aa1fd95065 100644
(file)
--- a/
crypto/asn1/a_enum.c
+++ b/
crypto/asn1/a_enum.c
@@
-168,9
+168,9
@@
ASN1_ENUMERATED *d2i_ASN1_ENUMERATED(ASN1_ENUMERATED **a, unsigned char **pp,
goto err;
}
goto err;
}
- /* We must
M
alloc stuff, even for 0 bytes otherwise it
+ /* We must
OPENSSL_m
alloc stuff, even for 0 bytes otherwise it
* signifies a missing NULL parameter. */
* signifies a missing NULL parameter. */
- s=(unsigned char *)
M
alloc((int)len+1);
+ s=(unsigned char *)
OPENSSL_m
alloc((int)len+1);
if (s == NULL)
{
i=ERR_R_MALLOC_FAILURE;
if (s == NULL)
{
i=ERR_R_MALLOC_FAILURE;
@@
-219,7
+219,7
@@
ASN1_ENUMERATED *d2i_ASN1_ENUMERATED(ASN1_ENUMERATED **a, unsigned char **pp,
p+=len;
}
p+=len;
}
- if (ret->data != NULL)
F
ree(ret->data);
+ if (ret->data != NULL)
OPENSSL_f
ree(ret->data);
ret->data=s;
ret->length=(int)len;
if (a != NULL) (*a)=ret;
ret->data=s;
ret->length=(int)len;
if (a != NULL) (*a)=ret;
@@
-242,8
+242,8
@@
int ASN1_ENUMERATED_set(ASN1_ENUMERATED *a, long v)
if (a->length < (sizeof(long)+1))
{
if (a->data != NULL)
if (a->length < (sizeof(long)+1))
{
if (a->data != NULL)
-
F
ree(a->data);
- if ((a->data=(unsigned char *)
M
alloc(sizeof(long)+1)) != NULL)
+
OPENSSL_f
ree(a->data);
+ if ((a->data=(unsigned char *)
OPENSSL_m
alloc(sizeof(long)+1)) != NULL)
memset((char *)a->data,0,sizeof(long)+1);
}
if (a->data == NULL)
memset((char *)a->data,0,sizeof(long)+1);
}
if (a->data == NULL)
@@
-318,7
+318,7
@@
ASN1_ENUMERATED *BN_to_ASN1_ENUMERATED(BIGNUM *bn, ASN1_ENUMERATED *ai)
else ret->type=V_ASN1_ENUMERATED;
j=BN_num_bits(bn);
len=((j == 0)?0:((j/8)+1));
else ret->type=V_ASN1_ENUMERATED;
j=BN_num_bits(bn);
len=((j == 0)?0:((j/8)+1));
- ret->data=(unsigned char *)
M
alloc(len+4);
+ ret->data=(unsigned char *)
OPENSSL_m
alloc(len+4);
ret->length=BN_bn2bin(bn,ret->data);
return(ret);
err:
ret->length=BN_bn2bin(bn,ret->data);
return(ret);
err: