tpm: Check FIPS-140-2 and FIPS-186-4 compliance

diff --git a/conf/plugins/tpm.opt b/conf/plugins/tpm.opt
index df7adb0984501392a9bc23e86c02aceb4fe48b30..06c88861ea704e7ce14f1a29647c2ad2a56f2124 100644 (file)
--- a/conf/plugins/tpm.opt
+++ b/conf/plugins/tpm.opt
@@ -1,6 +1,10 @@
 charon.plugins.tpm.use_rng = no
        Whether the TPM should be used as RNG.
 
+charon.plugins.tpm.fips_186_4 = no
+       Is the TPM 2.0 FIPS-186-4 compliant, forcing e.g. the use of the default
+       salt length instead of maximum salt length with RSAPSS padding.
+
 charon.plugins.tpm.tcti.name = device|tabrmd
        Name of TPM 2.0 TCTI library. Valid values: _tabrmd_, _device_ or _mssim_.
        Defaults are _device_ if the _/dev/tpmrm0_ in-kernel TPM 2.0 resource manager

diff --git a/src/libtpmtss/plugins/tpm/tpm_private_key.c b/src/libtpmtss/plugins/tpm/tpm_private_key.c
index 9aeb4710837cbb6806c3c9fd0c9f51ada015d8b4..d946fbe56716d6c14081326089a1ca5bc381f125 100644 (file)
--- a/src/libtpmtss/plugins/tpm/tpm_private_key.c
+++ b/src/libtpmtss/plugins/tpm/tpm_private_key.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2018 Tobias Brunner
- * Copyright (C) 2017 Andreas Steffen
+ * Copyright (C) 2017-2018 Andreas Steffen
  * HSR Hochschule fuer Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it

diff --git a/src/libtpmtss/tpm_tss.h b/src/libtpmtss/tpm_tss.h
index a239e4dc4770542ccf024e8465e418ef76d541b0..aab7a4d6c22b49d1627a39027a0d7e7e7f68bc54 100644 (file)
--- a/src/libtpmtss/tpm_tss.h
+++ b/src/libtpmtss/tpm_tss.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2018 Tobias Brunner
- * Copyright (C) 2016 Andreas Steffen
+ * Copyright (C) 2016-2018 Andreas Steffen
  * HSR Hochschule fuer Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it

diff --git a/src/libtpmtss/tpm_tss_tss2_v1.c b/src/libtpmtss/tpm_tss_tss2_v1.c
index 26fd25ce1f637e5f7338238bcafd43bab172be7b..a7b1344bd7de5d99c8011780b0d9cea229f8ab3f 100644 (file)
--- a/src/libtpmtss/tpm_tss_tss2_v1.c
+++ b/src/libtpmtss/tpm_tss_tss2_v1.c
@@ -69,6 +69,12 @@ struct private_tpm_tss_tss2_t {
         * List of supported algorithms
         */
        TPM_ALG_ID supported_algs[TPM_PT_ALGORITHM_SET];
+
+       /**
+        * Is TPM FIPS 186-4 compliant ?
+        */
+       bool fips_186_4;
+
 };
 
 /**
@@ -154,6 +160,7 @@ static bool get_algs_capability(private_tpm_tss_tss2_t *this)
        TPMS_TAGGED_PROPERTY tp;
        TPMI_YES_NO more_data;
        TPM_ALG_ID alg;
+       bool fips_140_2 = FALSE;
        uint32_t rval, i, offset, revision = 0, year = 0;
        size_t len = BUF_LEN;
        char buf[BUF_LEN], manufacturer[5], vendor_string[17];
@@ -194,12 +201,25 @@ static bool get_algs_capability(private_tpm_tss_tss2_t *this)
                                offset = 4 * (tp.property - TPM_PT_VENDOR_STRING_1);
                                htoun32(vendor_string + offset, tp.value);
                                break;
+                       case TPM_PT_MODES:
+                               if (tp.value & TPMA_MODES_FIPS_140_2)
+                               {
+                                       this->fips_186_4 = fips_140_2 = TRUE;
+                               }
+                               break;
                        default:
                                break;
                }
        }
-       DBG2(DBG_PTS, "%s manufacturer: %s (%s) rev: %05.2f %u", LABEL, manufacturer,
-                vendor_string, (float)revision/100, year);
+
+       if (!fips_140_2)
+       {
+               this->fips_186_4 = lib->settings->get_bool(lib->settings,
+                                       "%s.plugins.tpm.fips_186_4", FALSE, lib->ns);
+       }
+       DBG2(DBG_PTS, "%s manufacturer: %s (%s) rev: %05.2f %u %s", LABEL,
+                manufacturer, vendor_string, (float)revision/100, year,
+                fips_140_2 ? "FIPS 140-2" : (this->fips_186_4 ? "FIPS 186-4" : ""));
 
        /* get supported algorithms */
        rval = Tss2_Sys_GetCapability(this->sys_context, 0, TPM_CAP_ALGS,
@@ -551,10 +571,14 @@ METHOD(tpm_tss_t, supported_signature_schemes, enumerator_t*,
                        {
                                case TPM_ALG_RSAPSS:
                                {
+                                       ssize_t salt_len;
+
+                                       salt_len = this->fips_186_4 ? RSA_PSS_SALT_LEN_DEFAULT :
+                                                                                                 RSA_PSS_SALT_LEN_MAX;
                                        rsa_pss_params_t pss_params = {
                                                .hash = digest,
                                                .mgf1_hash = digest,
-                                               .salt_len = RSA_PSS_SALT_LEN_MAX,
+                                               .salt_len = salt_len,
                                        };
                                        supported_scheme = (signature_params_t){
                                                .scheme = SIGN_RSA_EMSA_PSS,

diff --git a/src/libtpmtss/tpm_tss_tss2_v2.c b/src/libtpmtss/tpm_tss_tss2_v2.c
index f47858e70c8169258037b2f56519f55a1e48c35a..eb80a0e3b0d1f987cf4dd7d3581ac40742ac1f2b 100644 (file)
--- a/src/libtpmtss/tpm_tss_tss2_v2.c
+++ b/src/libtpmtss/tpm_tss_tss2_v2.c
@@ -65,6 +65,12 @@ struct private_tpm_tss_tss2_t {
         * List of supported algorithms
         */
        TPM2_ALG_ID supported_algs[TPM2_PT_ALGORITHM_SET];
+
+       /**
+        * Is TPM FIPS 186-4 compliant ?
+        */
+       bool fips_186_4;
+
 };
 
 /**
@@ -153,6 +159,7 @@ static bool get_algs_capability(private_tpm_tss_tss2_t *this)
        TPMS_TAGGED_PROPERTY tp;
        TPMI_YES_NO more_data;
        TPM2_ALG_ID alg;
+       bool fips_140_2 = FALSE;
        uint32_t rval, i, offset, revision = 0, year = 0;
        size_t len = BUF_LEN;
        char buf[BUF_LEN], manufacturer[5], vendor_string[17];
@@ -194,12 +201,25 @@ static bool get_algs_capability(private_tpm_tss_tss2_t *this)
                                offset = 4 * (tp.property - TPM2_PT_VENDOR_STRING_1);
                                htoun32(vendor_string + offset, tp.value);
                                break;
+                       case TPM2_PT_MODES:
+                               if (tp.value & TPMA_MODES_FIPS_140_2)
+                               {
+                                       this->fips_186_4 = fips_140_2 = TRUE;
+                               }
+                               break;
                        default:
                                break;
                }
        }
-       DBG2(DBG_PTS, "%s manufacturer: %s (%s) rev: %05.2f %u", LABEL, manufacturer,
-                vendor_string, (float)revision/100, year);
+
+       if (!fips_140_2)
+       {
+               this->fips_186_4 = lib->settings->get_bool(lib->settings,
+                                       "%s.plugins.tpm.fips_186_4", FALSE, lib->ns);
+       }
+       DBG2(DBG_PTS, "%s manufacturer: %s (%s) rev: %05.2f %u %s", LABEL,
+                manufacturer, vendor_string, (float)revision/100, year,
+                fips_140_2 ? "FIPS 140-2" : (this->fips_186_4 ? "FIPS 186-4" : ""));
 
        /* get supported algorithms */
        rval = Tss2_Sys_GetCapability(this->sys_context, 0, TPM2_CAP_ALGS,
@@ -505,10 +525,14 @@ METHOD(tpm_tss_t, supported_signature_schemes, enumerator_t*,
                        {
                                case TPM2_ALG_RSAPSS:
                                {
+                                       ssize_t salt_len;
+
+                                       salt_len = this->fips_186_4 ? RSA_PSS_SALT_LEN_DEFAULT :
+                                                                                                 RSA_PSS_SALT_LEN_MAX;
                                        rsa_pss_params_t pss_params = {
                                                .hash = digest,
                                                .mgf1_hash = digest,
-                                               .salt_len = RSA_PSS_SALT_LEN_MAX,
+                                               .salt_len = salt_len,
                                        };
                                        supported_scheme = (signature_params_t){
                                                .scheme = SIGN_RSA_EMSA_PSS,