mirror of
https://github.com/stefanberger/libtpms
synced 2025-08-23 16:01:32 +00:00
e814a1c731
- Enable RSA_4096 - Add RSA_4096 to s_KeySizesRSA at stateFormatLevel 8 - Increase STATE_FORMAT_LEVEL_CURRENT to 8 - Update tests for larger object size and increased StateFormatLevel - In NVMarshal.c replace MAX_RSA_KEY_BITS with old value 3072 so that the state is acceptable to older versions of libtpms; if we wrote 4096, then older versions of libtpms would reject the state. - In NVMarshal.c replace RSA_4096 with '0' so it is acceptable to older versions; if we wrote '1', then older versions of libtpms would reject the state. Fixes: #491 Signed-off-by: Dan Streetman <ddstreet@ieee.org> Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
99 lines
3.7 KiB
C
99 lines
3.7 KiB
C
#include <assert.h>
|
|
#include <stdlib.h>
|
|
|
|
#include "Tpm.h"
|
|
|
|
/* from Global.h */
|
|
extern BYTE s_indexOrderlyRam[RAM_INDEX_SPACE];
|
|
|
|
int main(void)
|
|
{
|
|
PERSISTENT_DATA pd;
|
|
|
|
/* Check size of ppList that expands with new commands */
|
|
/* was 14 when COMPRESSED_LISTS was enabled */
|
|
#define PD_PP_LIST_EXP_SIZE 17
|
|
if (sizeof(pd.ppList) != PD_PP_LIST_EXP_SIZE) {
|
|
fprintf(stderr,
|
|
"sizeof(PERSISTENT_DATA.ppList) does not have expected size "
|
|
"of %u bytes but %zu bytes\n",
|
|
PD_PP_LIST_EXP_SIZE, sizeof(pd.ppList));
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
/* Check size of auditCommands that expands with new commands */
|
|
/* was 14 when COMPRESSED_LISTS was enabled */
|
|
#define PD_AUDIT_COMMANDS_EXP_SIZE 17
|
|
if (sizeof(pd.auditCommands) != PD_AUDIT_COMMANDS_EXP_SIZE) {
|
|
fprintf(stderr,
|
|
"sizeof(PERSISTENT_DATA.auditCommands) does not have expected size "
|
|
"of %u bytes but %zu bytes\n",
|
|
PD_AUDIT_COMMANDS_EXP_SIZE, sizeof(pd.auditCommands));
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
/* ensure that the NVRAM offset of NV_USER_DYNAMIC is at the expected
|
|
location so that there's enough memory for re-constructing NVRAM
|
|
indices etc. into the NVRAM */
|
|
#define NV_INDEX_RAM_DATA_EXP_OFFSET 5120
|
|
if (NV_INDEX_RAM_DATA != NV_INDEX_RAM_DATA_EXP_OFFSET) {
|
|
/* If this ever changes due to growth of the preceding data
|
|
* structure, we need to adjust the total NVRAM memory size
|
|
* for the architecture where this changed (or have all
|
|
* architectures use the same offset.
|
|
*/
|
|
fprintf(stderr,
|
|
"NV_INDEX_RAM_DATA not at expected offset %u but at %u\n",
|
|
NV_INDEX_RAM_DATA_EXP_OFFSET, (unsigned int)NV_INDEX_RAM_DATA);
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
#define NV_USER_DYNAMIC_EXP_OFFSET (5120 + 512)
|
|
if (NV_USER_DYNAMIC != NV_USER_DYNAMIC_EXP_OFFSET) {
|
|
fprintf(stderr,
|
|
"NV_USER_DYNAMIC not at expected offset %u but at %u\n",
|
|
NV_USER_DYNAMIC_EXP_OFFSET, (unsigned int)NV_USER_DYNAMIC);
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
/*
|
|
* OBJECTs are directly written into NVRAM. We have to make sure that the
|
|
* size of the OBJECT is the same on all architectures so that a full
|
|
* NVRAM fits on all architectures
|
|
*/
|
|
#if RSA_16384
|
|
# error Unsupported RSA key size
|
|
#elif RSA_4096
|
|
# define OBJECT_EXP_SIZE 3312
|
|
#elif RSA_3072
|
|
# define OBJECT_EXP_SIZE 2608
|
|
#elif RSA_2048
|
|
# define OBJECT_EXP_SIZE 1896
|
|
#endif
|
|
if (sizeof(OBJECT) != OBJECT_EXP_SIZE) {
|
|
fprintf(stderr, "sizeof(OBJECT) does not have expected size of %u bytes"
|
|
"but %zu bytes\n", OBJECT_EXP_SIZE, sizeof(OBJECT));
|
|
fprintf(stderr, "sizeof(TPMT_PUBLIC) is now %zu bytes;"
|
|
"was 356/484/612 bytes for 2048/3072/4096 bit RSA keys\n",
|
|
sizeof(TPMT_PUBLIC));
|
|
fprintf(stderr, "sizeof(TPMT_SENSITIVE) is now %zu bytes;"
|
|
"was 776/1096/1416 bytes for 2048/3072/4096 bit RSA keys\n",
|
|
sizeof(TPMT_SENSITIVE));
|
|
fprintf(stderr, "sizeof(privateExponent_t) is now %zu bytes;"
|
|
"was 608/864/1120 bytes for 2048/3072/4096 bit RSA keys\n",
|
|
sizeof(privateExponent_t));
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
/* Same for NV_INDEX */
|
|
#define NV_INDEX_EXP_SIZE 148
|
|
if (sizeof(NV_INDEX) != NV_INDEX_EXP_SIZE) {
|
|
fprintf(stderr,
|
|
"sizeof(NV_INDEX) does not have expected size of %u bytes"
|
|
"but %zu bytes\n", NV_INDEX_EXP_SIZE, sizeof(NV_INDEX));
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
return EXIT_SUCCESS;
|
|
}
|