diff options
Diffstat (limited to 'src/lib/libcrypto/x509/x509spki.c')
-rw-r--r-- | src/lib/libcrypto/x509/x509spki.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libcrypto/x509/x509spki.c b/src/lib/libcrypto/x509/x509spki.c index 02a203d72c..28bc12e1a2 100644 --- a/src/lib/libcrypto/x509/x509spki.c +++ b/src/lib/libcrypto/x509/x509spki.c | |||
@@ -82,7 +82,7 @@ NETSCAPE_SPKI * NETSCAPE_SPKI_b64_decode(const char *str, int len) | |||
82 | int spki_len; | 82 | int spki_len; |
83 | NETSCAPE_SPKI *spki; | 83 | NETSCAPE_SPKI *spki; |
84 | if(len <= 0) len = strlen(str); | 84 | if(len <= 0) len = strlen(str); |
85 | if (!(spki_der = OPENSSL_malloc(len + 1))) { | 85 | if (!(spki_der = malloc(len + 1))) { |
86 | X509err(X509_F_NETSCAPE_SPKI_B64_DECODE, ERR_R_MALLOC_FAILURE); | 86 | X509err(X509_F_NETSCAPE_SPKI_B64_DECODE, ERR_R_MALLOC_FAILURE); |
87 | return NULL; | 87 | return NULL; |
88 | } | 88 | } |
@@ -90,12 +90,12 @@ NETSCAPE_SPKI * NETSCAPE_SPKI_b64_decode(const char *str, int len) | |||
90 | if(spki_len < 0) { | 90 | if(spki_len < 0) { |
91 | X509err(X509_F_NETSCAPE_SPKI_B64_DECODE, | 91 | X509err(X509_F_NETSCAPE_SPKI_B64_DECODE, |
92 | X509_R_BASE64_DECODE_ERROR); | 92 | X509_R_BASE64_DECODE_ERROR); |
93 | OPENSSL_free(spki_der); | 93 | free(spki_der); |
94 | return NULL; | 94 | return NULL; |
95 | } | 95 | } |
96 | p = spki_der; | 96 | p = spki_der; |
97 | spki = d2i_NETSCAPE_SPKI(NULL, &p, spki_len); | 97 | spki = d2i_NETSCAPE_SPKI(NULL, &p, spki_len); |
98 | OPENSSL_free(spki_der); | 98 | free(spki_der); |
99 | return spki; | 99 | return spki; |
100 | } | 100 | } |
101 | 101 | ||
@@ -107,8 +107,8 @@ char * NETSCAPE_SPKI_b64_encode(NETSCAPE_SPKI *spki) | |||
107 | char *b64_str; | 107 | char *b64_str; |
108 | int der_len; | 108 | int der_len; |
109 | der_len = i2d_NETSCAPE_SPKI(spki, NULL); | 109 | der_len = i2d_NETSCAPE_SPKI(spki, NULL); |
110 | der_spki = OPENSSL_malloc(der_len); | 110 | der_spki = malloc(der_len); |
111 | b64_str = OPENSSL_malloc(der_len * 2); | 111 | b64_str = malloc(der_len * 2); |
112 | if(!der_spki || !b64_str) { | 112 | if(!der_spki || !b64_str) { |
113 | X509err(X509_F_NETSCAPE_SPKI_B64_ENCODE, ERR_R_MALLOC_FAILURE); | 113 | X509err(X509_F_NETSCAPE_SPKI_B64_ENCODE, ERR_R_MALLOC_FAILURE); |
114 | return NULL; | 114 | return NULL; |
@@ -116,6 +116,6 @@ char * NETSCAPE_SPKI_b64_encode(NETSCAPE_SPKI *spki) | |||
116 | p = der_spki; | 116 | p = der_spki; |
117 | i2d_NETSCAPE_SPKI(spki, &p); | 117 | i2d_NETSCAPE_SPKI(spki, &p); |
118 | EVP_EncodeBlock((unsigned char *)b64_str, der_spki, der_len); | 118 | EVP_EncodeBlock((unsigned char *)b64_str, der_spki, der_len); |
119 | OPENSSL_free(der_spki); | 119 | free(der_spki); |
120 | return b64_str; | 120 | return b64_str; |
121 | } | 121 | } |