diff options
| author | Sverker Eriksson <[email protected]> | 2012-12-05 11:09:55 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2012-12-05 11:09:55 +0100 |
| commit | 11f4ef24c45fa8b01bb35adc0479e4eba98a05ed (patch) | |
| tree | d926f43ecffb5e9a35aaaf2265f660ce2c4363a7 /lib/crypto/doc/src/crypto.xml | |
| parent | 33334fe5f0527ffd02f578601546717773fd55c9 (diff) | |
| parent | 0edde92eb70f4d6bc058e53fd7a39e255a206773 (diff) | |
| download | otp-11f4ef24c45fa8b01bb35adc0479e4eba98a05ed.tar.gz otp-11f4ef24c45fa8b01bb35adc0479e4eba98a05ed.tar.bz2 otp-11f4ef24c45fa8b01bb35adc0479e4eba98a05ed.zip | |
Merge branch 'sverk/crypto-openssl-0.9.7'
* sverk/crypto-openssl-0.9.7:
crypto: Skip sha256/512 tests for openssl 0.9.7
crypto: Refactor test with if_098 helper function
crypto: Let info_lib return header version instead of lib version
crypto: Make crypto:info() up to date
crypto: Add some unlisted test cases as part of the test suite
crypto: Fix some documentation bugs
crypto: Throw notsup for DES3 CFB encryption for old openssl
Diffstat (limited to 'lib/crypto/doc/src/crypto.xml')
| -rw-r--r-- | lib/crypto/doc/src/crypto.xml | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml index 4dcd6fc4ea..3e533158c8 100644 --- a/lib/crypto/doc/src/crypto.xml +++ b/lib/crypto/doc/src/crypto.xml @@ -115,6 +115,12 @@ Mpint() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]> > <input>info_lib().</input> [{<<"OpenSSL">>,9469983,<<"OpenSSL 0.9.8a 11 Oct 2005">>}] </pre> + <note><p> + From OTP R16 the <em>numeric version</em> represents the version of the OpenSSL + <em>header files</em> (<c>openssl/opensslv.h</c>) used when crypto was compiled. + The text variant represents the OpenSSL library used at runtime. + In earlier OTP versions both numeric and text was taken from the library. + </p></note> </desc> </func> <func> @@ -265,6 +271,8 @@ Mpint() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]> </type> <desc> <p>Computes a message digest of type <c>Type</c> from <c>Data</c>.</p> + <p>May throw exception <c>notsup</c> in case the chosen <c>Type</c> + is not supported by the underlying OpenSSL implementation.</p> </desc> </func> <func> @@ -277,6 +285,8 @@ Mpint() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]> <p>Initializes the context for streaming hash operations. <c>Type</c> determines which digest to use. The returned context should be used as argument to <seealso marker="#hash_update/2">hash_update</seealso>.</p> + <p>May throw exception <c>notsup</c> in case the chosen <c>Type</c> + is not supported by the underlying OpenSSL implementation.</p> </desc> </func> <func> @@ -548,6 +558,8 @@ Mpint() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]> keys, and <c>IVec</c> is an arbitrary initializing vector. The lengths of each of <c>Key1</c>, <c>Key2</c>, <c>Key3</c> and <c>IVec</c> must be 64 bits (8 bytes).</p> + <p>May throw exception <c>notsup</c> for old OpenSSL + versions (0.9.7) that does not support this encryption mode.</p> </desc> </func> <func> @@ -565,6 +577,8 @@ Mpint() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]> and <c>IVec</c> must have the same values as those used when encrypting. The lengths of <c>Key1</c>, <c>Key2</c>, <c>Key3</c>, and <c>IVec</c> must be 64 bits (8 bytes).</p> + <p>May throw exception <c>notsup</c> for old OpenSSL + versions (0.9.7) that does not support this encryption mode.</p> </desc> </func> |