diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-02-27 14:48:59 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-03-25 15:48:22 +0100 |
| commit | c635f15d22802f7ff18fd1ce9197b2cc760979ef (patch) | |
| tree | 2f4ff0c4b570f5049d614fd076cf50cee5320f78 /lib/ssl/src/ssl_cipher.erl | |
| parent | 8ffbf0feccb375afc10ce676070b6b778e9bf260 (diff) | |
| download | otp-c635f15d22802f7ff18fd1ce9197b2cc760979ef.tar.gz otp-c635f15d22802f7ff18fd1ce9197b2cc760979ef.tar.bz2 otp-c635f15d22802f7ff18fd1ce9197b2cc760979ef.zip | |
ssl: Refactor and start implementing dtls_connection.erl
Diffstat (limited to 'lib/ssl/src/ssl_cipher.erl')
| -rw-r--r-- | lib/ssl/src/ssl_cipher.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_cipher.erl b/lib/ssl/src/ssl_cipher.erl index b2077c662a..97e8a4241f 100644 --- a/lib/ssl/src/ssl_cipher.erl +++ b/lib/ssl/src/ssl_cipher.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2007-2013. All Rights Reserved. +%% Copyright Ericsson AB 2007-2014. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -72,7 +72,7 @@ security_parameters(Version, CipherSuite, SecParams) -> hash_size = hash_size(Hash)}. %%-------------------------------------------------------------------- --spec cipher(cipher_enum(), #cipher_state{}, binary(), iolist(), tls_version()) -> +-spec cipher(cipher_enum(), #cipher_state{}, binary(), iodata(), tls_version()) -> {binary(), #cipher_state{}}. %% %% Description: Encrypts the data and the MAC using chipher described |