aboutsummaryrefslogtreecommitdiffstats
path: root/lib/crypto/doc
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2013-05-16 12:20:36 +0200
committerIngela Anderton Andin <[email protected]>2013-05-20 08:41:52 +0200
commitf706e003a2f6cb3f1f31b9d1294b379c2ab3affe (patch)
tree4e51c75e9a1c4615cbfc8864b3171621d25539f7 /lib/crypto/doc
parentb7c3c6f3548b77edd3e43bf5e9dde3e94111960a (diff)
downloadotp-f706e003a2f6cb3f1f31b9d1294b379c2ab3affe.tar.gz
otp-f706e003a2f6cb3f1f31b9d1294b379c2ab3affe.tar.bz2
otp-f706e003a2f6cb3f1f31b9d1294b379c2ab3affe.zip
ssh & crypto: Remove use of deprecated crypto functions from ssh
Diffstat (limited to 'lib/crypto/doc')
-rw-r--r--lib/crypto/doc/src/crypto.xml16
1 files changed, 15 insertions, 1 deletions
diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml
index df765ade87..cac8f6ef28 100644
--- a/lib/crypto/doc/src/crypto.xml
+++ b/lib/crypto/doc/src/crypto.xml
@@ -186,6 +186,20 @@
</p>
</desc>
</func>
+
+ <func>
+ <name>binary_to_integer(Bin) -> Integer </name>
+ <fsummary>Convert binary representation, of an integer, to an Erlang integer.</fsummary>
+ <type>
+ <v>Bin = binary() - as returned by crypto functions</v>
+
+ <v>Integer = integer() </v>
+ </type>
+ <desc>
+ <p>Convert binary representation, of an integer, to an Erlang integer.
+ </p>
+ </desc>
+ </func>
<func>
<name>compute_key(Type, OthersPublicKey, MyPrivateKey, Params) -> SharedSecret</name>
@@ -410,7 +424,7 @@
<name>next_iv(Type, Data) -> </name>
<fsummary></fsummary>
<type>
- <v>Type = des_cbc | aes_cbc</v>
+ <v>Type = des_cbc | des3_cbc |aes_cbc | des_cfb</v>
<v>Data = iodata()</v>
</type>
<desc>