summaryrefslogtreecommitdiff
path: root/lib/gnutls_int.h
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2017-11-08 11:45:25 +0100
committerNikos Mavrogiannopoulos <nmav@redhat.com>2018-02-19 15:29:35 +0100
commit0d850655c92e5d52a531c8a958cc5a0c3e125609 (patch)
treed81e1e386770d385716387267ee694ee2143a90a /lib/gnutls_int.h
parent28eede47cc8f0bd1ceab2ac0fe7a2859f1f01e28 (diff)
downloadgnutls-0d850655c92e5d52a531c8a958cc5a0c3e125609.tar.gz
session state: combined srp and dh prime bits variables
They were being used for the same purpose, and SRP as well as DH, do not overlap to require two different variables. Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
Diffstat (limited to 'lib/gnutls_int.h')
-rw-r--r--lib/gnutls_int.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index 690cd9a59d..9e50af67ce 100644
--- a/lib/gnutls_int.h
+++ b/lib/gnutls_int.h
@@ -945,8 +945,13 @@ typedef struct {
bool allow_key_usage_violation;
bool allow_wrong_pms;
bool dumbfw;
- unsigned int dh_prime_bits; /* old (deprecated) variable */
+ /* old (deprecated) variable. This is used for both srp_prime_bits
+ * and dh_prime_bits as they don't overlap */
+ /* For SRP: minimum bits to allow for SRP
+ * use gnutls_srp_set_prime_bits() to adjust it.
+ */
+ uint16_t dh_prime_bits; /* srp_prime_bits */
/* resumed session */
bool resumed; /* RESUME_TRUE or FALSE - if we are resuming a session */
@@ -1075,11 +1080,6 @@ typedef struct {
*/
int errnum;
- /* minimum bits to allow for SRP
- * use gnutls_srp_set_prime_bits() to adjust it.
- */
- uint16_t srp_prime_bits;
-
/* A handshake process has been completed */
bool initial_negotiation_completed;