diff options
| author | Nicola Tuveri <nic.tuv@gmail.com> | 2020-07-16 02:02:16 +0300 |
|---|---|---|
| committer | Nicola Tuveri <nic.tuv@gmail.com> | 2021-08-30 15:18:14 +0300 |
| commit | cca8a4cedaafe63b0b5729b72133661ece24ff08 (patch) | |
| tree | fdfffddd44f1cd137ae9c04a4dc076e1886b4b8a | |
| parent | ea1128e94e36fa9fa25278dc6b3f5b42d8735782 (diff) | |
Fix d2i_ECPKParameters_fp and i2d_ECPKParameters_fp macros
These functions are part of the public API but we don't have tests
covering their usage.
They are actually implemented as macros and the absence of tests has
caused them to fall out-of-sync with the latest changes to ASN1 related
functions and cause compilation warnings.
This commit fixes the public headers to reflect these changes.
Fixes #12443
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16355)
| -rw-r--r-- | include/openssl/ec.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/openssl/ec.h b/include/openssl/ec.h index 8b1abcebb7..f59b4f9288 100644 --- a/include/openssl/ec.h +++ b/include/openssl/ec.h @@ -915,10 +915,10 @@ int i2d_ECPKParameters(const EC_GROUP *, unsigned char **out); # define i2d_ECPKParameters_bio(bp,x) \ ASN1_i2d_bio_of(EC_GROUP, i2d_ECPKParameters, bp, x) # define d2i_ECPKParameters_fp(fp,x) \ - (EC_GROUP *)ASN1_d2i_fp(NULL, (char *(*)())d2i_ECPKParameters, (fp), \ - (unsigned char **)(x)) + (EC_GROUP *)ASN1_d2i_fp(NULL, (d2i_of_void *)d2i_ECPKParameters, (fp), \ + (void **)(x)) # define i2d_ECPKParameters_fp(fp,x) \ - ASN1_i2d_fp(i2d_ECPKParameters,(fp), (unsigned char *)(x)) + ASN1_i2d_fp((i2d_of_void *)i2d_ECPKParameters, (fp), (void *)(x)) # ifndef OPENSSL_NO_DEPRECATED_3_0 OSSL_DEPRECATEDIN_3_0 int ECPKParameters_print(BIO *bp, const EC_GROUP *x, |