session server BUGIX fix x509 key null print

Author: roman

src/session.c

@@ -111,13 +111,13 @@ nc_privkey_format_to_str(NC_PRIVKEY_FORMAT format)
 {
     switch (format) {
     case NC_PRIVKEY_FORMAT_RSA:
-        return "RSA";
+        return " RSA ";
     case NC_PRIVKEY_FORMAT_EC:
-        return "EC";
+        return " EC ";
     case NC_PRIVKEY_FORMAT_X509:
-        return NULL;
+        return " ";
     case NC_PRIVKEY_FORMAT_OPENSSH:
-        return "OPENSSH";
+        return " OPENSSH ";
     default:
         return NULL;
     }

src/session_server_ssh.c

@@ -75,33 +75,33 @@ base64der_privkey_to_tmp_file(const char *in, const char *privkey_format)
     }
 
     /* write header */
-    written = fwrite("-----BEGIN ", 1, 11, file);
+    written = fwrite("-----BEGIN", 1, 10, file);
     if (privkey_format) {
         written += fwrite(privkey_format, 1, strlen(privkey_format), file);
-        written += fwrite(" PRIVATE KEY-----\n", 1, 18, file);
-    } else {
         written += fwrite("PRIVATE KEY-----\n", 1, 17, file);
+    } else {
+        written += fwrite(" PRIVATE KEY-----\n", 1, 18, file);
     }
 
     /* write data */
     written += fwrite(in, 1, strlen(in), file);
 
     /* write footer */
-    written += fwrite("\n-----END ", 1, 10, file);
+    written += fwrite("\n-----END", 1, 9, file);
     if (privkey_format) {
         written += fwrite(privkey_format, 1, strlen(privkey_format), file);
-        written += fwrite(" PRIVATE KEY-----", 1, 17, file);
-    } else {
         written += fwrite("PRIVATE KEY-----", 1, 16, file);
+    } else {
+        written += fwrite(" PRIVATE KEY-----", 1, 17, file);
     }
 
     fclose(file);
 
     /* checksum */
     if (privkey_format) {
-        len = 11 + strlen(privkey_format) + 18 + strlen(in) + 10 + strlen(privkey_format) + 17;
+        len = 10 + strlen(privkey_format) + 17 + strlen(in) + 9 + strlen(privkey_format) + 16;
     } else {
-        len = 11 + 17 + strlen(in) + 10 + 16;
+        len = 10 + 18 + strlen(in) + 9 + 17;
     }
 
     if ((unsigned)written != len) {

src/session_server_tls.c

@@ -137,8 +137,12 @@ base64der_to_privatekey(const char *in, const char *key_str)
         return NULL;
     }
 
-    if (asprintf(&buf, "%s%s%s%s%s%s%s", "-----BEGIN ", key_str, " PRIVATE KEY-----\n", in, "\n-----END ",
-            key_str, " PRIVATE KEY-----") == -1) {
+    if (!key_str) {
+        /* avoid writing (null) for possibly unknown key formats */
+        key_str = "";
+    }
+    if (asprintf(&buf, "%s%s%s%s%s%s%s", "-----BEGIN", key_str, "PRIVATE KEY-----\n", in, "\n-----END",
+            key_str, "PRIVATE KEY-----") == -1) {
         return NULL;
     }
     bio = BIO_new_mem_buf(buf, strlen(buf));