diff options
| author | Henrik Nord <[email protected]> | 2011-12-06 16:26:15 +0100 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2011-12-06 16:26:40 +0100 |
| commit | 3996fd94136ceb850fd93c732daeab919ffdcb88 (patch) | |
| tree | 0feab389e9375f321bdd6676c45a3532ed39ac06 /lib/ssl/src/ssl_cipher.erl | |
| parent | 5f1bee4f92dd991364606f968ca2ec647ba8b33d (diff) | |
| parent | f3052a3a1a78c5cb5135c5c96c64ae4a39433745 (diff) | |
| download | otp-3996fd94136ceb850fd93c732daeab919ffdcb88.tar.gz otp-3996fd94136ceb850fd93c732daeab919ffdcb88.tar.bz2 otp-3996fd94136ceb850fd93c732daeab919ffdcb88.zip | |
Merge branch 'ta/docs'
* ta/docs:
Fix misspelling of chosen
Fix typos in erl(1)
Fix misspelling of 'turn off'
Fix typo in reltool(3)
Fix typo in gen_sctp(3)
Fix typo in mod_responsecontrol.erl
Fix typo in erts_alloc(3)
Fix typos in ssl_cipher.erl
Fix typos in expressions.xml
file: correct make_link/2 and make_symlink/2 docs
Fix typo in test_server(3)
Fix typos in io_protocol.xml
Fix typo in erlang(3)
Fix typos in tar_SUITE
Fix typos in erts/preloaded/src
OTP-9787
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 95a5efd6d0..015265441e 100644 --- a/lib/ssl/src/ssl_cipher.erl +++ b/lib/ssl/src/ssl_cipher.erl @@ -166,7 +166,7 @@ block_decipher(Fun, #cipher_state{key=Key, iv=IV} = CipherState0, false -> %% decryption failed or invalid padding, %% intentionally break Content to make - %% sure a packet with a an invalid padding + %% sure a packet with invalid padding %% but otherwise correct data will fail %% the MAC test later {<<16#F0, Content/binary>>, Mac, CipherState1} @@ -523,7 +523,7 @@ hash_size(sha) -> %% %% implementation note: %% We return the original (possibly invalid) PadLength in any case. -%% A invalid PadLength will be cought by is_correct_padding/2 +%% An invalid PadLength will be caught by is_correct_padding/2 %% generic_block_cipher_from_bin(T, HashSize) -> Sz1 = byte_size(T) - 1, |