diff --git a/wolfssl/wolfcrypt/aes.h b/wolfssl/wolfcrypt/aes.h index 449220994..fdf946d48 100644 --- a/wolfssl/wolfcrypt/aes.h +++ b/wolfssl/wolfcrypt/aes.h @@ -138,7 +138,7 @@ enum { AES_192_KEY_SIZE = 24, /* for 192 bit */ AES_256_KEY_SIZE = 32, /* for 256 bit */ - AES_IV_SIZE = 16, /* always block size */ + AES_IV_SIZE = 16 /* always block size */ }; #endif @@ -165,20 +165,20 @@ enum { CCM_NONCE_MIN_SZ = 7, CCM_NONCE_MAX_SZ = 13, CTR_SZ = 4, - AES_IV_FIXED_SZ = 4, + AES_IV_FIXED_SZ = 4 #ifdef WOLFSSL_AES_CFB - AES_CFB_MODE = 1, + ,AES_CFB_MODE = 1 #endif #ifdef WOLFSSL_AES_OFB - AES_OFB_MODE = 2, + ,AES_OFB_MODE = 2 #endif #ifdef WOLFSSL_AES_XTS - AES_XTS_MODE = 3, + ,AES_XTS_MODE = 3 #endif #ifdef WOLF_PRIVATE_KEY_ID - AES_MAX_ID_LEN = 32, - AES_MAX_LABEL_LEN = 32, + ,AES_MAX_ID_LEN = 32, + AES_MAX_LABEL_LEN = 32 #endif }; diff --git a/wolfssl/wolfcrypt/arc4.h b/wolfssl/wolfcrypt/arc4.h index ad9792168..fe58b10ec 100644 --- a/wolfssl/wolfcrypt/arc4.h +++ b/wolfssl/wolfcrypt/arc4.h @@ -39,7 +39,7 @@ enum { ARC4_ENC_TYPE = 4, /* cipher unique type */ ARC4_STATE_SIZE = 256, - RC4_KEY_SIZE = 16, /* always 128bit */ + RC4_KEY_SIZE = 16 /* always 128bit */ }; /* ARC4 encryption and decryption */ diff --git a/wolfssl/wolfcrypt/asn.h b/wolfssl/wolfcrypt/asn.h index 489dcfe55..3d559cc9a 100644 --- a/wolfssl/wolfcrypt/asn.h +++ b/wolfssl/wolfcrypt/asn.h @@ -154,7 +154,7 @@ enum ASN_Tags { /* OneAsymmetricKey Fields */ ASN_ASYMKEY_ATTRS = 0x00, - ASN_ASYMKEY_PUBKEY = 0x01, + ASN_ASYMKEY_PUBKEY = 0x01 }; /* NOTE: If ASN_UTC_TIME_SIZE or ASN_GENERALIZED_TIME_SIZE are ever modified @@ -188,7 +188,7 @@ enum ASNItem_DataType { /* Big number as a positive or negative mp_int. */ ASN_DATA_TYPE_MP_POS_NEG = 9, /* ASN.1 CHOICE. A 0 terminated list of tags that are valid. */ - ASN_DATA_TYPE_CHOICE = 10, + ASN_DATA_TYPE_CHOICE = 10 }; /* A template entry describing an ASN.1 item. */ @@ -831,22 +831,22 @@ enum ECC_TYPES }; #ifdef WOLFSSL_CERT_PIV - enum PIV_Tags { - ASN_PIV_CERT = 0x0A, - ASN_PIV_NONCE = 0x0B, - ASN_PIV_SIGNED_NONCE = 0x0C, +enum PIV_Tags { + ASN_PIV_CERT = 0x0A, + ASN_PIV_NONCE = 0x0B, + ASN_PIV_SIGNED_NONCE = 0x0C, - ASN_PIV_TAG_CERT = 0x70, - ASN_PIV_TAG_CERT_INFO = 0x71, - ASN_PIV_TAG_MSCUID = 0x72, - ASN_PIV_TAG_ERR_DET = 0xFE, + ASN_PIV_TAG_CERT = 0x70, + ASN_PIV_TAG_CERT_INFO = 0x71, + ASN_PIV_TAG_MSCUID = 0x72, + ASN_PIV_TAG_ERR_DET = 0xFE, - /* certificate info masks */ - ASN_PIV_CERT_INFO_COMPRESSED = 0x03, - ASN_PIV_CERT_INFO_ISX509 = 0x04, - /* GZIP is 0x01 */ - ASN_PIV_CERT_INFO_GZIP = 0x01, - }; + /* certificate info masks */ + ASN_PIV_CERT_INFO_COMPRESSED = 0x03, + ASN_PIV_CERT_INFO_ISX509 = 0x04, + /* GZIP is 0x01 */ + ASN_PIV_CERT_INFO_GZIP = 0x01, +}; #endif /* WOLFSSL_CERT_PIV */ @@ -994,7 +994,7 @@ enum Misc_ASN { PEM_LINE_SZ = 64, /* Length of Base64 encoded line, not including new line */ PEM_LINE_LEN = PEM_LINE_SZ + 12, /* PEM line max + fudge */ - COUNTRY_CODE_LEN = 2, /* RFC 3739 */ + COUNTRY_CODE_LEN = 2 /* RFC 3739 */ }; #ifndef WC_MAX_NAME_ENTRIES @@ -1060,20 +1060,20 @@ enum Block_Sum { #ifdef WOLFSSL_AES_128 AES128CBCb = 414, AES128GCMb = 418, - AES128CCMb = 419, + AES128CCMb = 419 #endif #ifdef WOLFSSL_AES_192 - AES192CBCb = 434, + ,AES192CBCb = 434, AES192GCMb = 438, - AES192CCMb = 439, + AES192CCMb = 439 #endif #ifdef WOLFSSL_AES_256 - AES256CBCb = 454, + ,AES256CBCb = 454, AES256GCMb = 458, - AES256CCMb = 459, + AES256CCMb = 459 #endif #ifndef NO_DES3 - DESb = 69, + ,DESb = 69, DES3b = 652 #endif }; @@ -1101,22 +1101,22 @@ enum Key_Sum { SPHINCS_FAST_LEVEL5k = 282, /* 1 3 9999 6 9 3 */ SPHINCS_SMALL_LEVEL1k = 287, /* 1 3 9999 6 7 10 */ SPHINCS_SMALL_LEVEL3k = 285, /* 1 3 9999 6 8 7 */ - SPHINCS_SMALL_LEVEL5k = 286, /* 1 3 9999 6 9 7 */ + SPHINCS_SMALL_LEVEL5k = 286 /* 1 3 9999 6 9 7 */ }; #if !defined(NO_AES) || defined(HAVE_PKCS7) enum KeyWrap_Sum { #ifdef WOLFSSL_AES_128 - AES128_WRAP = 417, + AES128_WRAP = 417 #endif #ifdef WOLFSSL_AES_192 - AES192_WRAP = 437, + ,AES192_WRAP = 437 #endif #ifdef WOLFSSL_AES_256 - AES256_WRAP = 457, + ,AES256_WRAP = 457 #endif #ifdef HAVE_PKCS7 - PWRI_KEK_WRAP = 680 /*id-alg-PWRI-KEK, 1.2.840.113549.1.9.16.3.9 */ + ,PWRI_KEK_WRAP = 680 /*id-alg-PWRI-KEK, 1.2.840.113549.1.9.16.3.9 */ #endif }; #endif /* !NO_AES || PKCS7 */ @@ -1126,14 +1126,14 @@ enum Key_Agree { dhSinglePass_stdDH_sha224kdf_scheme = 188, dhSinglePass_stdDH_sha256kdf_scheme = 189, dhSinglePass_stdDH_sha384kdf_scheme = 190, - dhSinglePass_stdDH_sha512kdf_scheme = 191, + dhSinglePass_stdDH_sha512kdf_scheme = 191 }; enum KDF_Sum { PBKDF2_OID = 660, - MGF1_OID = 652, + MGF1_OID = 652 }; @@ -1180,9 +1180,9 @@ enum Extensions_Sum { }; enum CertificatePolicy_Sum { - CP_ANY_OID = 146, /* id-ce 32 0 */ + CP_ANY_OID = 146 /* id-ce 32 0 */ #ifdef WOLFSSL_FPKI - CP_FPKI_COMMON_AUTH_OID = 426, /* 2.16.840.1.101.3.2.1.3.13 */ + ,CP_FPKI_COMMON_AUTH_OID = 426, /* 2.16.840.1.101.3.2.1.3.13 */ CP_FPKI_PIV_AUTH_OID = 453, /* 2.16.840.1.101.3.2.1.3.40 */ CP_FPKI_PIV_AUTH_HW_OID = 454, /* 2.16.840.1.101.3.2.1.3.41 */ CP_FPKI_PIVI_AUTH_OID = 458 /* 2.16.840.1.101.3.2.1.3.45 */ @@ -1195,9 +1195,9 @@ enum SepHardwareName_Sum { enum AuthInfo_Sum { AIA_OCSP_OID = 116, /* 1.3.6.1.5.5.7.48.1, id-ad-ocsp */ - AIA_CA_ISSUER_OID = 117, /* 1.3.6.1.5.5.7.48.2, id-ad-caIssuers */ + AIA_CA_ISSUER_OID = 117 /* 1.3.6.1.5.5.7.48.2, id-ad-caIssuers */ #ifdef WOLFSSL_SUBJ_INFO_ACC - AIA_CA_REPO_OID = 120 /* 1.3.6.1.5.5.7.48.5, id-ad-caRepository */ + ,AIA_CA_REPO_OID = 120 /* 1.3.6.1.5.5.7.48.5, id-ad-caRepository */ #endif /* WOLFSSL_SUBJ_INFO_ACC */ }; @@ -1244,7 +1244,7 @@ enum VerifyType { VERIFY_OCSP = 3, VERIFY_NAME = 4, VERIFY_SKIP_DATE = 5, - VERIFY_OCSP_CERT = 6, + VERIFY_OCSP_CERT = 6 }; #ifdef WOLFSSL_CERT_EXT @@ -1266,7 +1266,7 @@ enum CsrAttrType { INITIALS_OID = 132, SURNAME_OID = 93, NAME_OID = 130, - GIVEN_NAME_OID = 131, + GIVEN_NAME_OID = 131 }; #endif @@ -1349,7 +1349,7 @@ enum SignatureState { SIG_STATE_HASH, SIG_STATE_KEY, SIG_STATE_DO, - SIG_STATE_CHECK, + SIG_STATE_CHECK }; @@ -1459,7 +1459,7 @@ enum CertSignState { CERTSIGN_STATE_BEGIN, CERTSIGN_STATE_DIGEST, CERTSIGN_STATE_ENCODE, - CERTSIGN_STATE_DO, + CERTSIGN_STATE_DO }; struct CertSignCtx { @@ -2242,7 +2242,7 @@ enum cert_enums { SPHINCS_FAST_LEVEL5_KEY = 26, SPHINCS_SMALL_LEVEL1_KEY = 27, SPHINCS_SMALL_LEVEL3_KEY = 28, - SPHINCS_SMALL_LEVEL5_KEY = 29, + SPHINCS_SMALL_LEVEL5_KEY = 29 }; #endif /* WOLFSSL_CERT_GEN */ @@ -2527,7 +2527,7 @@ enum PBESTypes { PBES2 = 13, /* algo ID */ PBES1_MD5_DES = 3, - PBES1_SHA1_DES = 10, + PBES1_SHA1_DES = 10 }; enum PKCSTypes { @@ -2537,7 +2537,7 @@ enum PKCSTypes { PKCS8v0 = 0, /* default PKCS#8 version */ PKCS8v1 = 1, /* PKCS#8 version including public key */ PKCS1v0 = 0, /* default PKCS#1 version */ - PKCS1v1 = 1, /* Multi-prime version */ + PKCS1v1 = 1 /* Multi-prime version */ }; #endif /* !NO_ASN || !NO_PWDBASED */ diff --git a/wolfssl/wolfcrypt/asn_public.h b/wolfssl/wolfcrypt/asn_public.h index fb43f9748..7c5401c75 100644 --- a/wolfssl/wolfcrypt/asn_public.h +++ b/wolfssl/wolfcrypt/asn_public.h @@ -112,7 +112,7 @@ enum Ecc_Sum { ECC_SECP384R1_OID = 210, ECC_BRAINPOOLP384R1_OID = 108, ECC_BRAINPOOLP512R1_OID = 110, - ECC_SECP521R1_OID = 211, + ECC_SECP521R1_OID = 211 }; @@ -154,7 +154,7 @@ enum CertType { SPHINCS_SMALL_LEVEL1_TYPE, SPHINCS_SMALL_LEVEL3_TYPE, SPHINCS_SMALL_LEVEL5_TYPE, - ECC_PARAM_TYPE, + ECC_PARAM_TYPE }; @@ -202,7 +202,7 @@ enum Ctc_SigType { CTC_SPHINCS_FAST_LEVEL5 = 282, CTC_SPHINCS_SMALL_LEVEL1 = 287, CTC_SPHINCS_SMALL_LEVEL3 = 285, - CTC_SPHINCS_SMALL_LEVEL5 = 286, + CTC_SPHINCS_SMALL_LEVEL5 = 286 }; enum Ctc_Encoding { @@ -231,15 +231,16 @@ enum Ctc_Misc { CTC_GEN_SERIAL_SZ = 16, CTC_FILETYPE_ASN1 = 2, CTC_FILETYPE_PEM = 1, - CTC_FILETYPE_DEFAULT = 2, + CTC_FILETYPE_DEFAULT = 2 + #ifdef WOLFSSL_CERT_EXT /* AKID could contains: hash + (Option) AuthCertIssuer,AuthCertSerialNum * We support only hash */ - CTC_MAX_SKID_SIZE = 32, /* SHA256_DIGEST_SIZE */ + ,CTC_MAX_SKID_SIZE = 32, /* SHA256_DIGEST_SIZE */ CTC_MAX_AKID_SIZE = 32, /* SHA256_DIGEST_SIZE */ CTC_MAX_CERTPOL_SZ = 200, /* RFC 5280 Section 4.2.1.4 */ CTC_MAX_CERTPOL_NB = 2, /* Max number of Certificate Policy */ - CTC_MAX_CRLINFO_SZ = WC_CTC_MAX_CRLINFO_SZ, /* Arbitrary size that should be + CTC_MAX_CRLINFO_SZ = WC_CTC_MAX_CRLINFO_SZ /* Arbitrary size that should be * enough for at least two * distribution points. */ #endif /* WOLFSSL_CERT_EXT */ @@ -270,7 +271,7 @@ enum { #endif PEM_PASS_READ = 0, - PEM_PASS_WRITE = 1, + PEM_PASS_WRITE = 1 }; typedef int (wc_pem_password_cb)(char* passwd, int sz, int rw, void* userdata); diff --git a/wolfssl/wolfcrypt/chacha.h b/wolfssl/wolfcrypt/chacha.h index e654972ff..7cd73db4e 100644 --- a/wolfssl/wolfcrypt/chacha.h +++ b/wolfssl/wolfcrypt/chacha.h @@ -72,7 +72,7 @@ Block counter is located at index 12. enum { CHACHA_ENC_TYPE = WC_CIPHER_CHACHA, /* cipher unique type */ - CHACHA_MAX_KEY_SZ = 32, + CHACHA_MAX_KEY_SZ = 32 }; typedef struct ChaCha { diff --git a/wolfssl/wolfcrypt/chacha20_poly1305.h b/wolfssl/wolfcrypt/chacha20_poly1305.h index 7c1ddc97b..6c04912a0 100644 --- a/wolfssl/wolfcrypt/chacha20_poly1305.h +++ b/wolfssl/wolfcrypt/chacha20_poly1305.h @@ -61,7 +61,7 @@ enum { CHACHA20_POLY1305_STATE_INIT = 0, CHACHA20_POLY1305_STATE_READY = 1, CHACHA20_POLY1305_STATE_AAD = 2, - CHACHA20_POLY1305_STATE_DATA = 3, + CHACHA20_POLY1305_STATE_DATA = 3 }; typedef struct ChaChaPoly_Aead { diff --git a/wolfssl/wolfcrypt/dh.h b/wolfssl/wolfcrypt/dh.h index 0b48c5cf7..e94cb5931 100644 --- a/wolfssl/wolfcrypt/dh.h +++ b/wolfssl/wolfcrypt/dh.h @@ -88,7 +88,7 @@ enum { WC_FFDHE_3072 = 257, WC_FFDHE_4096 = 258, WC_FFDHE_6144 = 259, - WC_FFDHE_8192 = 260, + WC_FFDHE_8192 = 260 }; /* DH Private Key size up to 8192 bit */ diff --git a/wolfssl/wolfcrypt/ecc.h b/wolfssl/wolfcrypt/ecc.h index 72fb2c5b3..2f02c4ad4 100644 --- a/wolfssl/wolfcrypt/ecc.h +++ b/wolfssl/wolfcrypt/ecc.h @@ -189,11 +189,11 @@ enum { ECC_POINT_UNCOMP = 0x04, /* Shamir's dual add constants */ - SHAMIR_PRECOMP_SZ = 16, + SHAMIR_PRECOMP_SZ = 16 #ifdef WOLF_PRIVATE_KEY_ID - ECC_MAX_ID_LEN = 32, - ECC_MAX_LABEL_LEN = 32, + ,ECC_MAX_ID_LEN = 32, + ECC_MAX_LABEL_LEN = 32 #endif }; @@ -413,7 +413,7 @@ typedef struct { enum { WC_ECC_FLAG_NONE = 0x00, WC_ECC_FLAG_COFACTOR = 0x01, - WC_ECC_FLAG_DEC_SIGN = 0x02, + WC_ECC_FLAG_DEC_SIGN = 0x02 }; /* ECC non-blocking */ diff --git a/wolfssl/wolfcrypt/hash.h b/wolfssl/wolfcrypt/hash.h index bf62ca8cf..ad3ae2ccb 100644 --- a/wolfssl/wolfcrypt/hash.h +++ b/wolfssl/wolfcrypt/hash.h @@ -82,9 +82,9 @@ enum wc_MACAlgorithm { enum wc_HashFlags { WC_HASH_FLAG_NONE = 0x00000000, WC_HASH_FLAG_WILLCOPY = 0x00000001, /* flag to indicate hash will be copied */ - WC_HASH_FLAG_ISCOPY = 0x00000002, /* hash is copy */ + WC_HASH_FLAG_ISCOPY = 0x00000002 /* hash is copy */ #ifdef WOLFSSL_SHA3 - WC_HASH_SHA3_KECCAK256 =0x00010000, /* Older KECCAK256 */ + ,WC_HASH_SHA3_KECCAK256 =0x00010000 /* Older KECCAK256 */ #endif }; diff --git a/wolfssl/wolfcrypt/hmac.h b/wolfssl/wolfcrypt/hmac.h index 86c97ebfb..d6db41aa1 100644 --- a/wolfssl/wolfcrypt/hmac.h +++ b/wolfssl/wolfcrypt/hmac.h @@ -70,42 +70,42 @@ enum { HMAC_FIPS_MIN_KEY = 14, /* 112 bit key length minimum */ IPAD = 0x36, - OPAD = 0x5C, + OPAD = 0x5C /* If any hash is not enabled, add the ID here. */ #ifdef NO_MD5 - WC_MD5 = WC_HASH_TYPE_MD5, + ,WC_MD5 = WC_HASH_TYPE_MD5 #endif #ifdef NO_SHA - WC_SHA = WC_HASH_TYPE_SHA, + ,WC_SHA = WC_HASH_TYPE_SHA #endif #ifdef NO_SHA256 - WC_SHA256 = WC_HASH_TYPE_SHA256, + ,WC_SHA256 = WC_HASH_TYPE_SHA256 #endif #ifndef WOLFSSL_SHA512 - WC_SHA512 = WC_HASH_TYPE_SHA512, + ,WC_SHA512 = WC_HASH_TYPE_SHA512 #ifndef WOLFSSL_NOSHA512_224 - WC_SHA512_224 = WC_HASH_TYPE_SHA512_224, + ,WC_SHA512_224 = WC_HASH_TYPE_SHA512_224 #endif #ifndef WOLFSSL_NOSHA512_256 - WC_SHA512_256 = WC_HASH_TYPE_SHA512_256, + ,WC_SHA512_256 = WC_HASH_TYPE_SHA512_256 #endif #endif #ifndef WOLFSSL_SHA384 - WC_SHA384 = WC_HASH_TYPE_SHA384, + ,WC_SHA384 = WC_HASH_TYPE_SHA384 #endif #ifndef WOLFSSL_SHA224 - WC_SHA224 = WC_HASH_TYPE_SHA224, + ,WC_SHA224 = WC_HASH_TYPE_SHA224 #endif #ifndef WOLFSSL_SHA3 - WC_SHA3_224 = WC_HASH_TYPE_SHA3_224, + ,WC_SHA3_224 = WC_HASH_TYPE_SHA3_224, WC_SHA3_256 = WC_HASH_TYPE_SHA3_256, WC_SHA3_384 = WC_HASH_TYPE_SHA3_384, - WC_SHA3_512 = WC_HASH_TYPE_SHA3_512, + WC_SHA3_512 = WC_HASH_TYPE_SHA3_512 #endif #ifdef WOLF_PRIVATE_KEY_ID - HMAC_MAX_ID_LEN = 32, - HMAC_MAX_LABEL_LEN = 32, + ,HMAC_MAX_ID_LEN = 32, + HMAC_MAX_LABEL_LEN = 32 #endif }; diff --git a/wolfssl/wolfcrypt/poly1305.h b/wolfssl/wolfcrypt/poly1305.h index 0fd9d3c30..c0a5b8dfc 100644 --- a/wolfssl/wolfcrypt/poly1305.h +++ b/wolfssl/wolfcrypt/poly1305.h @@ -59,7 +59,7 @@ enum { POLY1305 = 7, POLY1305_BLOCK_SIZE = 16, - POLY1305_DIGEST_SIZE = 16, + POLY1305_DIGEST_SIZE = 16 }; #define WC_POLY1305_PAD_SZ 16 diff --git a/wolfssl/wolfcrypt/rsa.h b/wolfssl/wolfcrypt/rsa.h index 6d31aab55..2cd78d7fd 100644 --- a/wolfssl/wolfcrypt/rsa.h +++ b/wolfssl/wolfcrypt/rsa.h @@ -171,14 +171,15 @@ enum { RSA_PSS_PAD_TERM = 0xBC, #endif - RSA_PSS_SALT_LEN_DEFAULT = -1, + RSA_PSS_SALT_LEN_DEFAULT = -1 + #ifdef WOLFSSL_PSS_SALT_LEN_DISCOVER - RSA_PSS_SALT_LEN_DISCOVER = -2, + ,RSA_PSS_SALT_LEN_DISCOVER = -2 #endif #ifdef WOLF_PRIVATE_KEY_ID - RSA_MAX_ID_LEN = 32, - RSA_MAX_LABEL_LEN = 32, + ,RSA_MAX_ID_LEN = 32, + RSA_MAX_LABEL_LEN = 32 #endif }; diff --git a/wolfssl/wolfcrypt/signature.h b/wolfssl/wolfcrypt/signature.h index ca641571c..697e5b598 100644 --- a/wolfssl/wolfcrypt/signature.h +++ b/wolfssl/wolfcrypt/signature.h @@ -39,7 +39,7 @@ enum wc_SignatureType { WC_SIGNATURE_TYPE_NONE = 0, WC_SIGNATURE_TYPE_ECC = 1, WC_SIGNATURE_TYPE_RSA = 2, - WC_SIGNATURE_TYPE_RSA_W_ENC = 3, /* Adds DER header via wc_EncodeSignature */ + WC_SIGNATURE_TYPE_RSA_W_ENC = 3 /* Adds DER header via wc_EncodeSignature */ }; WOLFSSL_API int wc_SignatureGetSize(enum wc_SignatureType sig_type, diff --git a/wolfssl/wolfcrypt/types.h b/wolfssl/wolfcrypt/types.h index 8e18d8c63..6ea779b49 100644 --- a/wolfssl/wolfcrypt/types.h +++ b/wolfssl/wolfcrypt/types.h @@ -971,7 +971,7 @@ typedef struct w64wrapper { DYNAMIC_TYPE_SNIFFER_PB_BUFFER = 1003, DYNAMIC_TYPE_SNIFFER_TICKET_ID = 1004, DYNAMIC_TYPE_SNIFFER_NAMED_KEY = 1005, - DYNAMIC_TYPE_SNIFFER_KEY = 1006, + DYNAMIC_TYPE_SNIFFER_KEY = 1006 }; /* max error buffer string size */