1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
|
Index: tss-esapi/Cargo.toml
===================================================================
--- tss-esapi.orig/Cargo.toml
+++ tss-esapi/Cargo.toml
@@ -53,7 +53,7 @@ version = "0.17"
version = "0.7.1"
[dependencies.getrandom]
-version = "0.2.11"
+version = "0.4"
#[dependencies.hostname-validator]
#version = "1.1.0"
Index: tss-esapi/src/abstraction/transient/mod.rs
===================================================================
--- tss-esapi.orig/src/abstraction/transient/mod.rs
+++ tss-esapi/src/abstraction/transient/mod.rs
@@ -147,7 +147,7 @@ impl TransientKeyContext {
let key_auth = if auth_size > 0 {
self.set_session_attrs()?;
let mut random_bytes = vec![0u8; auth_size];
- getrandom::getrandom(&mut random_bytes).map_err(|_| {
+ getrandom::fill(&mut random_bytes).map_err(|_| {
log::error!("Failed to obtain a random authvalue for key creation");
Error::WrapperError(ErrorKind::InternalError)
})?;
@@ -675,7 +675,7 @@ impl TransientKeyContextBuilder {
let root_key_auth = if self.root_key_auth_size > 0 {
let mut random = vec![0u8; self.root_key_auth_size];
- getrandom::getrandom(&mut random).map_err(|_| {
+ getrandom::fill(&mut random).map_err(|_| {
log::error!("Failed to obtain a random value for root key authentication");
Error::WrapperError(ErrorKind::InternalError)
})?;
Index: tss-esapi/tests/integration_tests/abstraction_tests/transient_key_context_tests.rs
===================================================================
--- tss-esapi.orig/tests/integration_tests/abstraction_tests/transient_key_context_tests.rs
+++ tss-esapi/tests/integration_tests/abstraction_tests/transient_key_context_tests.rs
@@ -507,7 +507,7 @@ fn ctx_migration_test() {
// one for just the public part of the key
let mut basic_ctx = crate::common::create_ctx_with_session();
let mut random_digest = vec![0u8; 16];
- getrandom::getrandom(&mut random_digest).unwrap();
+ getrandom::fill(&mut random_digest).unwrap();
let key_auth = Auth::try_from(random_digest).unwrap();
let prim_key_handle = basic_ctx
.create_primary(
Index: tss-esapi/tests/integration_tests/context_tests/tpm_commands/asymmetric_primitives_tests.rs
===================================================================
--- tss-esapi.orig/tests/integration_tests/context_tests/tpm_commands/asymmetric_primitives_tests.rs
+++ tss-esapi/tests/integration_tests/context_tests/tpm_commands/asymmetric_primitives_tests.rs
@@ -20,7 +20,7 @@ mod test_rsa_encrypt_decrypt {
fn test_encrypt_decrypt() {
let mut context = create_ctx_with_session();
let mut random_digest = vec![0u8; 16];
- getrandom::getrandom(&mut random_digest).unwrap();
+ getrandom::fill(&mut random_digest).unwrap();
let key_auth = Auth::try_from(random_digest).unwrap();
let key_handle = context
@@ -61,7 +61,7 @@ mod test_rsa_encrypt_decrypt {
fn test_ecdh() {
let mut context = create_ctx_with_session();
let mut random_digest = vec![0u8; 16];
- getrandom::getrandom(&mut random_digest).unwrap();
+ getrandom::fill(&mut random_digest).unwrap();
let key_auth = Auth::try_from(random_digest).unwrap();
let ecc_parms = PublicEccParametersBuilder::new()
Index: tss-esapi/tests/integration_tests/context_tests/tpm_commands/context_management_tests.rs
===================================================================
--- tss-esapi.orig/tests/integration_tests/context_tests/tpm_commands/context_management_tests.rs
+++ tss-esapi/tests/integration_tests/context_tests/tpm_commands/context_management_tests.rs
@@ -9,7 +9,7 @@ mod test_ctx_save {
fn test_ctx_save() {
let mut context = create_ctx_with_session();
let mut random_digest = vec![0u8; 16];
- getrandom::getrandom(&mut random_digest).unwrap();
+ getrandom::fill(&mut random_digest).unwrap();
let key_auth = Auth::try_from(random_digest).unwrap();
let key_handle = context
@@ -30,7 +30,7 @@ mod test_ctx_save {
fn test_ctx_save_leaf() {
let mut context = create_ctx_with_session();
let mut random_digest = vec![0u8; 16];
- getrandom::getrandom(&mut random_digest).unwrap();
+ getrandom::fill(&mut random_digest).unwrap();
let key_auth = Auth::try_from(random_digest).unwrap();
let prim_key_handle = context
@@ -75,7 +75,7 @@ mod test_ctx_load {
fn test_ctx_load() {
let mut context = create_ctx_with_session();
let mut random_digest = vec![0u8; 16];
- getrandom::getrandom(&mut random_digest).unwrap();
+ getrandom::fill(&mut random_digest).unwrap();
let prim_key_handle = context
.create_primary(
@@ -119,7 +119,7 @@ mod test_flush_context {
fn test_flush_ctx() {
let mut context = create_ctx_with_session();
let mut random_digest = vec![0u8; 16];
- getrandom::getrandom(&mut random_digest).unwrap();
+ getrandom::fill(&mut random_digest).unwrap();
let key_auth = Auth::try_from(random_digest).unwrap();
let key_handle = context
@@ -141,7 +141,7 @@ mod test_flush_context {
fn test_flush_parent_ctx() {
let mut context = create_ctx_with_session();
let mut random_digest = vec![0u8; 16];
- getrandom::getrandom(&mut random_digest).unwrap();
+ getrandom::fill(&mut random_digest).unwrap();
let key_auth = Auth::try_from(random_digest).unwrap();
let prim_key_handle = context
Index: tss-esapi/tests/integration_tests/context_tests/tpm_commands/enhanced_authorization_ea_commands_tests.rs
===================================================================
--- tss-esapi.orig/tests/integration_tests/context_tests/tpm_commands/enhanced_authorization_ea_commands_tests.rs
+++ tss-esapi/tests/integration_tests/context_tests/tpm_commands/enhanced_authorization_ea_commands_tests.rs
@@ -538,7 +538,7 @@ mod test_policy_authorize {
fn test_policy_authorize() {
let mut context = create_ctx_with_session();
let mut random_digest = vec![0u8; 16];
- getrandom::getrandom(&mut random_digest).unwrap();
+ getrandom::fill(&mut random_digest).unwrap();
let key_auth = Auth::try_from(random_digest).unwrap();
let key_handle = context
Index: tss-esapi/tests/integration_tests/context_tests/tpm_commands/hierarchy_commands_tests.rs
===================================================================
--- tss-esapi.orig/tests/integration_tests/context_tests/tpm_commands/hierarchy_commands_tests.rs
+++ tss-esapi/tests/integration_tests/context_tests/tpm_commands/hierarchy_commands_tests.rs
@@ -11,7 +11,7 @@ mod test_create_primary {
fn test_create_primary() {
let mut context = create_ctx_with_session();
let mut random_digest = vec![0u8; 16];
- getrandom::getrandom(&mut random_digest).unwrap();
+ getrandom::fill(&mut random_digest).unwrap();
let key_auth = Auth::try_from(random_digest).unwrap();
let key_handle = context
@@ -97,7 +97,7 @@ mod test_change_auth {
.unwrap();
let mut random_digest = vec![0u8; 16];
- getrandom::getrandom(&mut random_digest).unwrap();
+ getrandom::fill(&mut random_digest).unwrap();
let new_key_auth = Auth::try_from(random_digest).unwrap();
let new_private = context
@@ -113,7 +113,7 @@ mod test_change_auth {
let mut context = create_ctx_with_session();
let mut random_digest = vec![0u8; 16];
- getrandom::getrandom(&mut random_digest).unwrap();
+ getrandom::fill(&mut random_digest).unwrap();
let new_auth = Auth::try_from(random_digest).unwrap();
// NOTE: If this test failed on your system, you are probably running it against a
Index: tss-esapi/tests/integration_tests/context_tests/tpm_commands/object_commands_tests.rs
===================================================================
--- tss-esapi.orig/tests/integration_tests/context_tests/tpm_commands/object_commands_tests.rs
+++ tss-esapi/tests/integration_tests/context_tests/tpm_commands/object_commands_tests.rs
@@ -9,7 +9,7 @@ mod test_create {
fn test_create() {
let mut context = create_ctx_with_session();
let mut random_digest = vec![0u8; 16];
- getrandom::getrandom(&mut random_digest).unwrap();
+ getrandom::fill(&mut random_digest).unwrap();
let key_auth = Auth::try_from(random_digest).unwrap();
let prim_key_handle = context
@@ -46,7 +46,7 @@ mod test_load {
fn test_load() {
let mut context = create_ctx_with_session();
let mut random_digest = vec![0u8; 16];
- getrandom::getrandom(&mut random_digest).unwrap();
+ getrandom::fill(&mut random_digest).unwrap();
let key_auth = Auth::try_from(random_digest).unwrap();
let prim_key_handle = context
@@ -242,7 +242,7 @@ mod test_read_public {
fn test_read_public() {
let mut context = create_ctx_with_session();
let mut random_digest = vec![0u8; 16];
- getrandom::getrandom(&mut random_digest).unwrap();
+ getrandom::fill(&mut random_digest).unwrap();
let key_auth = Auth::try_from(random_digest).unwrap();
let key_handle = context
Index: tss-esapi/tests/integration_tests/context_tests/tpm_commands/signing_and_signature_verification_tests.rs
===================================================================
--- tss-esapi.orig/tests/integration_tests/context_tests/tpm_commands/signing_and_signature_verification_tests.rs
+++ tss-esapi/tests/integration_tests/context_tests/tpm_commands/signing_and_signature_verification_tests.rs
@@ -14,7 +14,7 @@ mod test_verify_signature {
fn test_verify_signature() {
let mut context = create_ctx_with_session();
let mut random_digest = vec![0u8; 16];
- getrandom::getrandom(&mut random_digest).unwrap();
+ getrandom::fill(&mut random_digest).unwrap();
let key_auth = Auth::try_from(random_digest).unwrap();
let key_handle = context
@@ -56,7 +56,7 @@ mod test_verify_signature {
fn test_verify_wrong_signature() {
let mut context = create_ctx_with_session();
let mut random_digest = vec![0u8; 16];
- getrandom::getrandom(&mut random_digest).unwrap();
+ getrandom::fill(&mut random_digest).unwrap();
let key_auth = Auth::try_from(random_digest).unwrap();
let key_handle = context
@@ -108,7 +108,7 @@ mod test_verify_signature {
fn test_verify_wrong_signature_2() {
let mut context = create_ctx_with_session();
let mut random_digest = vec![0u8; 16];
- getrandom::getrandom(&mut random_digest).unwrap();
+ getrandom::fill(&mut random_digest).unwrap();
let key_auth = Auth::try_from(random_digest).unwrap();
let key_handle = context
@@ -145,7 +145,7 @@ mod test_verify_signature {
fn test_verify_wrong_signature_3() {
let mut context = create_ctx_with_session();
let mut random_digest = vec![0u8; 16];
- getrandom::getrandom(&mut random_digest).unwrap();
+ getrandom::fill(&mut random_digest).unwrap();
let key_auth = Auth::try_from(random_digest).unwrap();
let key_handle = context
@@ -192,7 +192,7 @@ mod test_sign {
fn test_sign() {
let mut context = create_ctx_with_session();
let mut random_digest = vec![0u8; 16];
- getrandom::getrandom(&mut random_digest).unwrap();
+ getrandom::fill(&mut random_digest).unwrap();
let key_auth = Auth::try_from(random_digest).unwrap();
let key_handle = context
@@ -226,7 +226,7 @@ mod test_sign {
fn test_sign_empty_digest() {
let mut context = create_ctx_with_session();
let mut random_digest = vec![0u8; 16];
- getrandom::getrandom(&mut random_digest).unwrap();
+ getrandom::fill(&mut random_digest).unwrap();
let key_auth = Auth::try_from(random_digest).unwrap();
let key_handle = context
@@ -260,7 +260,7 @@ mod test_sign {
fn test_sign_large_digest() {
let mut context = create_ctx_with_session();
let mut random_digest = vec![0u8; 16];
- getrandom::getrandom(&mut random_digest).unwrap();
+ getrandom::fill(&mut random_digest).unwrap();
let key_auth = Auth::try_from(random_digest).unwrap();
let key_handle = context
Index: tss-esapi/tests/integration_tests/context_tests/tpm_commands/symmetric_primitives_tests.rs
===================================================================
--- tss-esapi.orig/tests/integration_tests/context_tests/tpm_commands/symmetric_primitives_tests.rs
+++ tss-esapi/tests/integration_tests/context_tests/tpm_commands/symmetric_primitives_tests.rs
@@ -26,7 +26,7 @@ mod test_encrypt_decrypt_2 {
.expect("Failed to set auth to empty for owner");
let mut random_digest = vec![0u8; 16];
- getrandom::getrandom(&mut random_digest).expect("get_rand call failed");
+ getrandom::fill(&mut random_digest).expect("get_rand call failed");
let primary_key_auth =
Auth::try_from(random_digest).expect("Failed to create primary key auth");
@@ -75,7 +75,7 @@ mod test_encrypt_decrypt_2 {
.expect("Failed to create public for symmetric key public");
let mut random_digest = vec![0u8; 16];
- getrandom::getrandom(&mut random_digest).expect("get_rand call failed");
+ getrandom::fill(&mut random_digest).expect("get_rand call failed");
let symmetric_key_auth =
Auth::try_from(random_digest).expect("Failed to create symmetric key auth");
|
