diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2017-05-25 19:38:38 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2017-05-25 19:38:38 +0000 |
| commit | 12df5ad9af4981f5d3c31a9819d31618c0f1af51 (patch) | |
| tree | 97e3336a3054b8d8a0150b9d414934f73c99cb30 /crypto/dh | |
| parent | 5315173646e65b5025be33013edc33eb9658e683 (diff) | |
| download | src-12df5ad9af4981f5d3c31a9819d31618c0f1af51.tar.gz src-12df5ad9af4981f5d3c31a9819d31618c0f1af51.zip | |
Import OpenSSL 1.0.2l.vendor/openssl/1.0.2l
Notes
Notes:
svn path=/vendor-crypto/openssl/dist/; revision=318897
svn path=/vendor-crypto/openssl/1.0.2l/; revision=318898; tag=vendor/openssl/1.0.2l
Diffstat (limited to 'crypto/dh')
| -rw-r--r-- | crypto/dh/dh.h | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/crypto/dh/dh.h b/crypto/dh/dh.h index a5bd9016aae8..a228c7a7a4c3 100644 --- a/crypto/dh/dh.h +++ b/crypto/dh/dh.h @@ -182,12 +182,29 @@ struct dh_st { */ # define DH_CHECK_P_NOT_STRONG_PRIME DH_CHECK_P_NOT_SAFE_PRIME -# define d2i_DHparams_fp(fp,x) (DH *)ASN1_d2i_fp((char *(*)())DH_new, \ - (char *(*)())d2i_DHparams,(fp),(unsigned char **)(x)) -# define i2d_DHparams_fp(fp,x) ASN1_i2d_fp(i2d_DHparams,(fp), \ - (unsigned char *)(x)) -# define d2i_DHparams_bio(bp,x) ASN1_d2i_bio_of(DH,DH_new,d2i_DHparams,bp,x) -# define i2d_DHparams_bio(bp,x) ASN1_i2d_bio_of_const(DH,i2d_DHparams,bp,x) +# define d2i_DHparams_fp(fp,x) \ + (DH *)ASN1_d2i_fp((char *(*)())DH_new, \ + (char *(*)())d2i_DHparams, \ + (fp), \ + (unsigned char **)(x)) +# define i2d_DHparams_fp(fp,x) \ + ASN1_i2d_fp(i2d_DHparams,(fp), (unsigned char *)(x)) +# define d2i_DHparams_bio(bp,x) \ + ASN1_d2i_bio_of(DH, DH_new, d2i_DHparams, bp, x) +# define i2d_DHparams_bio(bp,x) \ + ASN1_i2d_bio_of_const(DH,i2d_DHparams,bp,x) + +# define d2i_DHxparams_fp(fp,x) \ + (DH *)ASN1_d2i_fp((char *(*)())DH_new, \ + (char *(*)())d2i_DHxparams, \ + (fp), \ + (unsigned char **)(x)) +# define i2d_DHxparams_fp(fp,x) \ + ASN1_i2d_fp(i2d_DHxparams,(fp), (unsigned char *)(x)) +# define d2i_DHxparams_bio(bp,x) \ + ASN1_d2i_bio_of(DH, DH_new, d2i_DHxparams, bp, x) +# define i2d_DHxparams_bio(bp,x) \ + ASN1_i2d_bio_of_const(DH, i2d_DHxparams, bp, x) DH *DHparams_dup(DH *); |