Removing compiler warnings when passing an uninitialized dummy object…

… into SEVCert constructor Signed-off-by: Brian Lilienthal <[email protected]>
jejb · Aug 16, 2019 · 3109b4a · 3109b4a
1 parent a3647d5
commit 3109b4a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/deps-install.sh b/deps-install.sh
@@ -131,7 +131,7 @@ check_dependencies()
 		[ "$(rpm -q 'zip' 2>&1 | grep 'not installed')" != "" ]            ||
 		[ "$(rpm -q 'wget' 2>&1 | grep 'not installed')" != "" ]           ||
 		[ "$(rpm -q ${LIBVIRT_NAME} 2>&1 | grep 'not installed')" != "" ]  ||
-		[ "$(rpm -q ${UUID_NAME} 2>&1 | grep 'not installed')" != "" ]  ||
+		[ "$(rpm -q ${UUID_NAME} 2>&1 | grep 'not installed')" != "" ]     ||
 		[ "$(rpm -q ${AUTO_CONF} 2>&1 | grep 'not installed')" != "" ]     ||
 		[ "$(rpm -q ${SSL_DEV} 2>&1 | grep 'not installed')" != "" ]       ||
 		[ "$(rpm -q ${GCC_CPP} 2>&1 | grep 'not installed')" != "" ]
@@ -153,7 +153,7 @@ check_dependencies()
 		[ "$(dpkg -l 'zip' 2>&1 | grep 'no packages')" != "" ]            ||
 		[ "$(dpkg -l 'wget' 2>&1 | grep 'no packages')" != "" ]           ||
 		[ "$(dpkg -l ${LIBVIRT_NAME} 2>&1 | grep 'no packages')" != "" ]  ||
-		[ "$(dpkg -l ${UUID_NAME} 2>&1 | grep 'no packages')" != "" ]  ||
+		[ "$(dpkg -l ${UUID_NAME} 2>&1 | grep 'no packages')" != "" ]     ||
 		[ "$(dpkg -l ${AUTO_CONF} 2>&1 | grep 'no packages')" != "" ]     ||
 		[ "$(dpkg -l ${SSL_DEV} 2>&1 | grep 'no packages')" != "" ]       ||
 		[ "$(dpkg -l ${GCC_CPP} 2>&1 | grep 'no packages')" != "" ]

diff --git a/src/commands.cpp b/src/commands.cpp
@@ -995,9 +995,10 @@ bool Command::derive_master_secret(aes_128_key master_secret,
         return false;
 
     sev_cert dummy;
-    SEVCert tempObj(dummy);         // TODO. Hack b/c just want to call function later
+    memset(&dummy, 0, sizeof(sev_cert));    // To remove compile warnings
+    SEVCert tempObj(dummy);                 // TODO. Hack b/c just want to call function later
     bool ret = false;
-    EVP_PKEY *plat_owner_pub_key = NULL;     // Platform owner public key
+    EVP_PKEY *plat_owner_pub_key = NULL;    // Platform owner public key
     size_t shared_key_len = 0;
 
     do {

diff --git a/src/tests.cpp b/src/tests.cpp
@@ -54,7 +54,8 @@ bool Tests::test_factory_reset()
     bool ret = false;
     Command cmd(m_output_folder, m_verbose_flag);
     sev_cert dummy;
-    SEVCert cert(dummy);
+    memset(&dummy, 0, sizeof(sev_cert));    // To remove compile warnings
+    SEVCert cert(dummy);                    // TODO. Hack b/c just want to call function later
 
     do {
         printf("*Starting factory_reset tests\n");
@@ -337,7 +338,8 @@ bool Tests::test_pek_cert_import()
     sev_cert pdh_orig;
     sev_cert pdh_new;
     sev_cert dummy;
-    SEVCert cert(dummy);
+    memset(&dummy, 0, sizeof(sev_cert));    // To remove compile warnings
+    SEVCert cert(dummy);                    // TODO. Hack b/c just want to call function later
 
     do {
         printf("*Starting pek_cert_import tests\n");
@@ -434,7 +436,8 @@ bool Tests::test_set_self_owned()
     bool ret = false;
     Command cmd(m_output_folder, m_verbose_flag);
     sev_cert dummy;
-    SEVCert cert(dummy);
+    memset(&dummy, 0, sizeof(sev_cert));    // To remove compile warnings
+    SEVCert cert(dummy);                    // TODO. Hack b/c just want to call function later
 
     do {
         printf("*Starting factory_reset tests\n");
@@ -487,7 +490,8 @@ bool Tests::test_set_externally_owned()
     bool ret = false;
     Command cmd(m_output_folder, m_verbose_flag);
     sev_cert dummy;
-    SEVCert cert(dummy);
+    memset(&dummy, 0, sizeof(sev_cert));    // To remove compile warnings
+    SEVCert cert(dummy);                    // TODO. Hack b/c just want to call function later
 
     do {
         printf("*Starting set_externally_owned tests\n");