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_asid.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_asid.c')
| -rw-r--r-- | src/lib/libcrypto/x509v3/v3_asid.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libcrypto/x509v3/v3_asid.c b/src/lib/libcrypto/x509v3/v3_asid.c index 1587e8ed72..325c8e0406 100644 --- a/src/lib/libcrypto/x509v3/v3_asid.c +++ b/src/lib/libcrypto/x509v3/v3_asid.c | |||
| @@ -125,17 +125,17 @@ static int i2r_ASIdentifierChoice(BIO *out, | |||
| 125 | if ((s = i2s_ASN1_INTEGER(NULL, aor->u.id)) == NULL) | 125 | if ((s = i2s_ASN1_INTEGER(NULL, aor->u.id)) == NULL) |
| 126 | return 0; | 126 | return 0; |
| 127 | BIO_printf(out, "%*s%s\n", indent + 2, "", s); | 127 | BIO_printf(out, "%*s%s\n", indent + 2, "", s); |
| 128 | OPENSSL_free(s); | 128 | free(s); |
| 129 | break; | 129 | break; |
| 130 | case ASIdOrRange_range: | 130 | case ASIdOrRange_range: |
| 131 | if ((s = i2s_ASN1_INTEGER(NULL, aor->u.range->min)) == NULL) | 131 | if ((s = i2s_ASN1_INTEGER(NULL, aor->u.range->min)) == NULL) |
| 132 | return 0; | 132 | return 0; |
| 133 | BIO_printf(out, "%*s%s-", indent + 2, "", s); | 133 | BIO_printf(out, "%*s%s-", indent + 2, "", s); |
| 134 | OPENSSL_free(s); | 134 | free(s); |
| 135 | if ((s = i2s_ASN1_INTEGER(NULL, aor->u.range->max)) == NULL) | 135 | if ((s = i2s_ASN1_INTEGER(NULL, aor->u.range->max)) == NULL) |
| 136 | return 0; | 136 | return 0; |
| 137 | BIO_printf(out, "%s\n", s); | 137 | BIO_printf(out, "%s\n", s); |
| 138 | OPENSSL_free(s); | 138 | free(s); |
| 139 | break; | 139 | break; |
| 140 | default: | 140 | default: |
| 141 | return 0; | 141 | return 0; |
| @@ -471,7 +471,7 @@ static int ASIdentifierChoice_canonize(ASIdentifierChoice *choice) | |||
| 471 | ASRange *r; | 471 | ASRange *r; |
| 472 | switch (a->type) { | 472 | switch (a->type) { |
| 473 | case ASIdOrRange_id: | 473 | case ASIdOrRange_id: |
| 474 | if ((r = OPENSSL_malloc(sizeof(ASRange))) == NULL) { | 474 | if ((r = malloc(sizeof(ASRange))) == NULL) { |
| 475 | X509V3err(X509V3_F_ASIDENTIFIERCHOICE_CANONIZE, | 475 | X509V3err(X509V3_F_ASIDENTIFIERCHOICE_CANONIZE, |
| 476 | ERR_R_MALLOC_FAILURE); | 476 | ERR_R_MALLOC_FAILURE); |
| 477 | goto done; | 477 | goto done; |
| @@ -620,7 +620,7 @@ static void *v2i_ASIdentifiers(const struct v3_ext_method *method, | |||
| 620 | s[i1] = '\0'; | 620 | s[i1] = '\0'; |
| 621 | min = s2i_ASN1_INTEGER(NULL, s); | 621 | min = s2i_ASN1_INTEGER(NULL, s); |
| 622 | max = s2i_ASN1_INTEGER(NULL, s + i2); | 622 | max = s2i_ASN1_INTEGER(NULL, s + i2); |
| 623 | OPENSSL_free(s); | 623 | free(s); |
| 624 | if (min == NULL || max == NULL) { | 624 | if (min == NULL || max == NULL) { |
| 625 | X509V3err(X509V3_F_V2I_ASIDENTIFIERS, ERR_R_MALLOC_FAILURE); | 625 | X509V3err(X509V3_F_V2I_ASIDENTIFIERS, ERR_R_MALLOC_FAILURE); |
| 626 | goto err; | 626 | goto err; |
