wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-01 03:34:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix "comma at end of enumerator list" warnings in wolfcrypt for C89 compatibility, mostly by just snipping out unneeded comma, but several using WOLF_ENUM_DUMMY_LAST_ELEMENT() to preserve gated enum values as-is.

Browse Source
This commit is contained in:
Daniel Pouzzner
2023-04-14 13:48:03 -05:00
parent 2bcf6bd3ca
commit ac85cfa3d5
25 changed files with 105 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
wolfcrypt/src/asn.c
View File

@@ -6332,6 +6332,7 @@ enum {
RSAKEYASN_IDX_DQ,
RSAKEYASN_IDX_U,
#endif
WOLF_ENUM_DUMMY_LAST_ELEMENT(RSAKEYASN_IDX)
};
/* Number of items in ASN.1 template for an RSA private key. */
@@ -6628,6 +6629,7 @@ enum {
PKCS8KEYASN_IDX_PKEY_ALGO_PARAM_SEQ,
#endif
PKCS8KEYASN_IDX_PKEY_DATA,
WOLF_ENUM_DUMMY_LAST_ELEMENT(PKCS8KEYASN_IDX)
};
/* Number of items in ASN.1 template for a PKCS #8 key. */
@@ -8060,7 +8062,7 @@ enum {
PBES2PARAMSASN_IDX_PBKDF2_PARAMS_PRF_NULL,
PBES2PARAMSASN_IDX_ENCS_SEQ,
PBES2PARAMSASN_IDX_ENCS_OID,
PBES2PARAMSASN_IDX_ENCS_PARAMS,
PBES2PARAMSASN_IDX_ENCS_PARAMS
};
/* Number of items in ASN.1 template for PBES2 parameters. */
@@ -8077,7 +8079,7 @@ static const ASNItem pbes1ParamsASN[] = {
};
enum {
PBES1PARAMSASN_IDX_SALT = 0,
PBES1PARAMSASN_IDX_ITER,
PBES1PARAMSASN_IDX_ITER
};
/* Number of items in ASN.1 template for PBES1 parameters. */
@@ -8444,7 +8446,7 @@ enum {
PKCS8DECASN_IDX_ENCALGO_OID,
PKCS8DECASN_IDX_ENCALGO_PARAMS,
PKCS8DECASN_IDX_ENCCONTENT,
PKCS8DECASN_IDX_ENCDATA,
PKCS8DECASN_IDX_ENCDATA
};
/* Number of items in ASN.1 template for PKCS #8/#7 encrypted key. */
@@ -8815,7 +8817,7 @@ enum {
P8ENCPBES1ASN_IDX_ENCALGO_PBEPARAM_SEQ,
P8ENCPBES1ASN_IDX_ENCALGO_PBEPARAM_SALT,
P8ENCPBES1ASN_IDX_ENCALGO_PBEPARAM_ITER,
P8ENCPBES1ASN_IDX_ENCDATA,
P8ENCPBES1ASN_IDX_ENCDATA
};
#define p8EncPbes1ASN_Length (sizeof(p8EncPbes1ASN) / sizeof(ASNItem))
@@ -9251,7 +9253,7 @@ enum {
RSAPUBLICKEYASN_IDX_PUBKEY,
RSAPUBLICKEYASN_IDX_PUBKEY_RSA_SEQ,
RSAPUBLICKEYASN_IDX_PUBKEY_RSA_N,
RSAPUBLICKEYASN_IDX_PUBKEY_RSA_E,
RSAPUBLICKEYASN_IDX_PUBKEY_RSA_E
};
/* Number of items in ASN.1 template for an RSA public key. */
@@ -9619,7 +9621,7 @@ enum {
DHPARAMASN_IDX_SEQ = 0,
DHPARAMASN_IDX_PRIME,
DHPARAMASN_IDX_BASE,
DHPARAMASN_IDX_PRIVLEN,
DHPARAMASN_IDX_PRIVLEN
};
/* Number of items in ASN.1 template for DH key. */
@@ -9669,7 +9671,7 @@ enum {
DHKEYPKCS8ASN_IDX_PKEY_STR,
DHKEYPKCS8ASN_IDX_PKEY_INT,
DHKEYPKCS8ASN_IDX_PUBKEY_STR,
DHKEYPKCS8ASN_IDX_PUBKEY_INT,
DHKEYPKCS8ASN_IDX_PUBKEY_INT
};
#define dhKeyPkcs8ASN_Length (sizeof(dhKeyPkcs8ASN) / sizeof(ASNItem))
@@ -10255,7 +10257,7 @@ enum {
DSAKEYASN_IDX_Q,
DSAKEYASN_IDX_G,
DSAKEYASN_IDX_Y,
DSAKEYASN_IDX_X,
DSAKEYASN_IDX_X
};
/* Number of items in ASN.1 template for DSA private key. */
@@ -10291,7 +10293,7 @@ enum {
DSAPUBKEYASN_IDX_ALGOID_PARAMS_Q,
DSAPUBKEYASN_IDX_ALGOID_PARAMS_G,
DSAPUBKEYASN_IDX_PUBKEY_STR,
DSAPUBKEYASN_IDX_PUBKEY_Y,
DSAPUBKEYASN_IDX_PUBKEY_Y
};
/* Number of items in ASN.1 template for PublicKeyInfo with DSA. */
@@ -10463,7 +10465,7 @@ enum {
DSAKEYOCTASN_IDX_Q,
DSAKEYOCTASN_IDX_G,
DSAKEYOCTASN_IDX_PKEY_STR,
DSAKEYOCTASN_IDX_X,
DSAKEYOCTASN_IDX_X
};
/* Number of items in ASN.1 template for a DSA key (OCTET_STRING version). */
@@ -11331,7 +11333,7 @@ static const ASNItem rsaCertKeyASN[] = {
};
enum {
RSACERTKEYASN_IDX_STR = 0,
RSACERTKEYASN_IDX_SEQ,
RSACERTKEYASN_IDX_SEQ
};
/* Number of items in ASN.1 template for header before RSA key in cert. */
@@ -11434,7 +11436,7 @@ static const ASNItem eccCertKeyASN[] = {
enum {
ECCCERTKEYASN_IDX_OID = 0,
ECCCERTKEYASN_IDX_PARAMS,
ECCCERTKEYASN_IDX_SUBJPUBKEY,
ECCCERTKEYASN_IDX_SUBJPUBKEY
};
/* Number of items in ASN.1 template for header before ECC key in cert. */
@@ -12235,7 +12237,7 @@ enum {
RDNASN_IDX_SET = 0,
RDNASN_IDX_ATTR_SEQ,
RDNASN_IDX_ATTR_TYPE,
RDNASN_IDX_ATTR_VAL,
RDNASN_IDX_ATTR_VAL
};
/* Number of items in ASN.1 template for an RDN. */
@@ -13427,7 +13429,7 @@ static const ASNItem certNameASN[] = {
};
enum {
CERTNAMEASN_IDX_OID = 0,
CERTNAMEASN_IDX_NAME,
CERTNAMEASN_IDX_NAME
};
/* Number of items in ASN.1 template for certificate name. */
@@ -14010,7 +14012,7 @@ static const ASNItem dateASN[] = {
};
enum {
DATEASN_IDX_UTC = 0,
DATEASN_IDX_GT,
DATEASN_IDX_GT
};
/* Number of items in ASN.1 template for a date. */
@@ -14831,7 +14833,7 @@ enum {
DIGESTINFOASN_IDX_DIGALGO_SEQ,
DIGESTINFOASN_IDX_DIGALGO_OID,
DIGESTINFOASN_IDX_DIGALGO_NULL,
DIGESTINFOASN_IDX_DIGEST,
DIGESTINFOASN_IDX_DIGEST
};
/* Number of items in ASN.1 template for DigestInfo for RSA. */
@@ -16601,7 +16603,7 @@ enum {
OTHERNAMEASN_IDX_FASCN,
OTHERNAMEASN_IDX_HWN_SEQ,
OTHERNAMEASN_IDX_HWN_TYPE,
OTHERNAMEASN_IDX_HWN_NUM,
OTHERNAMEASN_IDX_HWN_NUM
};
/* Number of items in ASN.1 template for OtherName of an X.509 certificate. */
@@ -16901,7 +16903,7 @@ static const ASNItem altNameASN[] = {
{ 0, ASN_CONTEXT_SPECIFIC | 0, 0, 1, 0 }
};
enum {
ALTNAMEASN_IDX_GN = 0,
ALTNAMEASN_IDX_GN = 0
};
/* Number of items in ASN.1 template for GeneralName. */
@@ -17513,7 +17515,7 @@ static const ASNItem basicConsASN[] = {
enum {
BASICCONSASN_IDX_SEQ = 0,
BASICCONSASN_IDX_CA,
BASICCONSASN_IDX_PLEN,
BASICCONSASN_IDX_PLEN
};
/* Number of items in ASN.1 template for BasicContraints. */
@@ -17721,7 +17723,7 @@ enum {
CRLDISTASN_IDX_DP_DISTPOINT_FN_GN,
CRLDISTASN_IDX_DP_DISTPOINT_RN, /* Relative name */
CRLDISTASN_IDX_DP_REASONS,
CRLDISTASN_IDX_DP_CRLISSUER,
CRLDISTASN_IDX_DP_CRLISSUER
};
/* Number of items in ASN.1 template for CRL distribution points. */
@@ -17908,7 +17910,7 @@ static const ASNItem accessDescASN[] = {
enum {
ACCESSDESCASN_IDX_SEQ = 0,
ACCESSDESCASN_IDX_METH,
ACCESSDESCASN_IDX_LOC,
ACCESSDESCASN_IDX_LOC
};
/* Number of items in ASN.1 template for the access description. */
@@ -18063,7 +18065,7 @@ enum {
AUTHKEYIDASN_IDX_SEQ = 0,
AUTHKEYIDASN_IDX_KEYID,
AUTHKEYIDASN_IDX_ISSUER,
AUTHKEYIDASN_IDX_SERIAL,
AUTHKEYIDASN_IDX_SERIAL
};
/* Number of items in ASN.1 template for AuthorityKeyIdentifier. */
@@ -18211,7 +18213,7 @@ static const ASNItem keyUsageASN[] = {
/* STR */ { 0, ASN_BIT_STRING, 0, 0, 0 },
};
enum {
KEYUSAGEASN_IDX_STR = 0,
KEYUSAGEASN_IDX_STR = 0
};
/* Number of items in ASN.1 template for KeyUsage. */
@@ -18273,7 +18275,7 @@ static const ASNItem keyPurposeIdASN[] = {
/* OID */ { 0, ASN_OBJECT_ID, 0, 0, 0 },
};
enum {
KEYPURPOSEIDASN_IDX_OID = 0,
KEYPURPOSEIDASN_IDX_OID = 0
};
/* Number of items in ASN.1 template for KeyPurposeId. */
@@ -18475,7 +18477,7 @@ enum {
SUBTREEASN_IDX_SEQ = 0,
SUBTREEASN_IDX_BASE,
SUBTREEASN_IDX_MIN,
SUBTREEASN_IDX_MAX,
SUBTREEASN_IDX_MAX
};
/* Number of items in ASN.1 template for GeneralSubtree. */
@@ -18695,7 +18697,7 @@ static const ASNItem nameConstraintsASN[] = {
enum {
NAMECONSTRAINTSASN_IDX_SEQ = 0,
NAMECONSTRAINTSASN_IDX_PERMIT,
NAMECONSTRAINTSASN_IDX_EXCLUDE,
NAMECONSTRAINTSASN_IDX_EXCLUDE
};
/* Number of items in ASN.1 template for NameConstraints. */
@@ -18864,7 +18866,7 @@ exit:
enum {
POLICYINFOASN_IDX_SEQ = 0,
POLICYINFOASN_IDX_ID,
POLICYINFOASN_IDX_QUALI,
POLICYINFOASN_IDX_QUALI
};
/* Number of items in ASN.1 template for PolicyInformation. */
@@ -19581,7 +19583,7 @@ static const ASNItem certExtHdrASN[] = {
};
enum {
CERTEXTHDRASN_IDX_EXTTAG = 0,
CERTEXTHDRASN_IDX_EXTSEQ,
CERTEXTHDRASN_IDX_EXTSEQ
};
/* Number of itesm in ASN.1 template for extensions. */
@@ -19603,7 +19605,7 @@ enum {
CERTEXTASN_IDX_SEQ = 0,
CERTEXTASN_IDX_OID,
CERTEXTASN_IDX_CRIT,
CERTEXTASN_IDX_VAL,
CERTEXTASN_IDX_VAL
};
/* Number of items in ASN.1 template for Extension. */
@@ -19934,6 +19936,7 @@ enum {
X509CERTASN_IDX_SIGALGO_PARAMS,
#endif
X509CERTASN_IDX_SIGNATURE,
WOLF_ENUM_DUMMY_LAST_ELEMENT(X509CERTASN_IDX)
};
/* Number of items in ASN template for an X509 certificate. */
@@ -20284,7 +20287,7 @@ static const ASNItem reqAttrASN[] = {
enum {
REQATTRASN_IDX_SEQ = 0,
REQATTRASN_IDX_TYPE,
REQATTRASN_IDX_VALS,
REQATTRASN_IDX_VALS
};
/* Number of items in ASN.1 template for certificate request Attribute. */
@@ -20295,7 +20298,7 @@ static const ASNItem strAttrASN[] = {
{ 0, 0, 0, 0, 0 },
};
enum {
STRATTRASN_IDX_STR = 0,
STRATTRASN_IDX_STR = 0
};
/* Number of items in ASN.1 template for a string choice. */
@@ -20521,7 +20524,7 @@ enum {
CERTREQASN_IDX_INFO_SIGALGO_SEQ,
CERTREQASN_IDX_INFO_SIGALGO_OID,
CERTREQASN_IDX_INFO_SIGALGO_NULL,
CERTREQASN_IDX_INFO_SIGNATURE,
CERTREQASN_IDX_INFO_SIGNATURE
};
/* Number of items in ASN.1 template for a certificate request. */
@@ -24501,7 +24504,7 @@ enum {
ECCPUBLICKEYASN_IDX_ALGOID_OID,
ECCPUBLICKEYASN_IDX_ALGOID_CURVEID,
ECCPUBLICKEYASN_IDX_ALGOID_PARAMS,
ECCPUBLICKEYASN_IDX_PUBKEY,
ECCPUBLICKEYASN_IDX_PUBKEY
};
/* Number of items in ASN.1 template for ECC public key. */
@@ -24756,7 +24759,7 @@ enum {
EDPUBKEYASN_IDX_SEQ = 0,
EDPUBKEYASN_IDX_ALGOID_SEQ,
EDPUBKEYASN_IDX_ALGOID_OID,
EDPUBKEYASN_IDX_PUBKEY,
EDPUBKEYASN_IDX_PUBKEY
};
/* Number of items in ASN.1 template for Ed25519 and Ed448 public key. */
@@ -25455,7 +25458,7 @@ static const ASNItem ekuASN[] = {
};
enum {
EKUASN_IDX_SEQ = 0,
EKUASN_IDX_OID,
EKUASN_IDX_OID
};
/* OIDs corresponding to extended key usage. */
@@ -26295,7 +26298,7 @@ static const ASNItem nameASN[] = {
{ 0, ASN_SEQUENCE, 1, 1, 0 },
};
enum {
NAMEASN_IDX_SEQ = 0,
NAMEASN_IDX_SEQ = 0
};
/* Number of items in ASN.1 template for the SEQUENCE around the RDNs. */
@@ -26767,8 +26770,7 @@ enum {
CERTEXTSASN_IDX_CUSTOM_SEQ,
CERTEXTSASN_IDX_CUSTOM_OID,
CERTEXTSASN_IDX_CUSTOM_STR,
CERTEXTSASN_IDX_START_CUSTOM,
CERTEXTSASN_IDX_START_CUSTOM
};
/* Number of items in ASN.1 template for certificate extensions. We multiply
@@ -28028,7 +28030,7 @@ enum {
SIGASN_IDX_SIGALGO_SEQ,
SIGASN_IDX_SIGALGO_OID,
SIGASN_IDX_SIGALGO_NULL,
SIGASN_IDX_SIGNATURE,
SIGASN_IDX_SIGNATURE
};
/* Number of items in ASN.1 template for a Certificate. */
@@ -29152,7 +29154,7 @@ enum {
CERTREQBODYASN_IDX_EXT_SEQ,
CERTREQBODYASN_IDX_EXT_OID,
CERTREQBODYASN_IDX_EXT_SET,
CERTREQBODYASN_IDX_EXT_BODY,
CERTREQBODYASN_IDX_EXT_BODY
};
/* Number of items in ASN.1 template for Certificate Request body. */
@@ -30920,7 +30922,7 @@ static const ASNItem dsaSigASN[] = {
enum {
DSASIGASN_IDX_SEQ = 0,
DSASIGASN_IDX_R,
DSASIGASN_IDX_S,
DSASIGASN_IDX_S
};
#define dsaSigASN_Length (sizeof(dsaSigASN) / sizeof(ASNItem))
@@ -31334,7 +31336,7 @@ enum {
ECCSPECIFIEDASN_IDX_BASE,
ECCSPECIFIEDASN_IDX_ORDER,
ECCSPECIFIEDASN_IDX_COFACTOR,
ECCSPECIFIEDASN_IDX_HASH_SEQ,
ECCSPECIFIEDASN_IDX_HASH_SEQ
};
/* Number of items in ASN.1 template for SpecifiedECDomain. */
@@ -31542,7 +31544,7 @@ enum {
ECCKEYASN_IDX_CURVEID,
ECCKEYASN_IDX_CURVEPARAMS,
ECCKEYASN_IDX_PUBKEY,
ECCKEYASN_IDX_PUBKEY_VAL,
ECCKEYASN_IDX_PUBKEY_VAL
};
/* Number of items in ASN.1 template for ECC private key. */
@@ -32638,7 +32640,7 @@ enum {
EDKEYASN_IDX_PKEY,
EDKEYASN_IDX_PKEY_CURVEPKEY,
EDKEYASN_IDX_ATTRS,
EDKEYASN_IDX_PUBKEY,
EDKEYASN_IDX_PUBKEY
};
/* Number of items in ASN.1 template for Ed25519 and Ed448 private key. */
@@ -35193,7 +35195,7 @@ static const ASNItem nameHashASN[] = {
};
enum {
NAMEHASHASN_IDX_OID = 0,
NAMEHASHASN_IDX_NAME,
NAMEHASHASN_IDX_NAME
};
/* Number of items in ASN.1 template for certificate name hash. */

2
wolfcrypt/src/coding.c
View File

@@ -45,7 +45,7 @@ enum {
BAD = 0xFF, /* invalid encoding */
PAD = '=',
BASE64_MIN = 0x2B,
BASE16_MIN = 0x30,
BASE16_MIN = 0x30
};

3
wolfcrypt/src/ecc.c
View File

@@ -251,7 +251,7 @@ enum {
ECC_STATE_VERIFY_DECODE,
ECC_STATE_VERIFY_DO,
ECC_STATE_VERIFY_RES,
ECC_STATE_VERIFY_RES
};
@@ -1344,6 +1344,7 @@ enum ecc_curve_load_mask {
ECC_CURVE_FIELD_ALL = 0x3B,
ECC_CURVE_FIELD_COUNT = 5,
#endif
WOLF_ENUM_DUMMY_LAST_ELEMENT(ecc_curve_load_mask)
};
#if defined(WOLFSSL_XILINX_CRYPT_VERSAL)

2
wolfcrypt/src/pkcs12.c
View File

@@ -60,7 +60,7 @@ enum {
WC_PKCS12_ENCRYPTED_DATA = 656,
WC_PKCS12_DATA_OBJ_SZ = 11,
WC_PKCS12_MAC_SALT_SZ = 8,
WC_PKCS12_MAC_SALT_SZ = 8
};
static const byte WC_PKCS12_ENCRYPTED_OID[] =

2
wolfcrypt/src/rsa.c
View File

@@ -238,7 +238,7 @@ enum {
RSA_STATE_DECRYPT_EXPTMOD,
RSA_STATE_DECRYPT_UNPAD,
RSA_STATE_DECRYPT_RES,
RSA_STATE_DECRYPT_RES
};

4
wolfssl/wolfcrypt/aes.h
View File

@@ -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
@@ -180,6 +180,8 @@ enum {
AES_MAX_ID_LEN = 32,
AES_MAX_LABEL_LEN = 32,
#endif
WOLF_ENUM_DUMMY_LAST_ELEMENT(AES)
};

2
wolfssl/wolfcrypt/arc4.h
View File

@@ -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 */

32
wolfssl/wolfcrypt/asn.h
View File

@@ -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. */
@@ -1002,7 +1002,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
@@ -1109,7 +1109,7 @@ 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)
@@ -1134,14 +1134,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
};
@@ -1193,8 +1193,9 @@ enum CertificatePolicy_Sum {
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 */
CP_FPKI_PIVI_AUTH_OID = 458, /* 2.16.840.1.101.3.2.1.3.45 */
#endif /* WOLFSSL_FPKI */
WOLF_ENUM_DUMMY_LAST_ELEMENT(CertificatePolicy_Sum)
};
enum SepHardwareName_Sum {
@@ -1205,8 +1206,9 @@ 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 */
#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 */
WOLF_ENUM_DUMMY_LAST_ELEMENT(AuthInfo_Sum)
};
#define ID_PKIX(num) (67+(num)) /* 1.3.6.1.5.5.7.num, id-pkix num */
@@ -1252,7 +1254,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
@@ -1274,7 +1276,7 @@ enum CsrAttrType {
INITIALS_OID = 132,
SURNAME_OID = 93,
NAME_OID = 130,
GIVEN_NAME_OID = 131,
GIVEN_NAME_OID = 131
};
#endif
@@ -1357,7 +1359,7 @@ enum SignatureState {
SIG_STATE_HASH,
SIG_STATE_KEY,
SIG_STATE_DO,
SIG_STATE_CHECK,
SIG_STATE_CHECK
};
@@ -1467,7 +1469,7 @@ enum CertSignState {
CERTSIGN_STATE_BEGIN,
CERTSIGN_STATE_DIGEST,
CERTSIGN_STATE_ENCODE,
CERTSIGN_STATE_DO,
CERTSIGN_STATE_DO
};
struct CertSignCtx {
@@ -2250,7 +2252,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 */
@@ -2535,7 +2537,7 @@ enum PBESTypes {
PBES2 = 13, /* algo ID */
PBES1_MD5_DES = 3,
PBES1_SHA1_DES = 10,
PBES1_SHA1_DES = 10
};
enum PKCSTypes {
@@ -2545,7 +2547,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 */

9
wolfssl/wolfcrypt/asn_public.h
View File

@@ -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 {
@@ -243,6 +243,7 @@ enum Ctc_Misc {
* enough for at least two
* distribution points. */
#endif /* WOLFSSL_CERT_EXT */
WOLF_ENUM_DUMMY_LAST_ELEMENT(Ctc_Misc)
};
/* DER buffer */
@@ -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);

2
wolfssl/wolfcrypt/chacha.h
View File

@@ -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 {

2
wolfssl/wolfcrypt/chacha20_poly1305.h
View File

@@ -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 {

2
wolfssl/wolfcrypt/des3.h
View File

@@ -49,7 +49,7 @@
enum {
DES_KEY_SIZE = 8, /* des */
DES3_KEY_SIZE = 24, /* 3 des ede */
DES_IV_SIZE = 8, /* should be the same as DES_BLOCK_SIZE */
DES_IV_SIZE = 8 /* should be the same as DES_BLOCK_SIZE */
};

2
wolfssl/wolfcrypt/dh.h
View File

@@ -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 */

2
wolfssl/wolfcrypt/dsa.h
View File

@@ -66,7 +66,7 @@ enum {
DSA_MIN_SIG_SIZE = DSA_160_SIG_SIZE,
DSA_MAX_HALF_SIZE = DSA_256_HALF_SIZE,
DSA_MAX_SIG_SIZE = DSA_256_SIG_SIZE,
DSA_MAX_SIG_SIZE = DSA_256_SIG_SIZE
};
/* DSA */

4
wolfssl/wolfcrypt/ecc.h
View File

@@ -195,6 +195,8 @@ enum {
ECC_MAX_ID_LEN = 32,
ECC_MAX_LABEL_LEN = 32,
#endif
WOLF_ENUM_DUMMY_LAST_ELEMENT(ECC)
};
#endif /* HAVE_ECC */
@@ -413,7 +415,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 */

1
wolfssl/wolfcrypt/hash.h
View File

@@ -86,6 +86,7 @@ enum wc_HashFlags {
#ifdef WOLFSSL_SHA3
WC_HASH_SHA3_KECCAK256 =0x00010000, /* Older KECCAK256 */
#endif
WOLF_ENUM_DUMMY_LAST_ELEMENT(WC_HASH)
};
#ifndef NO_HASH_WRAPPER

2
wolfssl/wolfcrypt/hmac.h
View File

@@ -107,6 +107,8 @@ enum {
HMAC_MAX_ID_LEN = 32,
HMAC_MAX_LABEL_LEN = 32,
#endif
WOLF_ENUM_DUMMY_LAST_ELEMENT(HMAC)
};
/* Select the largest available hash for the buffer size. */

2
wolfssl/wolfcrypt/pkcs12.h
View File

@@ -43,7 +43,7 @@ typedef struct WC_DerCertList { /* dereferenced in ssl.c */
enum {
WC_PKCS12_ITT_DEFAULT = 2048,
WC_PKCS12_VERSION_DEFAULT = 3,
WC_PKCS12_MAC_DEFAULT = 1,
WC_PKCS12_MAC_DEFAULT = 1
};
WOLFSSL_API WC_PKCS12* wc_PKCS12_new(void);

5
wolfssl/wolfcrypt/pkcs7.h
View File

@@ -141,7 +141,7 @@ enum PKCS7_STATE {
WC_PKCS7_DECRYPT_PWRI,
WC_PKCS7_DECRYPT_ORI,
WC_PKCS7_DECRYPT_DONE,
WC_PKCS7_DECRYPT_DONE
};
@@ -158,11 +158,12 @@ enum Pkcs7_Misc {
MAX_RECIP_SZ = MAX_VERSION_SZ +
MAX_SEQ_SZ + WC_ASN_NAME_MAX + MAX_SN_SZ +
MAX_SEQ_SZ + MAX_ALGO_SZ + 1 + MAX_ENCRYPTED_KEY_SZ,
WOLF_ENUM_DUMMY_LAST_ELEMENT(Pkcs7_Misc)
};
enum Cms_Options {
CMS_SKID = 1,
CMS_ISSUER_AND_SERIAL_NUMBER = 2,
CMS_ISSUER_AND_SERIAL_NUMBER = 2
};
#define DEGENERATE_SID 3

2
wolfssl/wolfcrypt/poly1305.h
View File

@@ -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

2
wolfssl/wolfcrypt/rsa.h
View File

@@ -180,6 +180,8 @@ enum {
RSA_MAX_ID_LEN = 32,
RSA_MAX_LABEL_LEN = 32,
#endif
WOLF_ENUM_DUMMY_LAST_ELEMENT(RSA)
};
#ifdef WC_RSA_NONBLOCK

2
wolfssl/wolfcrypt/signature.h
View File

@@ -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,

2
wolfssl/wolfcrypt/siphash.h
View File

@@ -59,7 +59,7 @@ enum {
SIPHASH_KEY_SIZE = 16, /* Key size of SipHash. */
SIPHASH_BLOCK_SIZE = 8, /* Block size of SipHash. */
SIPHASH_MAC_SIZE_8 = 8, /* Output an 8 byte MAC. */
SIPHASH_MAC_SIZE_16 = 16, /* Output a 16 byte MAC. */
SIPHASH_MAC_SIZE_16 = 16 /* Output a 16 byte MAC. */
};
typedef struct SipHash SipHash;

8
wolfssl/wolfcrypt/sp_int.h
View File

@@ -96,14 +96,16 @@ extern "C" {
#error "Size of unsigned int not detected"
#endif
#if defined(WOLF_C89) && !defined(NO_64BIT) && ULONG_MAX == 18446744073709551615UL
#if defined(WOLF_C89) && !defined(NO_64BIT) && \
ULONG_MAX == 18446744073709551615UL
#define SP_ULONG_BITS 64
typedef unsigned long sp_uint64;
typedef long sp_int64;
#elif !defined(WOLF_C89) && !defined(NO_64BIT) && ULONG_MAX == 18446744073709551615ULL && \
#elif !defined(WOLF_C89) && !defined(NO_64BIT) && \
ULONG_MAX == 18446744073709551615ULL && \
4294967295UL != 18446744073709551615ULL /* verify pre-processor supports
* 64-bit ULL types */
* 64-bit ULL types */
#define SP_ULONG_BITS 64
typedef unsigned long sp_uint64;

4
wolfssl/wolfcrypt/srp.h
View File

@@ -65,7 +65,7 @@
*/
typedef enum {
SRP_CLIENT_SIDE = 0,
SRP_SERVER_SIDE = 1,
SRP_SERVER_SIDE = 1
} SrpSide;
/**
@@ -75,7 +75,7 @@ typedef enum {
SRP_TYPE_SHA = 1,
SRP_TYPE_SHA256 = 2,
SRP_TYPE_SHA384 = 3,
SRP_TYPE_SHA512 = 4,
SRP_TYPE_SHA512 = 4
} SrpType;