aboutsummaryrefslogtreecommitdiff
path: root/Import.c
diff options
context:
space:
mode:
authorVadim Bendebury <vbendeb@chromium.org>2015-10-16 09:35:42 -0700
committerchrome-bot <chrome-bot@chromium.org>2015-10-16 19:46:20 +0000
commit065e0d7552ad876e067e56dcd8cc2a8f84bd8cc4 (patch)
tree6e19781e4d2dc07a8e127a72c655499007ca963e /Import.c
parent06134407fe531c7c0169e8f90ae84a2bf1a546d4 (diff)
downloadtpm2-065e0d7552ad876e067e56dcd8cc2a8f84bd8cc4.tar.gz
Replace TPM_RCS_xxx with TPM_RC_xxx
The code scraped from the TPM2 library uses return code names prefixed with TPM_RC_. But in a few places in the code the TPM_RCS_ prefix is used. TPM_RCS_ prefixed values are not defined anywhere, form the code logic they are equivalent to the corresponding TPM_RC_ prefixed values. This patch makes sure the consistent naming is used. BUG=chrome-os-partner:44608 TEST=the tests still pass. Change-Id: I342de9bdc6dd1e70e3c8268d38f02c9429980cfc Signed-off-by: Vadim Bendebury <vbendeb@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/306650 Reviewed-by: Utkarsh Sanghi <usanghi@chromium.org>
Diffstat (limited to 'Import.c')
-rw-r--r--Import.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/Import.c b/Import.c
index a5e80a1..fef4b66 100644
--- a/Import.c
+++ b/Import.c
@@ -106,11 +106,11 @@ TPM2_Import(
// If input symmetric algorithm is NULL, input symmetric key size must
// be 0 as well
if(in->encryptionKey.t.size != 0)
- return TPM_RCS_SIZE + RC_Import_encryptionKey;
+ return TPM_RC_SIZE + RC_Import_encryptionKey;
// If encryptedDuplication is SET, then the object must have an inner
// wrapper
if(in->objectPublic.t.publicArea.objectAttributes.encryptedDuplication)
- return TPM_RCS_ATTRIBUTES + RC_Import_encryptionKey;
+ return TPM_RC_ATTRIBUTES + RC_Import_encryptionKey;
}
// See if there is an outer wrapper
@@ -131,7 +131,7 @@ TPM2_Import(
// If encrytpedDuplication is set, then the object must have an outer
// wrapper
if(in->objectPublic.t.publicArea.objectAttributes.encryptedDuplication)
- return TPM_RCS_ATTRIBUTES + RC_Import_inSymSeed;
+ return TPM_RC_ATTRIBUTES + RC_Import_inSymSeed;
data.t.size = 0;
}