Skip to content

Commit bc886df

Browse files
SuperhepperSuperhepper
authored
Merge pull request parallaxsecond#504 from Superhepper/interface-types-module-names
Fixes interface types module names
2 parents 23994df + cf819b5 commit bc886df

39 files changed

+94
-94
lines changed

‎tss-esapi/examples/hmac.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use tss_esapi::{
99
attributes::ObjectAttributesBuilder,
1010
interface_types::{
1111
algorithm::{HashingAlgorithm, PublicAlgorithm},
12-
resource_handles::Hierarchy,
12+
reserved_handles::Hierarchy,
1313
},
1414
structures::{
1515
Digest, KeyedHashScheme, MaxBuffer, PublicBuilder, PublicKeyedHashParameters,

‎tss-esapi/examples/rsa_oaep.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use tss_esapi::{
1010
interface_types::{
1111
algorithm::{HashingAlgorithm, PublicAlgorithm},
1212
key_bits::RsaKeyBits,
13-
resource_handles::Hierarchy,
13+
reserved_handles::Hierarchy,
1414
},
1515
structures::{
1616
CreatePrimaryKeyResult, Data, Digest, HashScheme, PublicBuilder, PublicKeyRsa,

‎tss-esapi/examples/sealed_data_object.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use tss_esapi::{
1212
attributes::ObjectAttributesBuilder,
1313
interface_types::{
1414
algorithm::{HashingAlgorithm, PublicAlgorithm},
15-
resource_handles::Hierarchy,
15+
reserved_handles::Hierarchy,
1616
},
1717
structures::{
1818
CreatePrimaryKeyResult, Digest, KeyedHashScheme, PublicBuilder, PublicKeyedHashParameters,

‎tss-esapi/src/abstraction/ek.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use crate::{
99
algorithm::{HashingAlgorithm, PublicAlgorithm},
1010
ecc::EccCurve,
1111
key_bits::RsaKeyBits,
12-
resource_handles::{Hierarchy, NvAuth},
12+
reserved_handles::{Hierarchy, NvAuth},
1313
},
1414
structures::{
1515
Digest, EccParameter, EccPoint, EccScheme, KeyDerivationFunctionScheme, Public,

‎tss-esapi/src/abstraction/nv.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use std::{
99
use crate::{
1010
constants::{tss::*, CapabilityType, PropertyTag},
1111
handles::{AuthHandle, NvIndexHandle, NvIndexTpmHandle, TpmHandle},
12-
interface_types::resource_handles::NvAuth,
12+
interface_types::reserved_handles::NvAuth,
1313
structures::{CapabilityData, MaxNvBuffer, Name, NvPublic},
1414
Context, Error, Result, WrapperErrorKind,
1515
};

‎tss-esapi/src/abstraction/transient/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use crate::{
1515
algorithm::{HashingAlgorithm, PublicAlgorithm},
1616
ecc::EccCurve,
1717
key_bits::RsaKeyBits,
18-
resource_handles::Hierarchy,
18+
reserved_handles::Hierarchy,
1919
},
2020
structures::{
2121
Auth, CreateKeyResult, Data, Digest, EccPoint, EccScheme, Public, PublicBuilder,

‎tss-esapi/src/context/general_esys_tr.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ impl Context {
6464
/// # use tss_esapi::{
6565
/// # Context, TctiNameConf, attributes::{SessionAttributes, NvIndexAttributes},
6666
/// # constants::SessionType, handles::NvIndexTpmHandle,
67-
/// # interface_types::{algorithm::HashingAlgorithm, resource_handles::Provision},
67+
/// # interface_types::{algorithm::HashingAlgorithm, reserved_handles::Provision},
6868
/// # structures::{SymmetricDefinition, NvPublic},
6969
/// # };
7070
/// # // Create context
@@ -156,7 +156,7 @@ impl Context {
156156
/// # use tss_esapi::{
157157
/// # Context, TctiNameConf, attributes::{SessionAttributes, NvIndexAttributes},
158158
/// # constants::SessionType,
159-
/// # interface_types::{algorithm::HashingAlgorithm, resource_handles::Provision},
159+
/// # interface_types::{algorithm::HashingAlgorithm, reserved_handles::Provision},
160160
/// # structures::{SymmetricDefinition, NvPublic},
161161
/// # };
162162
/// use tss_esapi::{
@@ -284,7 +284,7 @@ impl Context {
284284
/// # use tss_esapi::{
285285
/// # Context, TctiNameConf, attributes::{SessionAttributes, NvIndexAttributes},
286286
/// # constants::SessionType, handles::NvIndexTpmHandle,
287-
/// # interface_types::{algorithm::HashingAlgorithm, resource_handles::Provision},
287+
/// # interface_types::{algorithm::HashingAlgorithm, reserved_handles::Provision},
288288
/// # structures::{SymmetricDefinition, NvPublic},
289289
/// # };
290290
/// # // Create context
@@ -413,7 +413,7 @@ impl Context {
413413
/// ```rust
414414
/// # use tss_esapi::{
415415
/// # Context, TctiNameConf,
416-
/// # interface_types::resource_handles::Hierarchy,
416+
/// # interface_types::reserved_handles::Hierarchy,
417417
/// # structures::HashScheme,
418418
/// # utils::create_unrestricted_signing_ecc_public,
419419
/// # interface_types::{
@@ -481,7 +481,7 @@ impl Context {
481481
/// ```rust
482482
/// # use tss_esapi::{
483483
/// # Context, TctiNameConf,
484-
/// # interface_types::resource_handles::Hierarchy,
484+
/// # interface_types::reserved_handles::Hierarchy,
485485
/// # structures::HashScheme,
486486
/// # utils::create_unrestricted_signing_ecc_public,
487487
/// # interface_types::{

‎tss-esapi/src/context/tpm_commands/asymmetric_primitives.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ impl Context {
9595
/// # HashingAlgorithm, PublicAlgorithm, RsaDecryptAlgorithm,
9696
/// # },
9797
/// # ecc::EccCurve,
98-
/// # resource_handles::Hierarchy,
98+
/// # reserved_handles::Hierarchy,
9999
/// # },
100100
/// # structures::{
101101
/// # Auth, Data, EccScheme, PublicBuilder, PublicEccParametersBuilder, PublicKeyRsa, KeyDerivationFunctionScheme, EccPoint,
@@ -230,7 +230,7 @@ impl Context {
230230
/// # HashingAlgorithm, PublicAlgorithm, RsaDecryptAlgorithm,
231231
/// # },
232232
/// # ecc::EccCurve,
233-
/// # resource_handles::Hierarchy,
233+
/// # reserved_handles::Hierarchy,
234234
/// # },
235235
/// # structures::{
236236
/// # Auth, Data, EccScheme, PublicBuilder, PublicEccParametersBuilder, PublicKeyRsa, KeyDerivationFunctionScheme, EccPoint,

‎tss-esapi/src/context/tpm_commands/attestation_commands.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ impl Context {
5050
/// # interface_types::{
5151
/// # algorithm::{HashingAlgorithm, RsaSchemeAlgorithm, SignatureSchemeAlgorithm},
5252
/// # key_bits::RsaKeyBits,
53-
/// # resource_handles::Hierarchy,
53+
/// # reserved_handles::Hierarchy,
5454
/// # },
5555
/// # structures::{
5656
/// # RsaExponent, RsaScheme, SymmetricDefinition,
@@ -193,7 +193,7 @@ impl Context {
193193
/// # interface_types::{
194194
/// # algorithm::{HashingAlgorithm, EccSchemeAlgorithm, SignatureSchemeAlgorithm},
195195
/// # ecc::EccCurve,
196-
/// # resource_handles::Hierarchy,
196+
/// # reserved_handles::Hierarchy,
197197
/// # },
198198
/// # structures::{
199199
/// # EccScheme

‎tss-esapi/src/context/tpm_commands/context_management.rs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
use crate::{
44
context::handle_manager::HandleDropAction,
55
handles::{handle_conversion::TryIntoNotNone, AuthHandle, ObjectHandle, PersistentTpmHandle},
6-
interface_types::{dynamic_handles::Persistent, resource_handles::Provision},
6+
interface_types::{data_handles::Persistent, reserved_handles::Provision},
77
tss2_esys::{Esys_ContextLoad, Esys_ContextSave, Esys_EvictControl, Esys_FlushContext},
88
utils::TpmsContext,
99
Context, Result, ReturnCode,
@@ -66,7 +66,7 @@ impl Context {
6666
/// # SessionType,
6767
/// # },
6868
/// # interface_types::{
69-
/// # resource_handles::Hierarchy,
69+
/// # reserved_handles::Hierarchy,
7070
/// # algorithm::{HashingAlgorithm, RsaSchemeAlgorithm},
7171
/// # key_bits::RsaKeyBits,
7272
/// # },
@@ -182,7 +182,7 @@ impl Context {
182182
/// # handles::PcrHandle,
183183
/// # structures::{Digest, CapabilityData, Auth, RsaExponent, SymmetricDefinitionObject},
184184
/// # interface_types::{
185-
/// # resource_handles::Hierarchy,
185+
/// # reserved_handles::Hierarchy,
186186
/// # key_bits::RsaKeyBits,
187187
/// # },
188188
/// # handles::{ObjectHandle, TpmHandle, PersistentTpmHandle},
@@ -213,9 +213,9 @@ impl Context {
213213
/// # context.execute_with_session(Some(tss_esapi::interface_types::session_handles::AuthSession::Password), |ctx| {
214214
/// # ctx
215215
/// # .evict_control(
216-
/// # tss_esapi::interface_types::resource_handles::Provision::Owner,
216+
/// # tss_esapi::interface_types::reserved_handles::Provision::Owner,
217217
/// # handle,
218-
/// # tss_esapi::interface_types::dynamic_handles::Persistent::Persistent(persistent_tpm_handle),
218+
/// # tss_esapi::interface_types::data_handles::Persistent::Persistent(persistent_tpm_handle),
219219
/// # )
220220
/// # .expect("Failed to evict persistent handle")
221221
/// # });
@@ -252,8 +252,8 @@ impl Context {
252252
/// # });
253253
/// use tss_esapi::{
254254
/// interface_types::{
255-
/// resource_handles::Provision,
256-
/// dynamic_handles::Persistent,
255+
/// reserved_handles::Provision,
256+
/// data_handles::Persistent,
257257
/// session_handles::AuthSession,
258258
/// },
259259
/// };
@@ -301,7 +301,7 @@ impl Context {
301301
/// # handles::PcrHandle,
302302
/// # structures::{Digest, CapabilityData, Auth, RsaExponent, SymmetricDefinitionObject},
303303
/// # interface_types::{
304-
/// # resource_handles::Hierarchy,
304+
/// # reserved_handles::Hierarchy,
305305
/// # key_bits::RsaKeyBits,
306306
/// # },
307307
/// # handles::{ObjectHandle, TpmHandle, PersistentTpmHandle},
@@ -332,9 +332,9 @@ impl Context {
332332
/// # context.execute_with_session(Some(tss_esapi::interface_types::session_handles::AuthSession::Password), |ctx| {
333333
/// # ctx
334334
/// # .evict_control(
335-
/// # tss_esapi::interface_types::resource_handles::Provision::Owner,
335+
/// # tss_esapi::interface_types::reserved_handles::Provision::Owner,
336336
/// # handle,
337-
/// # tss_esapi::interface_types::dynamic_handles::Persistent::Persistent(persistent_tpm_handle),
337+
/// # tss_esapi::interface_types::data_handles::Persistent::Persistent(persistent_tpm_handle),
338338
/// # )
339339
/// # .expect("Failed to evict persistent handle")
340340
/// # });
@@ -371,8 +371,8 @@ impl Context {
371371
/// # });
372372
/// use tss_esapi::{
373373
/// interface_types::{
374-
/// resource_handles::Provision,
375-
/// dynamic_handles::Persistent,
374+
/// reserved_handles::Provision,
375+
/// data_handles::Persistent,
376376
/// session_handles::AuthSession,
377377
/// },
378378
/// };

0 commit comments

Comments
 (0)