diff options
Diffstat (limited to 'src/lib/libcrypto/dsa/dsa_asn1.c')
-rw-r--r-- | src/lib/libcrypto/dsa/dsa_asn1.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/libcrypto/dsa/dsa_asn1.c b/src/lib/libcrypto/dsa/dsa_asn1.c index c9b32b4db7..a76c8f7c7e 100644 --- a/src/lib/libcrypto/dsa/dsa_asn1.c +++ b/src/lib/libcrypto/dsa/dsa_asn1.c | |||
@@ -10,7 +10,7 @@ DSA_SIG *DSA_SIG_new(void) | |||
10 | { | 10 | { |
11 | DSA_SIG *ret; | 11 | DSA_SIG *ret; |
12 | 12 | ||
13 | ret = Malloc(sizeof(DSA_SIG)); | 13 | ret = OPENSSL_malloc(sizeof(DSA_SIG)); |
14 | if (ret == NULL) | 14 | if (ret == NULL) |
15 | { | 15 | { |
16 | DSAerr(DSA_F_DSA_SIG_NEW,ERR_R_MALLOC_FAILURE); | 16 | DSAerr(DSA_F_DSA_SIG_NEW,ERR_R_MALLOC_FAILURE); |
@@ -26,7 +26,7 @@ void DSA_SIG_free(DSA_SIG *r) | |||
26 | if (r == NULL) return; | 26 | if (r == NULL) return; |
27 | if (r->r) BN_clear_free(r->r); | 27 | if (r->r) BN_clear_free(r->r); |
28 | if (r->s) BN_clear_free(r->s); | 28 | if (r->s) BN_clear_free(r->s); |
29 | Free(r); | 29 | OPENSSL_free(r); |
30 | } | 30 | } |
31 | 31 | ||
32 | int i2d_DSA_SIG(DSA_SIG *v, unsigned char **pp) | 32 | int i2d_DSA_SIG(DSA_SIG *v, unsigned char **pp) |
@@ -35,7 +35,7 @@ int i2d_DSA_SIG(DSA_SIG *v, unsigned char **pp) | |||
35 | ASN1_INTEGER rbs,sbs; | 35 | ASN1_INTEGER rbs,sbs; |
36 | unsigned char *p; | 36 | unsigned char *p; |
37 | 37 | ||
38 | rbs.data=Malloc(BN_num_bits(v->r)/8+1); | 38 | rbs.data=OPENSSL_malloc(BN_num_bits(v->r)/8+1); |
39 | if (rbs.data == NULL) | 39 | if (rbs.data == NULL) |
40 | { | 40 | { |
41 | DSAerr(DSA_F_I2D_DSA_SIG, ERR_R_MALLOC_FAILURE); | 41 | DSAerr(DSA_F_I2D_DSA_SIG, ERR_R_MALLOC_FAILURE); |
@@ -43,10 +43,10 @@ int i2d_DSA_SIG(DSA_SIG *v, unsigned char **pp) | |||
43 | } | 43 | } |
44 | rbs.type=V_ASN1_INTEGER; | 44 | rbs.type=V_ASN1_INTEGER; |
45 | rbs.length=BN_bn2bin(v->r,rbs.data); | 45 | rbs.length=BN_bn2bin(v->r,rbs.data); |
46 | sbs.data=Malloc(BN_num_bits(v->s)/8+1); | 46 | sbs.data=OPENSSL_malloc(BN_num_bits(v->s)/8+1); |
47 | if (sbs.data == NULL) | 47 | if (sbs.data == NULL) |
48 | { | 48 | { |
49 | Free(rbs.data); | 49 | OPENSSL_free(rbs.data); |
50 | DSAerr(DSA_F_I2D_DSA_SIG, ERR_R_MALLOC_FAILURE); | 50 | DSAerr(DSA_F_I2D_DSA_SIG, ERR_R_MALLOC_FAILURE); |
51 | return(0); | 51 | return(0); |
52 | } | 52 | } |
@@ -64,8 +64,8 @@ int i2d_DSA_SIG(DSA_SIG *v, unsigned char **pp) | |||
64 | i2d_ASN1_INTEGER(&sbs,&p); | 64 | i2d_ASN1_INTEGER(&sbs,&p); |
65 | } | 65 | } |
66 | t=ASN1_object_size(1,len,V_ASN1_SEQUENCE); | 66 | t=ASN1_object_size(1,len,V_ASN1_SEQUENCE); |
67 | Free(rbs.data); | 67 | OPENSSL_free(rbs.data); |
68 | Free(sbs.data); | 68 | OPENSSL_free(sbs.data); |
69 | return(t); | 69 | return(t); |
70 | } | 70 | } |
71 | 71 | ||