summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLouis Collard <louiscollard@chromium.org>2020-02-12 14:50:31 +0800
committerCommit Bot <commit-bot@chromium.org>2020-04-15 03:39:01 +0000
commiteddf0be11907c7a61a3b5c01a62badd9ccc380b5 (patch)
tree467e686cf199033f47932fbb85261003040916b5
parent1a1129b5f9baf0dcef98d7c9f57fbb2d199af942 (diff)
downloadchrome-ec-eddf0be11907c7a61a3b5c01a62badd9ccc380b5.tar.gz
ec: Convert comments to C-style
BUG=b:123686979 TEST=make buildall -j Change-Id: I1fc49f44c6f1be3bcacb26662862cb68899be299 Signed-off-by: Louis Collard <louiscollard@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2102092 Tested-by: Leo Lai <cylai@google.com> Reviewed-by: Vadim Bendebury <vbendeb@chromium.org> Commit-Queue: Leo Lai <cylai@google.com>
-rw-r--r--include/u2f.h100
1 files changed, 52 insertions, 48 deletions
diff --git a/include/u2f.h b/include/u2f.h
index 2bb243dea6..5af23bc773 100644
--- a/include/u2f.h
+++ b/include/u2f.h
@@ -5,7 +5,7 @@
#ifndef __U2F_H_INCLUDED__
#define __U2F_H_INCLUDED__
-#ifdef _MSC_VER // Windows
+#ifdef _MSC_VER /* Windows */
typedef unsigned char uint8_t;
typedef unsigned short uint16_t;
typedef unsigned int uint32_t;
@@ -18,62 +18,62 @@ typedef unsigned long int uint64_t;
extern "C" {
#endif
-// General constants
-
-#define U2F_EC_KEY_SIZE 32 // EC key size in bytes
-#define U2F_EC_POINT_SIZE ((U2F_EC_KEY_SIZE * 2) + 1) // Size of EC point
-#define U2F_MAX_KH_SIZE 128 // Max size of key handle
-#define U2F_MAX_ATT_CERT_SIZE 2048 // Max size of attestation certificate
-#define U2F_MAX_EC_SIG_SIZE 72 // Max size of DER coded EC signature
-#define U2F_CTR_SIZE 4 // Size of counter field
-#define U2F_APPID_SIZE 32 // Size of application id
-#define U2F_CHAL_SIZE 32 // Size of challenge
-#define U2F_MAX_ATTEST_SIZE 256 // Size of largest blob to sign
+/* General constants */
+
+#define U2F_EC_KEY_SIZE 32 /* EC key size in bytes */
+#define U2F_EC_POINT_SIZE ((U2F_EC_KEY_SIZE * 2) + 1) /* Size of EC point */
+#define U2F_MAX_KH_SIZE 128 /* Max size of key handle */
+#define U2F_MAX_ATT_CERT_SIZE 2048 /* Max size of attestation certificate */
+#define U2F_MAX_EC_SIG_SIZE 72 /* Max size of DER coded EC signature */
+#define U2F_CTR_SIZE 4 /* Size of counter field */
+#define U2F_APPID_SIZE 32 /* Size of application id */
+#define U2F_CHAL_SIZE 32 /* Size of challenge */
+#define U2F_MAX_ATTEST_SIZE 256 /* Size of largest blob to sign */
#define U2F_P256_SIZE 32
-#define U2F_FIXED_KH_SIZE 64 // Size of fixed size key handles
+#define U2F_FIXED_KH_SIZE 64 /* Size of fixed size key handles */
#define ENC_SIZE(x) ((x + 7) & 0xfff8)
-// EC (uncompressed) point
+/* EC (uncompressed) point */
-#define U2F_POINT_UNCOMPRESSED 0x04 // Uncompressed point format
+#define U2F_POINT_UNCOMPRESSED 0x04 /* Uncompressed point format */
struct u2f_ec_point {
- uint8_t pointFormat; // Point type
- uint8_t x[U2F_EC_KEY_SIZE]; // X-value
- uint8_t y[U2F_EC_KEY_SIZE]; // Y-value
+ uint8_t pointFormat; /* Point type */
+ uint8_t x[U2F_EC_KEY_SIZE]; /* X-value */
+ uint8_t y[U2F_EC_KEY_SIZE]; /* Y-value */
};
-// Request Flags.
+/* Request Flags. */
-#define U2F_AUTH_ENFORCE 0x03 // Enforce user presence and sign
-#define U2F_AUTH_CHECK_ONLY 0x07 // Check only
-#define U2F_AUTH_FLAG_TUP 0x01 // Test of user presence set
+#define U2F_AUTH_ENFORCE 0x03 /* Enforce user presence and sign */
+#define U2F_AUTH_CHECK_ONLY 0x07 /* Check only */
+#define U2F_AUTH_FLAG_TUP 0x01 /* Test of user presence set */
-// TODO(louiscollard): Add Descriptions.
+/* TODO(louiscollard): Add Descriptions. */
struct u2f_generate_req {
- uint8_t appId[U2F_APPID_SIZE]; // Application id
+ uint8_t appId[U2F_APPID_SIZE]; /* Application id */
uint8_t userSecret[U2F_P256_SIZE];
uint8_t flags;
};
struct u2f_generate_resp {
- struct u2f_ec_point pubKey; // Generated public key
- uint8_t keyHandle[U2F_FIXED_KH_SIZE]; // Key handle
+ struct u2f_ec_point pubKey; /* Generated public key */
+ uint8_t keyHandle[U2F_FIXED_KH_SIZE]; /* Key handle */
};
struct u2f_sign_req {
- uint8_t appId[U2F_APPID_SIZE]; // Application id
+ uint8_t appId[U2F_APPID_SIZE]; /* Application id */
uint8_t userSecret[U2F_P256_SIZE];
- uint8_t keyHandle[U2F_FIXED_KH_SIZE]; // Key handle
+ uint8_t keyHandle[U2F_FIXED_KH_SIZE]; /* Key handle */
uint8_t hash[U2F_P256_SIZE];
uint8_t flags;
};
struct u2f_sign_resp {
- uint8_t sig_r[U2F_P256_SIZE]; // Signature
- uint8_t sig_s[U2F_P256_SIZE]; // Signature
+ uint8_t sig_r[U2F_P256_SIZE]; /* Signature */
+ uint8_t sig_s[U2F_P256_SIZE]; /* Signature */
};
struct u2f_attest_req {
@@ -88,39 +88,43 @@ struct u2f_attest_resp {
uint8_t sig_s[U2F_P256_SIZE];
};
-// Command status responses
+/* Command status responses */
-#define U2F_SW_NO_ERROR 0x9000 // SW_NO_ERROR
-#define U2F_SW_WRONG_DATA 0x6A80 // SW_WRONG_DATA
-#define U2F_SW_CONDITIONS_NOT_SATISFIED 0x6985 // SW_CONDITIONS_NOT_SATISFIED
-#define U2F_SW_COMMAND_NOT_ALLOWED 0x6986 // SW_COMMAND_NOT_ALLOWED
-#define U2F_SW_INS_NOT_SUPPORTED 0x6D00 // SW_INS_NOT_SUPPORTED
+#define U2F_SW_NO_ERROR 0x9000 /* SW_NO_ERROR */
+#define U2F_SW_WRONG_DATA 0x6A80 /* SW_WRONG_DATA */
+#define U2F_SW_CONDITIONS_NOT_SATISFIED \
+ 0x6985 /* SW_CONDITIONS_NOT_SATISFIED \
+ */
+#define U2F_SW_COMMAND_NOT_ALLOWED 0x6986 /* SW_COMMAND_NOT_ALLOWED */
+#define U2F_SW_INS_NOT_SUPPORTED 0x6D00 /* SW_INS_NOT_SUPPORTED */
-// Protocol extensions
+/* Protocol extensions */
-// Non-standardized command status responses
+/* Non-standardized command status responses */
#define U2F_SW_CLA_NOT_SUPPORTED 0x6E00
#define U2F_SW_WRONG_LENGTH 0x6700
#define U2F_SW_WTF 0x6f00
-// Additional flags for P1 field
-#define G2F_ATTEST 0x80 // Fixed attestation key
-#define G2F_CONSUME 0x02 // Consume presence
+/* Additional flags for P1 field */
+#define G2F_ATTEST 0x80 /* Fixed attestation key */
+#define G2F_CONSUME 0x02 /* Consume presence */
-// The key handle format was changed when support for user secrets was added.
-// U2F_SIGN requests that specify this flag will first try to validate the
-// key handle as a new format key handle, and if that fails, will fall back
-// to treating it as a legacy key handle (without user secrets).
+/*
+ * The key handle format was changed when support for user secrets was added.
+ * U2F_SIGN requests that specify this flag will first try to validate the key
+ * handle as a new format key handle, and if that fails, will fall back to
+ * treating it as a legacy key handle (without user secrets).
+ */
#define SIGN_LEGACY_KH 0x40
-// U2F Attest format for U2F Register Response.
+/* U2F Attest format for U2F Register Response. */
#define U2F_ATTEST_FORMAT_REG_RESP 0
-// Vendor command to enable/disable the extensions
+/* Vendor command to enable/disable the extensions */
#define U2F_VENDOR_MODE U2F_VENDOR_LAST
#ifdef __cplusplus
}
#endif
-#endif // __U2F_H_INCLUDED__
+#endif /* __U2F_H_INCLUDED__ */