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

use new domain names from library(error): octet_character, octet_chars

Browse Source
This commit is contained in:
Markus Triska
2022-08-22 22:08:10 +02:00
committed by Mark Thom
parent 5ec837acb4
commit 70da818101
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/charsio.pl
View File

@@ -251,7 +251,7 @@ chars_base64(Cs, Bs, Options) :-
'$chars_base64'(Cs, Bs, Padding, Charset) '$chars_base64'(Cs, Bs, Padding, Charset)
; must_be(chars, Cs), ; must_be(chars, Cs),
( '$first_non_octet'(Cs, N) -> ( '$first_non_octet'(Cs, N) ->
domain_error(byte_char, N, chars_base64/3) domain_error(octet_character, N, chars_base64/3)
; '$chars_base64'(Cs, Bs, Padding, Charset) ; '$chars_base64'(Cs, Bs, Padding, Charset)
) )
). ).

12
src/lib/crypto.pl
View File

@@ -104,10 +104,10 @@ must_be_bytes(Bytes, Context) :-
). ).
must_be_byte_chars(Chars, Context) :- must_be_octet_chars(Chars, Context) :-
must_be(chars, Chars), must_be(chars, Chars),
( '$first_non_octet'(Chars, F) -> ( '$first_non_octet'(Chars, F) ->
domain_error(byte_char, F, Context) domain_error(octet_character, F, Context)
; true ; true
). ).
@@ -611,7 +611,7 @@ encoding_chars(octet, Bs, Cs) :-
maplist(char_code, Cs, Bs) maplist(char_code, Cs, Bs)
; Bs = Cs ; Bs = Cs
), ),
must_be_byte_chars(Cs, crypto_encoding). must_be_octet_chars(Cs, crypto_encoding).
encoding_chars(utf8, Cs, Cs) :- encoding_chars(utf8, Cs, Cs) :-
must_be(chars, Cs). must_be(chars, Cs).
@@ -652,17 +652,17 @@ ed25519_new_keypair(Pair) :-
'$ed25519_new_keypair'(Pair). '$ed25519_new_keypair'(Pair).
ed25519_keypair_public_key(Pair, PublicKey) :- ed25519_keypair_public_key(Pair, PublicKey) :-
must_be_byte_chars(Pair, ed25519_keypair_public_key), must_be_octet_chars(Pair, ed25519_keypair_public_key),
'$ed25519_keypair_public_key'(Pair, PublicKey). '$ed25519_keypair_public_key'(Pair, PublicKey).
ed25519_sign(Key, Data0, Signature, Options) :- ed25519_sign(Key, Data0, Signature, Options) :-
must_be_byte_chars(Key, ed25519_sign), must_be_octet_chars(Key, ed25519_sign),
options_data_chars(Options, Data0, Data, Encoding), options_data_chars(Options, Data0, Data, Encoding),
'$ed25519_sign'(Key, Data, Encoding, Signature0), '$ed25519_sign'(Key, Data, Encoding, Signature0),
hex_bytes(Signature, Signature0). hex_bytes(Signature, Signature0).
ed25519_verify(Key, Data0, Signature0, Options) :- ed25519_verify(Key, Data0, Signature0, Options) :-
must_be_byte_chars(Key, ed25519_verify), must_be_octet_chars(Key, ed25519_verify),
options_data_chars(Options, Data0, Data, Encoding), options_data_chars(Options, Data0, Data, Encoding),
hex_bytes(Signature0, Signature), hex_bytes(Signature0, Signature),
'$ed25519_verify'(Key, Data, Encoding, Signature). '$ed25519_verify'(Key, Data, Encoding, Signature).

2
src/lib/pio.pl
View File

@@ -91,7 +91,7 @@ phrase_to_stream(GRBody, Stream) :-
must_be(chars, Cs), must_be(chars, Cs),
( stream_property(Stream, type(binary)) -> ( stream_property(Stream, type(binary)) ->
( '$first_non_octet'(Cs, N) -> ( '$first_non_octet'(Cs, N) ->
domain_error(byte_char, N, phrase_to_stream/2) domain_error(octet_character, N, phrase_to_stream/2)
; true ; true
) )
; true ; true