commit 8094b54eb12a7f87058830bf59fd0e124ed0b145
author David Benjamin <davidben@google.com> Tue May 08 18:59:58 2018 -0400
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Tue May 08 23:12:15 2018 +0000
tree d2ac6cc3076b596d0c14bbf9bec9fc02f706feee
parent 02de7bd3a00fbfb27d2a3aaf1f8480711f1210c2

Add BIO versions of i2d_DHparams and d2i_DHparams.

Change-Id: Ie643aaaa44aef67932b107d31ef92c2649738051
Reviewed-on: https://boringssl-review.googlesource.com/28269
Commit-Queue: David Benjamin <davidben@google.com>
Commit-Queue: Adam Langley <agl@google.com>
Reviewed-by: Adam Langley <agl@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>

crypto/x509/x_all.c

diff --git a/crypto/x509/x_all.c b/crypto/x509/x_all.c
index c430a7d..2a93b87 100644
--- a/crypto/x509/x_all.c
+++ b/crypto/x509/x_all.c
@@ -499,3 +499,13 @@
 {
     return ASN1_d2i_bio_of(EVP_PKEY, EVP_PKEY_new, d2i_PUBKEY, bp, a);
 }
+
+DH *d2i_DHparams_bio(BIO *bp, DH **dh)
+{
+    return ASN1_d2i_bio_of(DH, DH_new, d2i_DHparams, bp, dh);
+}
+
+int i2d_DHparams_bio(BIO *bp, const DH *dh)
+{
+    return ASN1_i2d_bio_of_const(DH, i2d_DHparams, bp, dh);
+}

include/openssl/x509.h

diff --git a/include/openssl/x509.h b/include/openssl/x509.h
index 65d68c4..a0f7645 100644
--- a/include/openssl/x509.h
+++ b/include/openssl/x509.h
@@ -671,6 +671,8 @@
 OPENSSL_EXPORT EVP_PKEY *d2i_PrivateKey_bio(BIO *bp, EVP_PKEY **a);
 OPENSSL_EXPORT int i2d_PUBKEY_bio(BIO *bp, EVP_PKEY *pkey);
 OPENSSL_EXPORT EVP_PKEY *d2i_PUBKEY_bio(BIO *bp, EVP_PKEY **a);
+OPENSSL_EXPORT DH *d2i_DHparams_bio(BIO *bp, DH **dh);
+OPENSSL_EXPORT int i2d_DHparams_bio(BIO *bp, const DH *dh);
 
 OPENSSL_EXPORT X509 *X509_dup(X509 *x509);
 OPENSSL_EXPORT X509_ATTRIBUTE *X509_ATTRIBUTE_dup(X509_ATTRIBUTE *xa);