Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# wolfSSL Embedded SSL/TLS Library
# wolfSSL Embedded SSL/TLS Library - DO NOT MERGE

The [wolfSSL embedded SSL library](https://www.wolfssl.com/products/wolfssl/)
(formerly CyaSSL) is a lightweight SSL/TLS library written in ANSI C and
Expand Down
2 changes: 2 additions & 0 deletions wolfcrypt/src/aes.c
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,8 @@ block cipher mechanism that uses n-bit binary string parameter key with 128-bits
* WOLFSSL_HW_METRICS: Track hardware acceleration usage default: off
*/


/* DO NOT MERGE --- Test */
#include <wolfssl/wolfcrypt/libwolfssl_sources.h>

#if !defined(NO_AES)
Expand Down
Loading