From 804410f8ad27d67c9bc9bf16e9dda105348cfe16 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Mon, 3 Sep 2018 17:47:00 +0200
Subject: [PATCH] getpass: Use calloc to allocate memory

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
(cherry picked from commit d4a443d56cd724cef5051eaecd4a750fb0ed8af3)
---
 src/getpass.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/getpass.c b/src/getpass.c
index 68dd1d46..2a34bc50 100644
--- a/src/getpass.c
+++ b/src/getpass.c
@@ -49,11 +49,10 @@ static int ssh_gets(const char *prompt, char *buf, size_t len, int verify) {
     char *ptr = NULL;
     int ok = 0;
 
-    tmp = malloc(len);
+    tmp = calloc(1, len);
     if (tmp == NULL) {
         return 0;
     }
-    memset(tmp,'\0',len);
 
     /* read the password */
     while (!ok) {
@@ -80,11 +79,10 @@ static int ssh_gets(const char *prompt, char *buf, size_t len, int verify) {
         if (verify) {
             char *key_string;
 
-            key_string = malloc(len);
+            key_string = calloc(1, len);
             if (key_string == NULL) {
                 break;
             }
-	          memset(key_string, '\0', len);
 
             fprintf(stdout, "\nVerifying, please re-enter. %s", prompt);
             fflush(stdout);