New upstream version 5.7.0

1 files changed, 0 insertions, 123 deletions

diff --git a/src/libtpmtss/tpm_tss_tss2_names.c b/src/libtpmtss/tpm_tss_tss2_names.c
deleted file mode 100644
index a613ac566..000000000
--- a/src/libtpmtss/tpm_tss_tss2_names.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (C) 2016 Andreas Steffen
- * HSR Hochschule fuer Technik Rapperswil
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- */
-
-#include "tpm_tss_tss2_names.h"
-
-#ifdef TSS_TSS2
-
-#include <tpm20.h>
-
-#ifndef TPM_ALG_ECMQV
-#define TPM_ALG_ECMQV		(TPM_ALG_ID)0x001D
-#endif
-
-#ifndef TPM_ALG_CAMELLIA
-#define TPM_ALG_CAMELLIA	(TPM_ALG_ID)0x0026
-#endif
-
-/**
- * TPM 2.0 algorithm ID names
- */
-ENUM_BEGIN(tpm_alg_id_names, TPM_ALG_ERROR, TPM_ALG_RSA,
-	"ERROR",
-	"RSA"
-);
-ENUM_NEXT(tpm_alg_id_names, TPM_ALG_SHA1, TPM_ALG_KEYEDHASH, TPM_ALG_RSA,
-	"SHA1",
-	"HMAC",
-	"AES",
-	"MGF1",
-	"KEYEDHASH"
-);
-ENUM_NEXT(tpm_alg_id_names, TPM_ALG_XOR, TPM_ALG_SHA512, TPM_ALG_KEYEDHASH,
-	"XOR",
-	"SHA256",
-	"SHA384",
-	"SHA512"
-);
-ENUM_NEXT(tpm_alg_id_names, TPM_ALG_NULL, TPM_ALG_NULL, TPM_ALG_SHA512,
-	"NULL"
-);
-ENUM_NEXT(tpm_alg_id_names, TPM_ALG_SM3_256, TPM_ALG_ECMQV, TPM_ALG_NULL,
-	"SM3_256",
-	"SM4",
-	"RSASSA",
-	"RSAES",
-	"RSAPSS",
-	"OAEP",
-	"ECDSA",
-	"ECDH",
-	"SM2",
-	"ECSCHNORR",
-	"ECMQV"
-);
-ENUM_NEXT(tpm_alg_id_names, TPM_ALG_KDF1_SP800_56A, TPM_ALG_ECC, TPM_ALG_ECMQV,
-	"KDF1_SP800_56A",
-	"KDF2",
-	"KDF1_SP800_108",
-	"ECC"
-);
-ENUM_NEXT(tpm_alg_id_names, TPM_ALG_SYMCIPHER, TPM_ALG_CAMELLIA, TPM_ALG_ECC,
-	"SYMCIPHER",
-	"CAMELLIA"
-);
-ENUM_NEXT(tpm_alg_id_names, TPM_ALG_CTR, TPM_ALG_ECB, TPM_ALG_CAMELLIA,
-	"CTR",
-	"OFB",
-	"CBC",
-	"CFB",
-	"ECB"
-);
-ENUM_END(tpm_alg_id_names, TPM_ALG_ECB);
-
-/**
- * TPM 2.0 ECC curve names
- */
-ENUM_BEGIN(tpm_ecc_curve_names, TPM_ECC_NONE, TPM_ECC_NIST_P521,
-	"NONE",
-	"NIST_P192",
-	"NIST_P224",
-	"NIST_P256",
-	"NIST_P384",
-	"NIST_P521"
-);
-ENUM_NEXT(tpm_ecc_curve_names, TPM_ECC_BN_P256, TPM_ECC_BN_P638, TPM_ECC_NIST_P521,
-	"BN_P256",
-	"BN_P638"
-);
-ENUM_NEXT(tpm_ecc_curve_names, TPM_ECC_SM2_P256, TPM_ECC_SM2_P256, TPM_ECC_BN_P638,
-	"SM2_P256"
-);
-ENUM_END(tpm_ecc_curve_names, TPM_ECC_SM2_P256);
-
-#else /* TSS_TSS2 */
-
-/**
- * TPM 2.0 algorithm ID names
- */
-ENUM(tpm_alg_id_names, 0, 0,
-	"ERROR"
-);
-
-/**
- * TPM 2.0 ECC curve names
- */
-ENUM(tpm_ecc_curve_names, 0, 0,
-	"NONE"
-);
-
-#endif /* TSS_TSS2 */
-
-