diff options
| author | beck <> | 2014-04-17 13:37:50 +0000 |
|---|---|---|
| committer | beck <> | 2014-04-17 13:37:50 +0000 |
| commit | 6aa5f85bab6ba5f9189fbc3d53a12e0f6dae48dd (patch) | |
| tree | 7595a93a27385c367802aa17ecf20f96551cf14d /src/lib/libcrypto/x509v3/v3_pci.c | |
| parent | 4d13fb9c7b5ac7311d7031173c21ab0121388413 (diff) | |
| download | openbsd-6aa5f85bab6ba5f9189fbc3d53a12e0f6dae48dd.tar.gz openbsd-6aa5f85bab6ba5f9189fbc3d53a12e0f6dae48dd.tar.bz2 openbsd-6aa5f85bab6ba5f9189fbc3d53a12e0f6dae48dd.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_pci.c')
| -rw-r--r-- | src/lib/libcrypto/x509v3/v3_pci.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libcrypto/x509v3/v3_pci.c b/src/lib/libcrypto/x509v3/v3_pci.c index 0dcfa004fe..9cef94258c 100644 --- a/src/lib/libcrypto/x509v3/v3_pci.c +++ b/src/lib/libcrypto/x509v3/v3_pci.c | |||
| @@ -135,7 +135,7 @@ static int process_pci_value(CONF_VALUE *val, | |||
| 135 | goto err; | 135 | goto err; |
| 136 | } | 136 | } |
| 137 | 137 | ||
| 138 | tmp_data = OPENSSL_realloc((*policy)->data, | 138 | tmp_data = realloc((*policy)->data, |
| 139 | (*policy)->length + val_len + 1); | 139 | (*policy)->length + val_len + 1); |
| 140 | if (tmp_data) | 140 | if (tmp_data) |
| 141 | { | 141 | { |
| @@ -147,7 +147,7 @@ static int process_pci_value(CONF_VALUE *val, | |||
| 147 | } | 147 | } |
| 148 | else | 148 | else |
| 149 | { | 149 | { |
| 150 | OPENSSL_free(tmp_data2); | 150 | free(tmp_data2); |
| 151 | /* realloc failure implies the original data space is b0rked too! */ | 151 | /* realloc failure implies the original data space is b0rked too! */ |
| 152 | (*policy)->data = NULL; | 152 | (*policy)->data = NULL; |
| 153 | (*policy)->length = 0; | 153 | (*policy)->length = 0; |
| @@ -155,7 +155,7 @@ static int process_pci_value(CONF_VALUE *val, | |||
| 155 | X509V3_conf_err(val); | 155 | X509V3_conf_err(val); |
| 156 | goto err; | 156 | goto err; |
| 157 | } | 157 | } |
| 158 | OPENSSL_free(tmp_data2); | 158 | free(tmp_data2); |
| 159 | } | 159 | } |
| 160 | else if (strncmp(val->value, "file:", 5) == 0) | 160 | else if (strncmp(val->value, "file:", 5) == 0) |
| 161 | { | 161 | { |
| @@ -173,7 +173,7 @@ static int process_pci_value(CONF_VALUE *val, | |||
| 173 | { | 173 | { |
| 174 | if (!n) continue; | 174 | if (!n) continue; |
| 175 | 175 | ||
| 176 | tmp_data = OPENSSL_realloc((*policy)->data, | 176 | tmp_data = realloc((*policy)->data, |
| 177 | (*policy)->length + n + 1); | 177 | (*policy)->length + n + 1); |
| 178 | 178 | ||
| 179 | if (!tmp_data) | 179 | if (!tmp_data) |
| @@ -197,7 +197,7 @@ static int process_pci_value(CONF_VALUE *val, | |||
| 197 | else if (strncmp(val->value, "text:", 5) == 0) | 197 | else if (strncmp(val->value, "text:", 5) == 0) |
| 198 | { | 198 | { |
| 199 | val_len = strlen(val->value + 5); | 199 | val_len = strlen(val->value + 5); |
| 200 | tmp_data = OPENSSL_realloc((*policy)->data, | 200 | tmp_data = realloc((*policy)->data, |
| 201 | (*policy)->length + val_len + 1); | 201 | (*policy)->length + val_len + 1); |
| 202 | if (tmp_data) | 202 | if (tmp_data) |
| 203 | { | 203 | { |
