Move bit-fields to the end

Author: lealem47

wolfssl/internal.h

@@ -2563,7 +2563,6 @@ struct CRL_Entry {
      * as the marker because clang-tidy doesn't like taking the sizeof a
      * pointer. */
     byte    crlNumber[CRL_MAX_NUM_SZ];    /* CRL number extension */
-    byte    crlNumberSet;                 /* CRL number set indicator */
     byte    issuerHash[CRL_DIGEST_SIZE];  /* issuer hash                 */
     /* byte    crlHash[CRL_DIGEST_SIZE];      raw crl data hash           */
     /* restore the hash here if needed for optimized comparisons */
@@ -2591,9 +2590,10 @@ struct CRL_Entry {
     byte*   sigParams;   /* buffer with signature parameters */
 #endif
 #if !defined(NO_SKID) && !defined(NO_ASN)
-    byte    extAuthKeyIdSet;
     byte    extAuthKeyId[KEYID_SIZE];
+    byte    extAuthKeyIdSet:1;  /* Auth key identifier set indicator */
 #endif
+    byte    crlNumberSet:1;     /* CRL number set indicator */
 };
 
 

wolfssl/ssl.h

@@ -3749,7 +3749,6 @@ typedef int  (*CbCrlIO)(WOLFSSL_CRL* crl, const char* url, int urlSz);
 #ifdef HAVE_CRL_UPDATE_CB
 typedef struct CrlInfo {
     byte crlNumber[CRL_MAX_NUM_SZ];
-    byte crlNumberSet;
     byte *issuerHash;
     word32 issuerHashLen;
     byte *lastDate;
@@ -3758,6 +3757,7 @@ typedef struct CrlInfo {
     byte *nextDate;
     word32 nextDateMaxLen;
     byte nextDateFormat;
+    byte crlNumberSet:1;
 } CrlInfo;
 
 typedef void (*CbUpdateCRL)(CrlInfo* old, CrlInfo* cnew);

wolfssl/wolfcrypt/asn.h

@@ -2870,7 +2870,6 @@ struct DecodedCRL {
 #endif
     byte*   signature;               /* pointer into raw source, not owned */
     byte    crlNumber[CRL_MAX_NUM_SZ];      /* CRL number extension */
-    byte    crlNumberSet;                   /* CRL number set indicator */
     byte    issuerHash[SIGNER_DIGEST_SIZE]; /* issuer name hash          */
     byte    crlHash[SIGNER_DIGEST_SIZE]; /* raw crl data hash            */
     byte    lastDate[MAX_DATE_SIZE]; /* last date updated  */
@@ -2886,9 +2885,10 @@ struct DecodedCRL {
     int          version;            /* version of cert    */
     void*   heap;
 #ifndef NO_SKID
-    byte    extAuthKeyIdSet;
     byte    extAuthKeyId[SIGNER_DIGEST_SIZE]; /* Authority Key ID        */
+    byte    extAuthKeyIdSet:1;       /* Auth key identifier set indicator */
 #endif
+    byte    crlNumberSet:1;          /* CRL number set indicator */
 };
 
 WOLFSSL_LOCAL void InitDecodedCRL(DecodedCRL* dcrl, void* heap);