diff --git a/wolfCLU/clu_src/genkey/clu_genkey.c b/wolfCLU/clu_src/genkey/clu_genkey.c
index 8201a6cd..88745b15 100644
--- a/wolfCLU/clu_src/genkey/clu_genkey.c
+++ b/wolfCLU/clu_src/genkey/clu_genkey.c
@@ -161,7 +161,8 @@ int wolfCLU_genKey_ECC(RNG* rng, char* fName, int directive, int fmt,
     char* fOutNameBuf = NULL;
     
     #ifdef NO_AES
-    size_t maxDerBufSz = 4 * keySz * keySz-42;
+    /* use 16 bytes for AES block size */
+    size_t maxDerBufSz = 4 * keySz * 16;
     #else
     size_t maxDerBufSz = 4 * keySz * AES_BLOCK_SIZE;
     #endif
@@ -304,7 +305,8 @@ int wolfCLU_genKey_RSA(RNG* rng, char* fName, int directive, int fmt, int
     char* fOutNameBuf = NULL;
 
     #ifdef NO_AES
-    size_t maxDerBufSz = 4 * keySz * keySz-42;
+    /* use 16 bytes for AES block size */
+    size_t maxDerBufSz = 4 * keySz * 16;
     #else
     size_t maxDerBufSz = 4 * keySz * AES_BLOCK_SIZE;
     #endif
diff --git a/wolfCLU/clu_src/tools/clu_funcs.c b/wolfCLU/clu_src/tools/clu_funcs.c
index d463c0af..ec12d52e 100644
--- a/wolfCLU/clu_src/tools/clu_funcs.c
+++ b/wolfCLU/clu_src/tools/clu_funcs.c
@@ -48,6 +48,7 @@ int     i          =   0;       /* loop variable */
     printf("-x509           X509 certificate processing\n");
     printf("-rsa            Rsa signing and signature verification\n");
     printf("-ecc            Ecc signing and signature verification\n");
+    printf("-ed25519        Ed25519 signing and signature verification\n");
     printf("\n");
     /*optional flags*/
     printf("Optional Flags.\n\n");
@@ -74,6 +75,7 @@ int     i          =   0;       /* loop variable */
     printf("For key creation: wolfssl -genkey -help\n");
     printf("For RSA sign/ver: wolfssl -rsa -help\n");
     printf("For ECC sign/ver: wolfssl -ecc -help\n");
+    printf("For ED25519 sign/ver: wolfssl -ed25519 -help\n");
  }
 
 /*