projects
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
4e14996
)
Don't insert in the middle.
author
Ben Laurie
<ben@openssl.org>
Tue, 29 May 2012 18:58:43 +0000
(18:58 +0000)
committer
Ben Laurie
<ben@openssl.org>
Tue, 29 May 2012 18:58:43 +0000
(18:58 +0000)
ssl/ssl.h
patch
|
blob
|
history
diff --git
a/ssl/ssl.h
b/ssl/ssl.h
index 1b5525b2886005225405528b29b5e3a7196d3820..92840cdb663fb98de5c2d9b0950befe7d13ebe56 100644
(file)
--- a/
ssl/ssl.h
+++ b/
ssl/ssl.h
@@
-538,14
+538,16
@@
struct ssl_session_st
unsigned char *tlsext_tick; /* Session ticket */
size_t tlsext_ticklen; /* Session ticket length */
long tlsext_tick_lifetime_hint; /* Session lifetime hint in seconds */
unsigned char *tlsext_tick; /* Session ticket */
size_t tlsext_ticklen; /* Session ticket length */
long tlsext_tick_lifetime_hint; /* Session lifetime hint in seconds */
+#endif
+#ifndef OPENSSL_NO_SRP
+ char *srp_username;
+#endif
+#ifndef OPENSSL_NO_TLSEXT
/* Used by client: the proof for this session.
* We store it outside the sess_cert structure, since the proof
* is received before the certificate. */
unsigned char *audit_proof;
size_t audit_proof_length;
/* Used by client: the proof for this session.
* We store it outside the sess_cert structure, since the proof
* is received before the certificate. */
unsigned char *audit_proof;
size_t audit_proof_length;
-#endif
-#ifndef OPENSSL_NO_SRP
- char *srp_username;
#endif
};
#endif
};