Skip to content

Commit 8760b72

Browse files
committed
Add missing NO_WC_SHE_LOADKEY macro to known macros list
1 parent 994b0cd commit 8760b72

1 file changed

Lines changed: 0 additions & 3 deletions

File tree

.wolfssl_known_macro_extras

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -661,8 +661,6 @@ WC_RSA_NONBLOCK
661661
WC_RSA_NONBLOCK_TIME
662662
WC_RSA_NO_FERMAT_CHECK
663663
WC_RWLOCK_OPS_INLINE
664-
<<<<<<< HEAD
665-
=======
666664
WC_SHA384
667665
WC_SHA384_DIGEST_SIZE
668666
WC_SHA512
@@ -676,7 +674,6 @@ WC_SHE_SW_TEST_EXP_M3
676674
WC_SHE_SW_TEST_EXP_M4
677675
WC_SHE_SW_TEST_EXP_M5
678676
WC_SHE_SW_TEST_NEW_KEY
679-
>>>>>>> 68515713f0 (Address comments from bigbrett and Fenrir bot. Rename she.{c,h} to wc_she.{c,h}, fix naming consistency, auto-enable CMAC/AES dependencies, add WC_SHE_SW_DEFAULT opt-inAddress PR #10009 review comments from bigbrett and Fenrir)
680677
WC_SKIP_INCLUDED_C_FILES
681678
WC_SSIZE_TYPE
682679
WC_STRICT_SIG

0 commit comments

Comments
 (0)