diff options
| author | Sverker Eriksson <[email protected]> | 2012-11-28 12:26:30 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2012-11-28 12:27:36 +0100 |
| commit | 0ba0ffb914fa423ef34faa233f5bd92e9fa753ab (patch) | |
| tree | 20609b83b125c179ab98e2ee0c4b549baae9c2f1 /lib/crypto/src | |
| parent | 4789aa5ab21e86e59fb0098938729d7cd46f385f (diff) | |
| parent | b7b4abaeac8e559a3a4f587d46dc0014332b517e (diff) | |
| download | otp-0ba0ffb914fa423ef34faa233f5bd92e9fa753ab.tar.gz otp-0ba0ffb914fa423ef34faa233f5bd92e9fa753ab.tar.bz2 otp-0ba0ffb914fa423ef34faa233f5bd92e9fa753ab.zip | |
Merge branch 'sverk/crypto-unloading'
* sverk/crypto-unloading:
crypto: Link crypto_callback statically
crypto: Add debug print macros
crypto: Enable runtime upgrade of crypto
crypto: Make unloading of crypto safer
OTP-10596
Diffstat (limited to 'lib/crypto/src')
| -rw-r--r-- | lib/crypto/src/crypto.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl index 0089e79a4f..21f507f153 100644 --- a/lib/crypto/src/crypto.erl +++ b/lib/crypto/src/crypto.erl @@ -114,7 +114,7 @@ -on_load(on_load/0). --define(CRYPTO_NIF_VSN,101). +-define(CRYPTO_NIF_VSN,201). on_load() -> LibBaseName = "crypto", @@ -140,7 +140,7 @@ on_load() -> end end, Lib = filename:join([PrivDir, "lib", LibName]), - Status = case erlang:load_nif(Lib, ?CRYPTO_NIF_VSN) of + Status = case erlang:load_nif(Lib, {?CRYPTO_NIF_VSN,Lib}) of ok -> ok; {error, {load_failed, _}}=Error1 -> ArchLibDir = @@ -152,7 +152,7 @@ on_load() -> [] -> Error1; _ -> ArchLib = filename:join([ArchLibDir, LibName]), - erlang:load_nif(ArchLib, ?CRYPTO_NIF_VSN) + erlang:load_nif(ArchLib, {?CRYPTO_NIF_VSN,ArchLib}) end; Error1 -> Error1 end, |