From d68016050082930e4e7fa7c87ef9c1046f9b518b Mon Sep 17 00:00:00 2001
From: Andreas Schneider <mail@cynapses.org>
Date: Thu, 30 Apr 2009 14:07:33 +0000
Subject: [PATCH] Add a BURN_STRING macro and use it in auth.c.

git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@660 7dcaeef0-15fb-0310-b436-a5af3365683c
---
 include/libssh/priv.h |  3 +++
 libssh/auth.c         | 15 +++++----------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/include/libssh/priv.h b/include/libssh/priv.h
index 62f78ba1..f7c474ac 100644
--- a/include/libssh/priv.h
+++ b/include/libssh/priv.h
@@ -727,6 +727,9 @@ int match_hostname(const char *host, const char *pattern, unsigned int len);
 /** Get the size of an array */
 #define ARRAY_SIZE(a) (sizeof(a)/sizeof(a[0]))
 
+/** Overwrite the complete string with 'X' */
+#define BURN_STRING(x) do { if ((x) != NULL) memset((x), 'X', strlen((x))); } while(0)
+
 #ifdef HAVE_LIBGCRYPT
 /* gcrypt_missing.c */
 int my_gcry_dec2bn(bignum *bn, const char *data);
diff --git a/libssh/auth.c b/libssh/auth.c
index fbb073f5..c83dea1f 100644
--- a/libssh/auth.c
+++ b/libssh/auth.c
@@ -53,11 +53,6 @@ static int ask_userauth(SSH_SESSION *session) {
   return rc;
 }
 
-static void burn(char *ptr){
-    if(ptr)
-        memset(ptr,'X',strlen(ptr));
-}
-
 static int wait_auth_status(SSH_SESSION *session,int kbdint){
     int err=SSH_AUTH_ERROR;
     int cont=1;
@@ -964,14 +959,14 @@ static void kbdint_free(struct ssh_kbdint *kbd) {
 
   if (kbd->prompts) {
     for (i = 0; i < n; i++) {
-      burn(kbd->prompts[i]);
+      BURN_STRING(kbd->prompts[i]);
       SAFE_FREE(kbd->prompts[i]);
     }
     SAFE_FREE(kbd->prompts);
   }
   if (kbd->answers) {
     for (i = 0; i < n; i++) {
-      burn(kbd->answers[i]);
+      BURN_STRING(kbd->answers[i]);
       SAFE_FREE(kbd->answers[i]);
     }
     SAFE_FREE(kbd->answers);
@@ -995,7 +990,7 @@ static void kbdint_clean(struct ssh_kbdint *kbd) {
 
   if (kbd->prompts) {
     for (i = 0; i < n; i++) {
-      burn(kbd->prompts[i]);
+      BURN_STRING(kbd->prompts[i]);
       SAFE_FREE(kbd->prompts[i]);
     }
     SAFE_FREE(kbd->prompts);
@@ -1003,7 +998,7 @@ static void kbdint_clean(struct ssh_kbdint *kbd) {
 
   if (kbd->answers) {
     for (i = 0; i < n; i++) {
-      burn(kbd->answers[i]);
+      BURN_STRING(kbd->answers[i]);
       SAFE_FREE(kbd->answers[i]);
     }
       SAFE_FREE(kbd->answers);
@@ -1429,7 +1424,7 @@ int ssh_userauth_kbdint_setanswer(SSH_SESSION *session, unsigned int i,
   }
 
   if (session->kbdint->answers[i]) {
-    burn(session->kbdint->answers[i]);
+    BURN_STRING(session->kbdint->answers[i]);
     SAFE_FREE(session->kbdint->answers[i]);
   }