diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2018-08-20 09:52:47 +0000 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2018-08-20 09:52:47 +0000 |
| commit | e30d157cb722efe9d8047369f627b20467ff62a5 (patch) | |
| tree | 3e5c733822a4a284b453f25096f6419058f12552 /lib/gnutls_int.h | |
| parent | 36900a0ac016faab9ed874e5073fd412b035a9ae (diff) | |
| parent | e28073163a398604311fb5128e54cde46c1b7cfc (diff) | |
| download | gnutls-e30d157cb722efe9d8047369f627b20467ff62a5.tar.gz | |
Merge branch 'tmp-fix-resumption-requested' into 'master'
Fix gnutls_session_resumption_requested
Closes #546
See merge request gnutls/gnutls!735
Diffstat (limited to 'lib/gnutls_int.h')
| -rw-r--r-- | lib/gnutls_int.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h index 925759049c..f4dc71bb3c 100644 --- a/lib/gnutls_int.h +++ b/lib/gnutls_int.h @@ -1091,7 +1091,10 @@ typedef struct { /* resumed session */ bool resumed; /* RESUME_TRUE or FALSE - if we are resuming a session */ - bool resumption_requested; /* non-zero if resumption was requested by client */ + + /* server side: non-zero if resumption was requested by client + * client side: non-zero if we set resumption parameters */ + bool resumption_requested; security_parameters_st resumed_security_parameters; gnutls_datum_t resumption_data; /* copy of input to gnutls_session_set_data() */ |