aboutsummaryrefslogtreecommitdiff
path: root/CpriSym.c
diff options
context:
space:
mode:
authorVadim Bendebury <vbendeb@chromium.org>2015-05-29 12:58:51 -0700
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>2015-06-03 21:17:52 +0000
commitbceae45efbd960f67c63b8ab08a43c91b2a5d950 (patch)
treefbf5654c67807105f05c15d35d62bea6515b27e0 /CpriSym.c
parent42c3ea1c960c7aa447184204856819e75c0af6f9 (diff)
downloadtpm2-bceae45efbd960f67c63b8ab08a43c91b2a5d950.tar.gz
Changes to allow compilation of CpriSym.c
BUG=none TEST=compilation succeeds: cc -Wall -Werror -c -o /dev/null CpriSym.c Change-Id: I04fec3fde8fe841a520420e02244c0297e35c0d2 Signed-off-by: Vadim Bendebury <vbendeb@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/274103 Reviewed-by: Darren Krahn <dkrahn@chromium.org>
Diffstat (limited to 'CpriSym.c')
-rw-r--r--CpriSym.c79
1 files changed, 1 insertions, 78 deletions
diff --git a/CpriSym.c b/CpriSym.c
index 755a036..e05a4d1 100644
--- a/CpriSym.c
+++ b/CpriSym.c
@@ -344,26 +344,6 @@ _cpri__AESEncryptCTR(
return CRYPT_SUCCESS;
}
//
-// _cpri__AESDecryptCTR()
-//
-// Counter mode decryption uses the same algorithm as encryption. The _cpri__AESDecryptCTR() function
-// is implemented as a macro call to _cpri__AESEncryptCTR(). (skip)
-//
-//% #define _cpri__AESDecryptCTR(dOut, keySize, key, iv, dInSize, dIn) \
-//% _cpri__AESEncryptCTR( \
-//% ((BYTE *)dOut), \
-//% ((UINT32)keySize), \
-//% ((BYTE *)key), \
-//% ((BYTE *)iv), \
-//% ((UINT32)dInSize), \
-//% ((BYTE *)dIn) \
-//% )
-//%
-// The //% is used by the prototype extraction program to cause it to include the
-// line in the prototype file after removing the //%. Need an extra line with
-//
-// nothing on it so that a blank line will separate this macro from the next definition.
-//
// _cpri__AESEncryptECB()
//
// AES encryption in ECB mode. The data buffer is modified to contain the cipher text.
@@ -499,25 +479,7 @@ _cpri__AESEncryptOFB(
}
return CRYPT_SUCCESS;
}
-//
-//
-// _cpri__AESDecryptOFB()
-//
-// OFB encryption and decryption use the same algorithms for both. The _cpri__AESDecryptOFB() function
-// is implemented as a macro call to _cpri__AESEncrytOFB(). (skip)
-//
-//%#define _cpri__AESDecryptOFB(dOut,keySizeInBits, key, iv, dInSize, dIn) \
-//% _cpri__AESEncryptOFB ( \
-//% ((BYTE *)dOut), \
-//% ((UINT32)keySizeInBits), \
-//% ((BYTE *)key), \
-//% ((BYTE *)iv), \
-//% ((UINT32)dInSize), \
-//% ((BYTE *)dIn) \
-//% )
-//%
-//
-#ifdef TPM_ALG_SM4 //%
+#ifdef TPM_ALG_SM4
//
//
// SM4 Encryption
@@ -795,28 +757,6 @@ _cpri__SM4EncryptCTR(
return CRYPT_SUCCESS;
}
//
-//
-// _cpri__SM4DecryptCTR()
-//
-// Counter mode decryption uses the same algorithm as encryption. The _cpri__SM4DecryptCTR() function
-// is implemented as a macro call to _cpri__SM4EncryptCTR(). (skip)
-//
-//% #define _cpri__SM4DecryptCTR(dOut, keySize, key, iv, dInSize, dIn) \
-//% _cpri__SM4EncryptCTR( \
-//% ((BYTE *)dOut), \
-//% ((UINT32)keySize), \
-//% ((BYTE *)key), \
-//% ((BYTE *)iv), \
-//% ((UINT32)dInSize), \
-//
-//% ((BYTE *)dIn) \
-//% )
-//%
-// The //% is used by the prototype extraction program to cause it to include the
-// line in the prototype file after removing the //%. Need an extra line with
-//
-// nothing on it so that a blank line will separate this macro from the next definition.
-//
// _cpri__SM4EncryptECB()
//
// SM4 encryption in ECB mode. The data buffer is modified to contain the cipher text.
@@ -952,21 +892,4 @@ _cpri__SM4EncryptOFB(
}
return CRYPT_SUCCESS;
}
-//
-//
-// _cpri__SM4DecryptOFB()
-//
-// OFB encryption and decryption use the same algorithms for both. The _cpri__SM4DecryptOFB() function
-// is implemented as a macro call to _cpri__SM4EncrytOFB(). (skip)
-//
-//%#define _cpri__SM4DecryptOFB(dOut,keySizeInBits, key, iv, dInSize, dIn) \
-//% _cpri__SM4EncryptOFB ( \
-//% ((BYTE *)dOut), \
-//% ((UINT32)keySizeInBits), \
-//% ((BYTE *)key), \
-//% ((BYTE *)iv), \
-//% ((UINT32)dInSize), \
-//% ((BYTE *)dIn) \
-//% )
-//%
#endif //% TPM_ALG_SM4