rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stronger validation of input lists for cryptographic routines

Browse Source 
Example:

    ?- crypto_data_hkdf(Var, 32, Bs, []).
    caught: error(instantiation_error,must_be/2)

Reported by @notoria in #527. Many thanks!
This commit is contained in:
Markus Triska
2020-05-18 13:28:52 +02:00
parent fd732550d8
commit a423eb5323
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/prolog/lib/crypto.pl
View File

@@ -597,12 +597,14 @@ crypto_data_decrypt(CipherText0, Algorithm, Key, IV, PlainText, Options) :-
'$crypto_data_decrypt'(CipherText, Key, IV, Encoding, PlainText). '$crypto_data_decrypt'(CipherText, Key, IV, Encoding, PlainText).
encoding_bytes(octet, Bs0, Bs) :- encoding_bytes(octet, Bs0, Bs) :-
must_be(list, Bs0),
( maplist(integer, Bs0) -> ( maplist(integer, Bs0) ->
Bs0 = Bs Bs0 = Bs
; maplist(char_code, Bs0, Bs) ; maplist(char_code, Bs0, Bs)
), ),
must_be_bytes(Bs, crypto_encoding). must_be_bytes(Bs, crypto_encoding).
encoding_bytes(utf8, Cs, Bs) :- encoding_bytes(utf8, Cs, Bs) :-
must_be(list, Cs),
( maplist(atom, Cs) -> ( maplist(atom, Cs) ->
chars_bytes_(Cs, Bs, crypto_encoding) chars_bytes_(Cs, Bs, crypto_encoding)
; domain_error(encryption_encoding, Cs, crypto) ; domain_error(encryption_encoding, Cs, crypto)