@@ -13,17 +13,17 @@ pub struct GenerateVector {
13
13
14
14
impl GenerateVector {
15
15
pub fn verify < K : KemCore > ( & self ) {
16
- let d = Array :: from_slice ( & self . d ) ;
17
- let z = Array :: from_slice ( & self . z ) ;
18
- let ( dk, ek) = K :: generate_deterministic ( d, z) ;
16
+ let d = Array :: try_from ( self . d ) . unwrap ( ) ;
17
+ let z = Array :: try_from ( self . z ) . unwrap ( ) ;
18
+ let ( dk, ek) = K :: generate_deterministic ( & d, & z) ;
19
19
assert_eq ! ( dk. as_bytes( ) . as_slice( ) , self . dk) ;
20
20
assert_eq ! ( ek. as_bytes( ) . as_slice( ) , self . ek) ;
21
21
22
- let dk_bytes = Encoded :: < K :: DecapsulationKey > :: from_slice ( self . dk ) ;
23
- assert_eq ! ( dk, K :: DecapsulationKey :: from_bytes( dk_bytes) ) ;
22
+ let dk_bytes = Encoded :: < K :: DecapsulationKey > :: try_from ( self . dk ) . unwrap ( ) ;
23
+ assert_eq ! ( dk, K :: DecapsulationKey :: from_bytes( & dk_bytes) ) ;
24
24
25
- let ek_bytes = Encoded :: < K :: EncapsulationKey > :: from_slice ( self . ek ) ;
26
- assert_eq ! ( ek, K :: EncapsulationKey :: from_bytes( ek_bytes) ) ;
25
+ let ek_bytes = Encoded :: < K :: EncapsulationKey > :: try_from ( self . ek ) . unwrap ( ) ;
26
+ assert_eq ! ( ek, K :: EncapsulationKey :: from_bytes( & ek_bytes) ) ;
27
27
}
28
28
}
29
29
@@ -36,10 +36,10 @@ pub struct EncapsulateVector {
36
36
37
37
impl EncapsulateVector {
38
38
pub fn verify < K : KemCore > ( & self ) {
39
- let m = Array :: from_slice ( & self . m ) ;
40
- let ek_bytes = Encoded :: < K :: EncapsulationKey > :: from_slice ( self . ek ) ;
41
- let ek = K :: EncapsulationKey :: from_bytes ( ek_bytes) ;
42
- let ( c, k) = ek. encapsulate_deterministic ( m) . unwrap ( ) ;
39
+ let m = Array :: try_from ( self . m ) . unwrap ( ) ;
40
+ let ek_bytes = Encoded :: < K :: EncapsulationKey > :: try_from ( self . ek ) . unwrap ( ) ;
41
+ let ek = K :: EncapsulationKey :: from_bytes ( & ek_bytes) ;
42
+ let ( c, k) = ek. encapsulate_deterministic ( & m) . unwrap ( ) ;
43
43
assert_eq ! ( k. as_slice( ) , & self . k) ;
44
44
assert_eq ! ( c. as_slice( ) , self . c) ;
45
45
}
@@ -53,11 +53,11 @@ pub struct DecapsulateVector {
53
53
54
54
impl DecapsulateVector {
55
55
pub fn verify < K : KemCore > ( & self ) {
56
- let dk_bytes = Encoded :: < K :: DecapsulationKey > :: from_slice ( self . dk ) ;
57
- let dk = K :: DecapsulationKey :: from_bytes ( dk_bytes) ;
56
+ let dk_bytes = Encoded :: < K :: DecapsulationKey > :: try_from ( self . dk ) . unwrap ( ) ;
57
+ let dk = K :: DecapsulationKey :: from_bytes ( & dk_bytes) ;
58
58
59
- let c_bytes = Ciphertext :: < K > :: from_slice ( self . c ) ;
60
- let k = dk. decapsulate ( c_bytes) . unwrap ( ) ;
59
+ let c_bytes = Ciphertext :: < K > :: try_from ( self . c ) . unwrap ( ) ;
60
+ let k = dk. decapsulate ( & c_bytes) . unwrap ( ) ;
61
61
assert_eq ! ( k. as_slice( ) , & self . k) ;
62
62
}
63
63
}
0 commit comments