diff options
author | beck <> | 2014-04-17 13:37:50 +0000 |
---|---|---|
committer | beck <> | 2014-04-17 13:37:50 +0000 |
commit | bddb7c686e3d1aeb156722adc64b6c35ae720f87 (patch) | |
tree | 7595a93a27385c367802aa17ecf20f96551cf14d /src/lib/libcrypto/x509v3/v3_purp.c | |
parent | ecec66222d758996a4ff2671ca5026d9ede5ef76 (diff) | |
download | openbsd-bddb7c686e3d1aeb156722adc64b6c35ae720f87.tar.gz openbsd-bddb7c686e3d1aeb156722adc64b6c35ae720f87.tar.bz2 openbsd-bddb7c686e3d1aeb156722adc64b6c35ae720f87.zip |
Change library to use intrinsic memory allocation functions instead of
OPENSSL_foo wrappers. This changes:
OPENSSL_malloc->malloc
OPENSSL_free->free
OPENSSL_relloc->realloc
OPENSSL_freeFunc->free
Diffstat (limited to 'src/lib/libcrypto/x509v3/v3_purp.c')
-rw-r--r-- | src/lib/libcrypto/x509v3/v3_purp.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/libcrypto/x509v3/v3_purp.c b/src/lib/libcrypto/x509v3/v3_purp.c index f59bfc1844..45d7251c29 100644 --- a/src/lib/libcrypto/x509v3/v3_purp.c +++ b/src/lib/libcrypto/x509v3/v3_purp.c | |||
@@ -183,17 +183,17 @@ int X509_PURPOSE_add(int id, int trust, int flags, | |||
183 | idx = X509_PURPOSE_get_by_id(id); | 183 | idx = X509_PURPOSE_get_by_id(id); |
184 | /* Need a new entry */ | 184 | /* Need a new entry */ |
185 | if(idx == -1) { | 185 | if(idx == -1) { |
186 | if(!(ptmp = OPENSSL_malloc(sizeof(X509_PURPOSE)))) { | 186 | if(!(ptmp = malloc(sizeof(X509_PURPOSE)))) { |
187 | X509V3err(X509V3_F_X509_PURPOSE_ADD,ERR_R_MALLOC_FAILURE); | 187 | X509V3err(X509V3_F_X509_PURPOSE_ADD,ERR_R_MALLOC_FAILURE); |
188 | return 0; | 188 | return 0; |
189 | } | 189 | } |
190 | ptmp->flags = X509_PURPOSE_DYNAMIC; | 190 | ptmp->flags = X509_PURPOSE_DYNAMIC; |
191 | } else ptmp = X509_PURPOSE_get0(idx); | 191 | } else ptmp = X509_PURPOSE_get0(idx); |
192 | 192 | ||
193 | /* OPENSSL_free existing name if dynamic */ | 193 | /* free existing name if dynamic */ |
194 | if(ptmp->flags & X509_PURPOSE_DYNAMIC_NAME) { | 194 | if(ptmp->flags & X509_PURPOSE_DYNAMIC_NAME) { |
195 | OPENSSL_free(ptmp->name); | 195 | free(ptmp->name); |
196 | OPENSSL_free(ptmp->sname); | 196 | free(ptmp->sname); |
197 | } | 197 | } |
198 | /* dup supplied name */ | 198 | /* dup supplied name */ |
199 | ptmp->name = BUF_strdup(name); | 199 | ptmp->name = BUF_strdup(name); |
@@ -232,10 +232,10 @@ static void xptable_free(X509_PURPOSE *p) | |||
232 | if (p->flags & X509_PURPOSE_DYNAMIC) | 232 | if (p->flags & X509_PURPOSE_DYNAMIC) |
233 | { | 233 | { |
234 | if (p->flags & X509_PURPOSE_DYNAMIC_NAME) { | 234 | if (p->flags & X509_PURPOSE_DYNAMIC_NAME) { |
235 | OPENSSL_free(p->name); | 235 | free(p->name); |
236 | OPENSSL_free(p->sname); | 236 | free(p->sname); |
237 | } | 237 | } |
238 | OPENSSL_free(p); | 238 | free(p); |
239 | } | 239 | } |
240 | } | 240 | } |
241 | 241 | ||