aboutsummaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2015-06-28 16:52:40 +0100
committerDr. Stephen Henson <steve@openssl.org>2015-07-30 14:43:34 +0100
commit64651d3984ca24c48538a2a109c446fd684aa248 (patch)
tree6a2a05e51ba63d53660af81264ff99a1a3dd027f /ssl
parent5e8b24dbfb98ed7c5b355cb6a959906a418e264b (diff)
downloadopenssl-64651d3984ca24c48538a2a109c446fd684aa248.tar.gz
fields for PSK key, new constants
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'ssl')
-rw-r--r--ssl/ssl_locl.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index 1cdcb8ba9f..db2341cb82 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -315,6 +315,14 @@
/* SRP */
# define SSL_kSRP 0x00000400L
+# define SSL_kRSAPSK 0x00000800L
+# define SSL_kECDHEPSK 0x00001000L
+# define SSL_kDHEPSK 0x00002000L
+
+/* all PSK */
+
+#define SSL_PSK (SSL_kPSK | SSL_kRSAPSK | SSL_kECDHEPSK | SSL_kDHEPSK)
+
/* Bits for algorithm_auth (server authentication) */
/* RSA auth */
# define SSL_aRSA 0x00000001L
@@ -1269,6 +1277,9 @@ typedef struct ssl3_state_st {
/* Temporary storage for premaster secret */
unsigned char *pms;
size_t pmslen;
+ /* Temporary storage for PSK key */
+ unsigned char *psk;
+ size_t psklen;
/*
* signature algorithms peer reports: e.g. supported signature
* algorithms extension for server or as part of a certificate