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/ts/ts_rsp_sign.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/ts/ts_rsp_sign.c')
| -rw-r--r-- | src/lib/libcrypto/ts/ts_rsp_sign.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libcrypto/ts/ts_rsp_sign.c b/src/lib/libcrypto/ts/ts_rsp_sign.c index e7186a8ce0..e52c9ff03b 100644 --- a/src/lib/libcrypto/ts/ts_rsp_sign.c +++ b/src/lib/libcrypto/ts/ts_rsp_sign.c | |||
| @@ -167,7 +167,7 @@ TS_RESP_CTX *TS_RESP_CTX_new() | |||
| 167 | { | 167 | { |
| 168 | TS_RESP_CTX *ctx; | 168 | TS_RESP_CTX *ctx; |
| 169 | 169 | ||
| 170 | if (!(ctx = (TS_RESP_CTX *) OPENSSL_malloc(sizeof(TS_RESP_CTX)))) | 170 | if (!(ctx = (TS_RESP_CTX *) malloc(sizeof(TS_RESP_CTX)))) |
| 171 | { | 171 | { |
| 172 | TSerr(TS_F_TS_RESP_CTX_NEW, ERR_R_MALLOC_FAILURE); | 172 | TSerr(TS_F_TS_RESP_CTX_NEW, ERR_R_MALLOC_FAILURE); |
| 173 | return NULL; | 173 | return NULL; |
| @@ -195,7 +195,7 @@ void TS_RESP_CTX_free(TS_RESP_CTX *ctx) | |||
| 195 | ASN1_INTEGER_free(ctx->seconds); | 195 | ASN1_INTEGER_free(ctx->seconds); |
| 196 | ASN1_INTEGER_free(ctx->millis); | 196 | ASN1_INTEGER_free(ctx->millis); |
| 197 | ASN1_INTEGER_free(ctx->micros); | 197 | ASN1_INTEGER_free(ctx->micros); |
| 198 | OPENSSL_free(ctx); | 198 | free(ctx); |
| 199 | } | 199 | } |
| 200 | 200 | ||
| 201 | int TS_RESP_CTX_set_signer_cert(TS_RESP_CTX *ctx, X509 *signer) | 201 | int TS_RESP_CTX_set_signer_cert(TS_RESP_CTX *ctx, X509 *signer) |
| @@ -922,7 +922,7 @@ static int ESS_add_signing_cert(PKCS7_SIGNER_INFO *si, ESS_SIGNING_CERT *sc) | |||
| 922 | int len; | 922 | int len; |
| 923 | 923 | ||
| 924 | len = i2d_ESS_SIGNING_CERT(sc, NULL); | 924 | len = i2d_ESS_SIGNING_CERT(sc, NULL); |
| 925 | if (!(pp = (unsigned char *) OPENSSL_malloc(len))) | 925 | if (!(pp = (unsigned char *) malloc(len))) |
| 926 | { | 926 | { |
| 927 | TSerr(TS_F_ESS_ADD_SIGNING_CERT, ERR_R_MALLOC_FAILURE); | 927 | TSerr(TS_F_ESS_ADD_SIGNING_CERT, ERR_R_MALLOC_FAILURE); |
| 928 | goto err; | 928 | goto err; |
| @@ -934,13 +934,13 @@ static int ESS_add_signing_cert(PKCS7_SIGNER_INFO *si, ESS_SIGNING_CERT *sc) | |||
| 934 | TSerr(TS_F_ESS_ADD_SIGNING_CERT, ERR_R_MALLOC_FAILURE); | 934 | TSerr(TS_F_ESS_ADD_SIGNING_CERT, ERR_R_MALLOC_FAILURE); |
| 935 | goto err; | 935 | goto err; |
| 936 | } | 936 | } |
| 937 | OPENSSL_free(pp); pp = NULL; | 937 | free(pp); pp = NULL; |
| 938 | return PKCS7_add_signed_attribute(si, | 938 | return PKCS7_add_signed_attribute(si, |
| 939 | NID_id_smime_aa_signingCertificate, | 939 | NID_id_smime_aa_signingCertificate, |
| 940 | V_ASN1_SEQUENCE, seq); | 940 | V_ASN1_SEQUENCE, seq); |
| 941 | err: | 941 | err: |
| 942 | ASN1_STRING_free(seq); | 942 | ASN1_STRING_free(seq); |
| 943 | OPENSSL_free(pp); | 943 | free(pp); |
| 944 | 944 | ||
| 945 | return 0; | 945 | return 0; |
| 946 | } | 946 | } |
