diff --git a/README.md b/README.md index a24b2568dd..c20fb84183 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/wolfcrypt/src/aes.c b/wolfcrypt/src/aes.c index 6806acbc96..f42ffdaf59 100644 --- a/wolfcrypt/src/aes.c +++ b/wolfcrypt/src/aes.c @@ -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 #if !defined(NO_AES)