From 65e965791ffa9c48c1764d3a08f9f675bada7607 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Fri, 7 Dec 2012 23:42:58 +0900
Subject: [PATCH] shrpx: Replace strncpy + putting null with memcpy in
 ssl_pem_passwd_cb

---
 src/shrpx_ssl.cc | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/shrpx_ssl.cc b/src/shrpx_ssl.cc
index 3bdae05..d6e17ae 100644
--- a/src/shrpx_ssl.cc
+++ b/src/shrpx_ssl.cc
@@ -91,8 +91,8 @@ void set_npn_prefs(unsigned char *out, const char **protos, size_t len)
 }
 } // namespace
 
-
-static int ssl_pem_passwd_cb(char *buf, int size, int rwflag, void *user_data)
+namespace {
+int ssl_pem_passwd_cb(char *buf, int size, int rwflag, void *user_data)
 {
   Config *config = (Config *)user_data;
   int len = (int)strlen(config->private_key_passwd);
@@ -100,12 +100,11 @@ static int ssl_pem_passwd_cb(char *buf, int size, int rwflag, void *user_data)
     LOG(ERROR) << "ssl_pem_passwd_cb: buf is too small " << size;
     return 0;
   }
-
-  strncpy(buf, config->private_key_passwd, len);
-  buf[len] = '\0';
+  // Copy string including last '\0'.
+  memcpy(buf, config->private_key_passwd, len+1);
   return len;
 }
-
+} // namespace
 
 SSL_CTX* create_ssl_context()
 {