From 1a7c8ccbd1968cf8a2ec3e08acc2b7a126e64240 Mon Sep 17 00:00:00 2001
From: David Garske <david@wolfssl.com>
Date: Tue, 20 Jul 2021 09:40:28 -0700
Subject: [PATCH] Peer review fixes.

---
 src/ssl.c     | 4 +++-
 wolfssl/ssl.h | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/ssl.c b/src/ssl.c
index 9d31e6e18..5ee5643d5 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -8101,12 +8101,14 @@ static int wolfSSL_EVP_PKEY_get_der(const WOLFSSL_EVP_PKEY* key, unsigned char**
 {
     unsigned char* pt;
     int sz;
-    word16 pkcs8HeaderSz = 0;
+    word16 pkcs8HeaderSz;
 
     if (!key || !key->pkey_sz)
         return WOLFSSL_FATAL_ERROR;
 
     /* return the key without PKCS8 for compatibility */
+    /* if pkcs8HeaderSz is invalid, use 0 and return all of pkey */
+    pkcs8HeaderSz = 0;
     if (key->pkey_sz < key->pkcs8HeaderSz)
         pkcs8HeaderSz = key->pkcs8HeaderSz;
     sz = key->pkey_sz - pkcs8HeaderSz;
diff --git a/wolfssl/ssl.h b/wolfssl/ssl.h
index a7455cdf3..ecff5dbeb 100644
--- a/wolfssl/ssl.h
+++ b/wolfssl/ssl.h
@@ -356,7 +356,7 @@ struct WOLFSSL_EVP_PKEY {
     #ifndef NO_RSA
     WOLFSSL_RSA* rsa;
     #endif
-#ifndef NO_DSA
+    #ifndef NO_DSA
     WOLFSSL_DSA* dsa;
     #endif
     #ifdef HAVE_ECC