aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/ssl_record.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2010-05-21 14:39:40 +0000
committerErlang/OTP <[email protected]>2010-05-21 14:39:40 +0000
commit58532d2bda5628a44586ae5f38d533c4318c9c8d (patch)
treea36ee0c09e892c3c299b29eb3d52df971bf78731 /lib/ssl/src/ssl_record.erl
parentcb2fced5a477e7b75e1d002542bb36a43b1f6071 (diff)
downloadotp-58532d2bda5628a44586ae5f38d533c4318c9c8d.tar.gz
otp-58532d2bda5628a44586ae5f38d533c4318c9c8d.tar.bz2
otp-58532d2bda5628a44586ae5f38d533c4318c9c8d.zip
Clean up of code
Diffstat (limited to 'lib/ssl/src/ssl_record.erl')
-rw-r--r--lib/ssl/src/ssl_record.erl11
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/ssl/src/ssl_record.erl b/lib/ssl/src/ssl_record.erl
index f9f915f13d..c867848c31 100644
--- a/lib/ssl/src/ssl_record.erl
+++ b/lib/ssl/src/ssl_record.erl
@@ -29,6 +29,7 @@
-include("ssl_internal.hrl").
-include("ssl_alert.hrl").
-include("ssl_handshake.hrl").
+-include("ssl_cipher.hrl").
-include("ssl_debug.hrl").
%% Connection state handling
@@ -532,12 +533,10 @@ initial_connection_state(ConnectionEnd) ->
}.
initial_security_params(ConnectionEnd) ->
- #security_parameters{connection_end = ConnectionEnd,
- bulk_cipher_algorithm = ?NULL,
- mac_algorithm = ?NULL,
- compression_algorithm = ?NULL,
- cipher_type = ?NULL
- }.
+ SecParams = #security_parameters{connection_end = ConnectionEnd,
+ compression_algorithm = ?NULL},
+ ssl_cipher:security_parameters(?TLS_NULL_WITH_NULL_NULL,
+ SecParams).
empty_connection_state(ConnectionEnd) ->
SecParams = empty_security_params(ConnectionEnd),