diff options
| author | Hans Nilsson <[email protected]> | 2019-06-14 13:30:22 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2019-06-14 13:30:22 +0200 |
| commit | 1f0ed340c7801ffdd0dc569ee1fdca4197649296 (patch) | |
| tree | b583a30892ff3da2db9242257713cc040df288e8 /lib | |
| parent | 5bfa7146c04f3c7b7492cb7660db425d7d34c5a6 (diff) | |
| parent | d5a0aaf4ee45f9c046ca6e8a7f16e51079037990 (diff) | |
| download | otp-1f0ed340c7801ffdd0dc569ee1fdca4197649296.tar.gz otp-1f0ed340c7801ffdd0dc569ee1fdca4197649296.tar.bz2 otp-1f0ed340c7801ffdd0dc569ee1fdca4197649296.zip | |
Merge branch 'maint'
* maint:
crypto: Adjust code for spec conflict
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/crypto/src/crypto.erl | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl index 8ffdde2b90..169c0f2e91 100644 --- a/lib/crypto/src/crypto.erl +++ b/lib/crypto/src/crypto.erl @@ -1015,8 +1015,15 @@ crypto_dyn_iv_update(State, Data0, IV) -> EncryptFlag :: boolean(), Result :: binary() . -crypto_one_time(Cipher, Key, Data, EncryptFlag) -> - crypto_one_time(Cipher, Key, <<>>, Data, EncryptFlag). +crypto_one_time(Cipher, Key, Data0, EncryptFlag) -> + case iolist_to_binary(Data0) of + <<>> -> + <<>>; % Known to fail on OpenSSL 0.9.8h + Data -> + ng_crypto_one_time_nif(Cipher, + iolist_to_binary(Key), <<>>, Data, + EncryptFlag) + end. -spec crypto_one_time(Cipher, Key, IV, Data, EncryptFlag) -> Result | descriptive_error() |