Fix use of strncpy, which is actually good to use memcpy.

* common/ssh-utils.c (get_fingerprint): Use memcpy.
* g10/build-packet.c (string_to_notation): Use memcpy.

--

Cherry-pick of master commit of:
	625ced6e672daa892d334323cce6b3d42a6f929f

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
(cherry picked from commit f0fdee2e24a25f57a84e1684984ce3921d923e0a)

Gbp-Pq: Name Fix-use-of-strncpy-which-is-actually-good-to-use-memcpy.patch

diff --git a/common/ssh-utils.c b/common/ssh-utils.c
index 38d6e8aa2881f091905ce06bf92528093705ec72..013b28e5be90d5aa5dd2fd7d798ba0d15278fe81 100644 (file)
--- a/common/ssh-utils.c
+++ b/common/ssh-utils.c
@@ -247,7 +247,7 @@ get_fingerprint (gcry_sexp_t key, int algo,
           goto leave;
         }
 
-      strncpy (*r_fpr, algo_name, strlen (algo_name));
+      memcpy (*r_fpr, algo_name, strlen (algo_name));
       fpr = (char *) *r_fpr + strlen (algo_name);
       *fpr++ = ':';
 

diff --git a/g10/build-packet.c b/g10/build-packet.c
index d4a1d6a53321df702d45afcab5593907760c062e..b83ea84a52452e57ce53239d635dfaa8bde4d39d 100644 (file)
--- a/g10/build-packet.c
+++ b/g10/build-packet.c
@@ -1266,7 +1266,7 @@ string_to_notation(const char *string,int is_utf8)
     }
 
   notation->name=xmalloc((s-string)+1);
-  strncpy(notation->name,string,s-string);
+  memcpy(notation->name,string,s-string);
   notation->name[s-string]='\0';
 
   if(!saw_at && !opt.expert)