aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/ssl_handshake.hrl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2013-01-21 11:11:33 +0100
committerIngela Anderton Andin <[email protected]>2013-01-21 11:11:33 +0100
commitcbca9e3d6eead9b4f6de0b66a9c223cdbe3d5af2 (patch)
treec7af419bfdb66b234bda9dd67d605e8c7e3d6f73 /lib/ssl/src/ssl_handshake.hrl
parent165e1d5a1e2b84ec112e03c2cbee891adddd2884 (diff)
parent938a5246a52d30897b4f47439352da4425ea6fc5 (diff)
downloadotp-cbca9e3d6eead9b4f6de0b66a9c223cdbe3d5af2.tar.gz
otp-cbca9e3d6eead9b4f6de0b66a9c223cdbe3d5af2.tar.bz2
otp-cbca9e3d6eead9b4f6de0b66a9c223cdbe3d5af2.zip
Merge branch 'ia/ssl/simplify-addition-of-keyexchange-algorithms/OTP-10709'
* ia/ssl/simplify-addition-of-keyexchange-algorithms/OTP-10709: SSL: simplify server key encoding, decoding and signature handling SSL: unify the different implementations signature check implementations
Diffstat (limited to 'lib/ssl/src/ssl_handshake.hrl')
-rw-r--r--lib/ssl/src/ssl_handshake.hrl9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_handshake.hrl b/lib/ssl/src/ssl_handshake.hrl
index 9af6511d68..2414d5b666 100644
--- a/lib/ssl/src/ssl_handshake.hrl
+++ b/lib/ssl/src/ssl_handshake.hrl
@@ -141,9 +141,14 @@
}).
-record(server_key_exchange, {
+ exchange_keys
+ }).
+
+-record(server_key_params, {
params, %% #server_rsa_params{} | #server_dh_params{}
- signed_params, %% #signature{}
- hashsign %% term(atom(), atom())
+ params_bin,
+ hashsign, %% term(atom(), atom())
+ signature %% #signature{}
}).
%% enum { anonymous, rsa, dsa } SignatureAlgorithm;