crypto: Rename block_crypto_with/without to match stream_cipher names

2 files changed, 20 insertions, 19 deletions

diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml
index 0fac3f379e..e5a3af923c 100644
--- a/lib/crypto/doc/src/crypto.xml
+++ b/lib/crypto/doc/src/crypto.xml
@@ -213,7 +213,7 @@
     </datatype>
 
     <datatype>
-      <name name="block_cipher_with_iv"/>
+      <name name="block_cipher_iv"/>
       <name name="cbc_cipher"/>
       <name name="cfb_cipher"/>
       <desc>
@@ -237,7 +237,7 @@
     </datatype>
 
     <datatype>
-      <name name="block_cipher_without_iv"/>
+      <name name="block_cipher_no_iv"/>
       <name name="ecb_cipher"/>
       <desc>
 	<p>Block ciphers without initialization vector for
@@ -582,7 +582,7 @@
       <name since="OTP R16B01">block_encrypt(aes_gcm | aes_ccm, Key, Ivec, {AAD, PlainText, TagLength}) -> {CipherText, CipherTag}</name>
       <fsummary>Encrypt <c>PlainText</c> according to <c>Type</c> block cipher</fsummary>
       <type>
-	<v>Type = <seealso marker="#type-block_cipher_with_iv">block_cipher_with_iv()</seealso></v>
+	<v>Type = <seealso marker="#type-block_cipher_iv">block_cipher_iv()</seealso></v>
 	<v>AeadType = <seealso marker="#type-aead_cipher">aead_cipher()</seealso></v>
 	<v>Key = <seealso marker="#type-key">key()</seealso> | <seealso marker="#type-des3_key">des3_key()</seealso></v>
         <v>PlainText = iodata()</v>
@@ -608,7 +608,7 @@
       <name since="OTP R16B01">block_decrypt(AeadType, Key, Ivec, {AAD, CipherText, CipherTag}) -> PlainText | error</name>
       <fsummary>Decrypt <c>CipherText</c> according to <c>Type</c> block cipher</fsummary>
       <type>
-	<v>Type = <seealso marker="#type-block_cipher_with_iv">block_cipher_with_iv()</seealso></v>
+	<v>Type = <seealso marker="#type-block_cipher_iv">block_cipher_iv()</seealso></v>
 	<v>AeadType = <seealso marker="#type-aead_cipher">aead_cipher()</seealso></v>
 	<v>Key = <seealso marker="#type-key">key()</seealso> | <seealso marker="#type-des3_key">des3_key()</seealso></v>
         <v>PlainText = iodata()</v>
diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl
index aaba81f11b..070949a1d9 100644
--- a/lib/crypto/src/crypto.erl
+++ b/lib/crypto/src/crypto.erl
@@ -281,9 +281,9 @@
                 | stream_cipher()
                 | aead_cipher() .
 
--type block_cipher() :: block_cipher_with_iv() | block_cipher_without_iv() .
+-type block_cipher() :: block_cipher_iv() | block_cipher_no_iv() .
 
--type block_cipher_with_iv() :: cbc_cipher()
+-type block_cipher_iv() :: cbc_cipher()
                               | cfb_cipher()
                               | aes_ige256
                               | blowfish_ofb64
@@ -316,7 +316,7 @@
                    | des3_cfb .
 
 
--type block_cipher_without_iv() :: ecb_cipher() .
+-type block_cipher_no_iv() :: ecb_cipher() .
 -type ecb_cipher()  :: des_ecb | blowfish_ecb | aes_ecb .
 
 -type key() :: iodata().
@@ -336,6 +336,10 @@
 
 -type crypto_integer() :: binary() | integer().
 
+%%%
+%% Exceptions error:badarg and error:notsup
+-type run_time_error() :: no_return().
+
 -compile(no_native).
 -on_load(on_load/0).
 -define(CRYPTO_NIF_VSN,302).
@@ -374,10 +378,7 @@ stop() ->
                                       | {curves,  Curves}
                                       | {rsa_opts, RSAopts},
                              Hashs :: [sha1() | sha2() | sha3() | blake2() | ripemd160 | compatibility_only_hash()],
-                             Ciphers :: [stream_cipher()
-                                         | block_cipher_with_iv() | block_cipher_without_iv()
-                                         | aead_cipher()
-                                        ],
+                             Ciphers :: [cipher()],
                              PKs :: [rsa | dss | ecdsa | dh | ecdh | ec_gf2m],
                              Macs :: [hmac | cmac | poly1305],
                              Curves :: [ec_named_curve() | edwards_curve_dh() | edwards_curve_ed()],
@@ -413,7 +414,7 @@ enable_fips_mode(_) -> ?nif_stub.
 
 -define(HASH_HASH_ALGORITHM, sha1() | sha2() | sha3() | blake2() | ripemd160 | compatibility_only_hash() ).
 
--spec hash_info(Type) -> map() when Type :: ?HASH_HASH_ALGORITHM.
+-spec hash_info(Type) -> map() | run_time_error() when Type :: ?HASH_HASH_ALGORITHM.
 
 hash_info(Type) ->
     notsup_to_error(hash_info_nif(Type)).
@@ -553,9 +554,9 @@ poly1305(Key, Data) ->
                 error(E)
         end).
 
--spec cipher_info(Type) -> map() when Type :: block_cipher_with_iv()
-                                           | aead_cipher()
-                                           | block_cipher_without_iv().
+
+-spec cipher_info(Type) -> map() | run_time_error() when Type :: cipher() .
+
 %% These ciphers are not available via the EVP interface on older cryptolibs.
 cipher_info(aes_ctr) ->
     #{block_size => 1,iv_length => 16,key_length => 32,mode => ctr_mode,type => undefined};
@@ -573,7 +574,7 @@ cipher_info(Type) ->
 
 %%%---- Block ciphers
 %%%----------------------------------------------------------------
--spec block_encrypt(Type::block_cipher_with_iv(), Key::key()|des3_key(), Ivec::binary(), PlainText::iodata()) -> binary();
+-spec block_encrypt(Type::block_cipher_iv(), Key::key()|des3_key(), Ivec::binary(), PlainText::iodata()) -> binary();
                    (Type::aead_cipher(),  Key::iodata(), Ivec::binary(), {AAD::binary(), PlainText::iodata()}) ->
                            {binary(), binary()};
                    (aes_gcm | aes_ccm, Key::iodata(), Ivec::binary(), {AAD::binary(), PlainText::iodata(), TagLength::1..16}) ->
@@ -602,14 +603,14 @@ do_block_encrypt(Type, Key, Ivec, PlainText) ->
     ?COMPAT(crypto_one_shot(Type, Key, Ivec, PlainText, true)).
 
 
--spec block_encrypt(Type::block_cipher_without_iv(), Key::key(), PlainText::iodata()) -> binary().
+-spec block_encrypt(Type::block_cipher_no_iv(), Key::key(), PlainText::iodata()) -> binary().
 
 block_encrypt(Type, Key, PlainText) ->
     ?COMPAT(crypto_one_shot(Type, Key, <<>>, PlainText, true)).
 
 %%%----------------------------------------------------------------
 %%%----------------------------------------------------------------
--spec block_decrypt(Type::block_cipher_with_iv(), Key::key()|des3_key(), Ivec::binary(), Data::iodata()) -> binary();
+-spec block_decrypt(Type::block_cipher_iv(), Key::key()|des3_key(), Ivec::binary(), Data::iodata()) -> binary();
 		   (Type::aead_cipher(), Key::iodata(), Ivec::binary(),
 		    {AAD::binary(), Data::iodata(), Tag::binary()}) -> binary() | error.
 
@@ -628,7 +629,7 @@ do_block_decrypt(Type, Key, Ivec, Data) ->
     ?COMPAT(crypto_one_shot(Type, Key, Ivec, Data, false)).
 
 
--spec block_decrypt(Type::block_cipher_without_iv(), Key::key(), Data::iodata()) -> binary().
+-spec block_decrypt(Type::block_cipher_no_iv(), Key::key(), Data::iodata()) -> binary().
 
 block_decrypt(Type, Key, Data) ->
     ?COMPAT(crypto_one_shot(Type, Key, <<>>, Data, false)).