diff options
author | Lars Thorsen <[email protected]> | 2018-08-23 10:17:12 +0200 |
---|---|---|
committer | Lars Thorsen <[email protected]> | 2018-08-23 10:17:12 +0200 |
commit | 4479223613dc6a0e82059c310b13fd072b9e31a3 (patch) | |
tree | b4a9c8b3c92113d31353ba5a66b1813bc24d498c /lib/crypto/doc/src/engine_load.xml | |
parent | 5ed84b869a3f54a7132932226a72b6f5dd6f7457 (diff) | |
parent | 8bb0d5d4049b6b2ec41f6cc3e154e9f688029bef (diff) | |
download | otp-4479223613dc6a0e82059c310b13fd072b9e31a3.tar.gz otp-4479223613dc6a0e82059c310b13fd072b9e31a3.tar.bz2 otp-4479223613dc6a0e82059c310b13fd072b9e31a3.zip |
Merge branch 'maint-20' into maint
* maint-20:
Updated OTP version
Prepare release
Updated the engine load functionality
Clean up bag index tables
Conflicts:
OTP_VERSION
lib/crypto/c_src/crypto.c
lib/crypto/doc/src/notes.xml
lib/crypto/vsn.mk
lib/mnesia/doc/src/notes.xml
lib/mnesia/vsn.mk
otp_versions.table
Diffstat (limited to 'lib/crypto/doc/src/engine_load.xml')
-rw-r--r-- | lib/crypto/doc/src/engine_load.xml | 31 |
1 files changed, 25 insertions, 6 deletions
diff --git a/lib/crypto/doc/src/engine_load.xml b/lib/crypto/doc/src/engine_load.xml index e5c3f5d561..3d0aa0c32a 100644 --- a/lib/crypto/doc/src/engine_load.xml +++ b/lib/crypto/doc/src/engine_load.xml @@ -42,6 +42,9 @@ operations. The hardware implementation usually offers improved performance over its software-based counterpart, which is known as cryptographic acceleration. </p> + <note> + <p>The file name requirement on the engine dynamic library can differ between SSL versions.</p> + </note> </section> <section> @@ -54,9 +57,6 @@ <code> 1> {ok, Engine} = crypto:engine_load(<<"otp_test_engine">>, [], []). {ok, #Ref}</code> - <note> - <p>The file name requirement on the engine dynamic library can differ between SSL versions.</p> - </note> </section> <section> @@ -72,9 +72,6 @@ <<"LOAD">>], []). {ok, #Ref}</code> - <note> - <p>The dynamic engine is not supported in LibreSSL from version 2.2.1</p> - </note> </section> <section> @@ -100,6 +97,28 @@ engine_method_pkey_meths, engine_method_pkey_asn1_meths]. </section> <section> + <title>Load with the ensure loaded function</title> + <p> + This function makes sure the engine is loaded just once and the ID is added to the internal + engine list of OpenSSL. The following calls to the function will check if the ID is loaded + and then just get a new reference to the engine. + </p> + <code> + 5> {ok, Engine} = crypto:ensure_engine_loaded(<<"MD5">>, + <<"/some/path/otp_test_engine.so">>). + {ok, #Ref}</code> + <p> + To unload it use crypto:ensure_engine_unloaded/1 which removes the ID from the internal list + before unloading the engine. + </p> + <code> + 6> crypto:ensure_engine_unloaded(<<"MD5">>). + ok</code> + </section> + + + + <section> <title>List all engines currently loaded</title> <code> 5> crypto:engine_list(). |