summaryrefslogtreecommitdiffstats
path: root/src/include/openssl/dh.h
diff options
context:
space:
mode:
authorAdam Langley <agl@google.com>2015-09-24 10:57:52 -0700
committerAdam Langley <agl@google.com>2015-09-24 11:04:03 -0700
commit1e4884f615b20946411a74e41eb9c6aa65e2d5f3 (patch)
treedd743d9d64af3145fe96b8d5fc2f3427544794bd /src/include/openssl/dh.h
parent08656b61d075740bfb24ddcce65223146259fc02 (diff)
downloadexternal_boringssl-1e4884f615b20946411a74e41eb9c6aa65e2d5f3.zip
external_boringssl-1e4884f615b20946411a74e41eb9c6aa65e2d5f3.tar.gz
external_boringssl-1e4884f615b20946411a74e41eb9c6aa65e2d5f3.tar.bz2
external/boringssl: sync with upstream.
This change imports the current version of BoringSSL. The only local change now is that |BORINGSSL_201509| is defined in base.h. This allows this change to be made without (hopefully) breaking the build. This change will need https://android-review.googlesource.com/172744 to be landed afterwards to update a test. Change-Id: I6d1f463f7785a2423bd846305af91c973c326104
Diffstat (limited to 'src/include/openssl/dh.h')
-rw-r--r--src/include/openssl/dh.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/include/openssl/dh.h b/src/include/openssl/dh.h
index 17574d5..75df632 100644
--- a/src/include/openssl/dh.h
+++ b/src/include/openssl/dh.h
@@ -235,7 +235,7 @@ struct dh_st {
BIGNUM *p;
BIGNUM *g;
- BIGNUM *pub_key; /* g^x */
+ BIGNUM *pub_key; /* g^x mod p */
BIGNUM *priv_key; /* x */
/* priv_length contains the length, in bits, of the private value. If zero,
@@ -262,10 +262,6 @@ struct dh_st {
} /* extern C */
#endif
-#define DH_F_DH_new_method 100
-#define DH_F_compute_key 101
-#define DH_F_generate_key 102
-#define DH_F_generate_parameters 103
#define DH_R_BAD_GENERATOR 100
#define DH_R_INVALID_PUBKEY 101
#define DH_R_MODULUS_TOO_LARGE 102