o moved from GNU General Public License to Apache License, Version 2.0

o applied new coding standards to all .c files
o moved some files around

1 files changed, 382 insertions, 356 deletions

diff --git a/keygen/keygen.c b/keygen/keygen.c
index e984572b..d1495011 100644
--- a/keygen/keygen.c
+++ b/keygen/keygen.c
@@ -1,24 +1,22 @@
-/*
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-   xrdp: A Remote Desktop Protocol server.
-   Copyright (C) Jay Sorg 2007-2010
-
-   rsa key generator for xrdp
-
-*/
+/**
+ * xrdp: A Remote Desktop Protocol server.
+ *
+ * Copyright (C) Jay Sorg 2004-2012
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * rsa key generator for xrdp
+ */
 
 /*
    references:
@@ -37,74 +35,74 @@
 
 static tui8 g_exponent[4] =
 {
-  0x01, 0x00, 0x01, 0x00
+    0x01, 0x00, 0x01, 0x00
 };
 
 static tui8 g_ppk_e[4] =
 {
-  0x5B, 0x7B, 0x88, 0xC0
+    0x5B, 0x7B, 0x88, 0xC0
 };
 
 static tui8 g_ppk_n[72] =
 {
-  0x3D, 0x3A, 0x5E, 0xBD, 0x72, 0x43, 0x3E, 0xC9,
-  0x4D, 0xBB, 0xC1, 0x1E, 0x4A, 0xBA, 0x5F, 0xCB,
-  0x3E, 0x88, 0x20, 0x87, 0xEF, 0xF5, 0xC1, 0xE2,
-  0xD7, 0xB7, 0x6B, 0x9A, 0xF2, 0x52, 0x45, 0x95,
-  0xCE, 0x63, 0x65, 0x6B, 0x58, 0x3A, 0xFE, 0xEF,
-  0x7C, 0xE7, 0xBF, 0xFE, 0x3D, 0xF6, 0x5C, 0x7D,
-  0x6C, 0x5E, 0x06, 0x09, 0x1A, 0xF5, 0x61, 0xBB,
-  0x20, 0x93, 0x09, 0x5F, 0x05, 0x6D, 0xEA, 0x87,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    0x3D, 0x3A, 0x5E, 0xBD, 0x72, 0x43, 0x3E, 0xC9,
+    0x4D, 0xBB, 0xC1, 0x1E, 0x4A, 0xBA, 0x5F, 0xCB,
+    0x3E, 0x88, 0x20, 0x87, 0xEF, 0xF5, 0xC1, 0xE2,
+    0xD7, 0xB7, 0x6B, 0x9A, 0xF2, 0x52, 0x45, 0x95,
+    0xCE, 0x63, 0x65, 0x6B, 0x58, 0x3A, 0xFE, 0xEF,
+    0x7C, 0xE7, 0xBF, 0xFE, 0x3D, 0xF6, 0x5C, 0x7D,
+    0x6C, 0x5E, 0x06, 0x09, 0x1A, 0xF5, 0x61, 0xBB,
+    0x20, 0x93, 0x09, 0x5F, 0x05, 0x6D, 0xEA, 0x87,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
 
 static tui8 g_ppk_d[108] =
 {
-  0x87, 0xA7, 0x19, 0x32, 0xDA, 0x11, 0x87, 0x55,
-  0x58, 0x00, 0x16, 0x16, 0x25, 0x65, 0x68, 0xF8,
-  0x24, 0x3E, 0xE6, 0xFA, 0xE9, 0x67, 0x49, 0x94,
-  0xCF, 0x92, 0xCC, 0x33, 0x99, 0xE8, 0x08, 0x60,
-  0x17, 0x9A, 0x12, 0x9F, 0x24, 0xDD, 0xB1, 0x24,
-  0x99, 0xC7, 0x3A, 0xB8, 0x0A, 0x7B, 0x0D, 0xDD,
-  0x35, 0x07, 0x79, 0x17, 0x0B, 0x51, 0x9B, 0xB3,
-  0xC7, 0x10, 0x01, 0x13, 0xE7, 0x3F, 0xF3, 0x5F,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00
+    0x87, 0xA7, 0x19, 0x32, 0xDA, 0x11, 0x87, 0x55,
+    0x58, 0x00, 0x16, 0x16, 0x25, 0x65, 0x68, 0xF8,
+    0x24, 0x3E, 0xE6, 0xFA, 0xE9, 0x67, 0x49, 0x94,
+    0xCF, 0x92, 0xCC, 0x33, 0x99, 0xE8, 0x08, 0x60,
+    0x17, 0x9A, 0x12, 0x9F, 0x24, 0xDD, 0xB1, 0x24,
+    0x99, 0xC7, 0x3A, 0xB8, 0x0A, 0x7B, 0x0D, 0xDD,
+    0x35, 0x07, 0x79, 0x17, 0x0B, 0x51, 0x9B, 0xB3,
+    0xC7, 0x10, 0x01, 0x13, 0xE7, 0x3F, 0xF3, 0x5F,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00
 };
 
 static tui8 g_testkey[176] =
 {
-  0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
-  0x01, 0x00, 0x00, 0x00, 0x06, 0x00, 0x5c, 0x00,
-  0x52, 0x53, 0x41, 0x31, 0x48, 0x00, 0x00, 0x00,
-  0x00, 0x02, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00,
-  0x01, 0x00, 0x01, 0x00, 0x79, 0x6f, 0xb4, 0xdf,
-  0xa6, 0x95, 0xb9, 0xa9, 0x61, 0xe3, 0xc4, 0x5e,
-  0xff, 0x6b, 0xd8, 0x81, 0x8a, 0x12, 0x4a, 0x93,
-  0x42, 0x97, 0x18, 0x93, 0xac, 0xd1, 0x3a, 0x38,
-  0x3c, 0x68, 0x50, 0x19, 0x31, 0xb6, 0x84, 0x51,
-  0x79, 0xfb, 0x1c, 0xe7, 0xe3, 0x99, 0x20, 0xc7,
-  0x84, 0xdf, 0xd1, 0xaa, 0xb5, 0x15, 0xef, 0x47,
-  0x7e, 0xfc, 0x88, 0xeb, 0x29, 0xc3, 0x27, 0x5a,
-  0x35, 0xf8, 0xfd, 0xaa, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00,
-                          0x08, 0x00, 0x48, 0x00,
-  0x32, 0x3b, 0xde, 0x6f, 0x18, 0x97, 0x1e, 0xc3,
-  0x6b, 0x2b, 0x2d, 0xe4, 0xfc, 0x2d, 0xa2, 0x8e,
-  0x32, 0x3c, 0xf3, 0x1b, 0x24, 0x90, 0x57, 0x4d,
-  0x8e, 0xe4, 0x69, 0xfc, 0x16, 0x8d, 0x41, 0x92,
-  0x78, 0xc7, 0x9c, 0xb4, 0x26, 0xff, 0xe8, 0x3e,
-  0xa1, 0x8a, 0xf5, 0x57, 0xc0, 0x7f, 0x3e, 0x21,
-  0x17, 0x32, 0x30, 0x6f, 0x79, 0xe1, 0x36, 0xcd,
-  0xb6, 0x8e, 0xbe, 0x57, 0x57, 0xd2, 0xa9, 0x36
+    0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+    0x01, 0x00, 0x00, 0x00, 0x06, 0x00, 0x5c, 0x00,
+    0x52, 0x53, 0x41, 0x31, 0x48, 0x00, 0x00, 0x00,
+    0x00, 0x02, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00,
+    0x01, 0x00, 0x01, 0x00, 0x79, 0x6f, 0xb4, 0xdf,
+    0xa6, 0x95, 0xb9, 0xa9, 0x61, 0xe3, 0xc4, 0x5e,
+    0xff, 0x6b, 0xd8, 0x81, 0x8a, 0x12, 0x4a, 0x93,
+    0x42, 0x97, 0x18, 0x93, 0xac, 0xd1, 0x3a, 0x38,
+    0x3c, 0x68, 0x50, 0x19, 0x31, 0xb6, 0x84, 0x51,
+    0x79, 0xfb, 0x1c, 0xe7, 0xe3, 0x99, 0x20, 0xc7,
+    0x84, 0xdf, 0xd1, 0xaa, 0xb5, 0x15, 0xef, 0x47,
+    0x7e, 0xfc, 0x88, 0xeb, 0x29, 0xc3, 0x27, 0x5a,
+    0x35, 0xf8, 0xfd, 0xaa, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00,
+    0x08, 0x00, 0x48, 0x00,
+    0x32, 0x3b, 0xde, 0x6f, 0x18, 0x97, 0x1e, 0xc3,
+    0x6b, 0x2b, 0x2d, 0xe4, 0xfc, 0x2d, 0xa2, 0x8e,
+    0x32, 0x3c, 0xf3, 0x1b, 0x24, 0x90, 0x57, 0x4d,
+    0x8e, 0xe4, 0x69, 0xfc, 0x16, 0x8d, 0x41, 0x92,
+    0x78, 0xc7, 0x9c, 0xb4, 0x26, 0xff, 0xe8, 0x3e,
+    0xa1, 0x8a, 0xf5, 0x57, 0xc0, 0x7f, 0x3e, 0x21,
+    0x17, 0x32, 0x30, 0x6f, 0x79, 0xe1, 0x36, 0xcd,
+    0xb6, 0x8e, 0xbe, 0x57, 0x57, 0xd2, 0xa9, 0x36
 };
 
 /* this is the installed signature */
-char inst_pub_sig[]="0x6a,0x41,0xb1,0x43,0xcf,0x47,0x6f,0xf1,0xe6,0xcc,0xa1,\
+char inst_pub_sig[] = "0x6a,0x41,0xb1,0x43,0xcf,0x47,0x6f,0xf1,0xe6,0xcc,0xa1,\
 0x72,0x97,0xd9,0xe1,0x85,0x15,0xb3,0xc2,0x39,0xa0,0xa6,0x26,0x1a,0xb6,\
 0x49,0x01,0xfa,0xa6,0xda,0x60,0xd7,0x45,0xf7,0x2c,0xee,0xe4,0x8e,0x64,\
 0x2e,0x37,0x49,0xf0,0x4c,0x94,0x6f,0x08,0xf5,0x63,0x4c,0x56,0x29,0x55,\
@@ -115,212 +113,230 @@ char inst_pub_sig[]="0x6a,0x41,0xb1,0x43,0xcf,0x47,0x6f,0xf1,0xe6,0xcc,0xa1,\
 static int APP_CC
 out_params(void)
 {
-  g_writeln("");
-  g_writeln("xrdp rsa key gen utility examples");
-  g_writeln("  xrdp-keygen xrdp ['path and file name' | auto]");
-  g_writeln("  xrdp-keygen test");
-  g_writeln("");
-  return 0;
+    g_writeln("");
+    g_writeln("xrdp rsa key gen utility examples");
+    g_writeln("  xrdp-keygen xrdp ['path and file name' | auto]");
+    g_writeln("  xrdp-keygen test");
+    g_writeln("");
+    return 0;
 }
 
 /*****************************************************************************/
 /* this is the special key signing algorithm */
 static int APP_CC
-sign_key(char* e_data, int e_len, char* n_data, int n_len,
-         char* sign_data, int sign_len)
+sign_key(char *e_data, int e_len, char *n_data, int n_len,
+         char *sign_data, int sign_len)
 {
-  char* key;
-  char* md5_final;
-  void* md5;
-
-  if ((e_len != 4) || (n_len != 64) || (sign_len != 64))
-  {
-    return 1;
-  }
-  key = (char*)g_malloc(176, 0);
-  md5_final = (char*)g_malloc(64, 0);
-  md5 = ssl_md5_info_create();
-  /* copy the test key */
-  g_memcpy(key, g_testkey, 176);
-  /* replace e and n */
-  g_memcpy(key + 32, e_data, 4);
-  g_memcpy(key + 36, n_data, 64);
-  ssl_md5_clear(md5);
-  /* the first 108 bytes */
-  ssl_md5_transform(md5, key, 108);
-  /* set the whole thing with 0xff */
-  g_memset(md5_final, 0xff, 64);
-  /* digest 16 bytes */
-  ssl_md5_complete(md5, md5_final);
-  /* set non 0xff array items */
-  md5_final[16] = 0;
-  md5_final[62] = 1;
-  md5_final[63] = 0;
-  /* encrypt */
-  ssl_mod_exp(sign_data, 64, md5_final, 64, (char*)g_ppk_n, 64,
-              (char*)g_ppk_d, 64);
-  /* cleanup */
-  ssl_md5_info_delete(md5);
-  g_free(key);
-  g_free(md5_final);
-  return 0;
+    char *key;
+    char *md5_final;
+    void *md5;
+
+    if ((e_len != 4) || (n_len != 64) || (sign_len != 64))
+    {
+        return 1;
+    }
+
+    key = (char *)g_malloc(176, 0);
+    md5_final = (char *)g_malloc(64, 0);
+    md5 = ssl_md5_info_create();
+    /* copy the test key */
+    g_memcpy(key, g_testkey, 176);
+    /* replace e and n */
+    g_memcpy(key + 32, e_data, 4);
+    g_memcpy(key + 36, n_data, 64);
+    ssl_md5_clear(md5);
+    /* the first 108 bytes */
+    ssl_md5_transform(md5, key, 108);
+    /* set the whole thing with 0xff */
+    g_memset(md5_final, 0xff, 64);
+    /* digest 16 bytes */
+    ssl_md5_complete(md5, md5_final);
+    /* set non 0xff array items */
+    md5_final[16] = 0;
+    md5_final[62] = 1;
+    md5_final[63] = 0;
+    /* encrypt */
+    ssl_mod_exp(sign_data, 64, md5_final, 64, (char *)g_ppk_n, 64,
+                (char *)g_ppk_d, 64);
+    /* cleanup */
+    ssl_md5_info_delete(md5);
+    g_free(key);
+    g_free(md5_final);
+    return 0;
 }
 
 /*****************************************************************************/
 static int APP_CC
-write_out_line(int fd, char* name, char* data, int len)
+write_out_line(int fd, char *name, char *data, int len)
 {
-  int max;
-  int error;
-  int index;
-  int data_item;
-  int buf_pos;
-  char* buf;
-  char* text;
-
-  text = (char*)g_malloc(256, 0);
-  max = len;
-  max = max * 10;
-  buf_pos = g_strlen(name);
-  max = max + buf_pos + 16;
-  buf = (char*)g_malloc(max, 0);
-  g_strncpy(buf, name, max - 1);
-  buf[buf_pos] = '=';
-  buf_pos++;
-  for (index = 0; index < len; index++)
-  {
-    data_item = (tui8)(data[index]);
-    g_snprintf(text, 255, "0x%2.2x", data_item);
-    if (index != 0)
+    int max;
+    int error;
+    int index;
+    int data_item;
+    int buf_pos;
+    char *buf;
+    char *text;
+
+    text = (char *)g_malloc(256, 0);
+    max = len;
+    max = max * 10;
+    buf_pos = g_strlen(name);
+    max = max + buf_pos + 16;
+    buf = (char *)g_malloc(max, 0);
+    g_strncpy(buf, name, max - 1);
+    buf[buf_pos] = '=';
+    buf_pos++;
+
+    for (index = 0; index < len; index++)
     {
-      buf[buf_pos] = ',';
-      buf_pos++;
+        data_item = (tui8)(data[index]);
+        g_snprintf(text, 255, "0x%2.2x", data_item);
+
+        if (index != 0)
+        {
+            buf[buf_pos] = ',';
+            buf_pos++;
+        }
+
+        buf[buf_pos] = text[0];
+        buf_pos++;
+        buf[buf_pos] = text[1];
+        buf_pos++;
+        buf[buf_pos] = text[2];
+        buf_pos++;
+        buf[buf_pos] = text[3];
+        buf_pos++;
     }
-    buf[buf_pos] = text[0];
-    buf_pos++;
-    buf[buf_pos] = text[1];
-    buf_pos++;
-    buf[buf_pos] = text[2];
-    buf_pos++;
-    buf[buf_pos] = text[3];
+
+    buf[buf_pos] = '\n';
     buf_pos++;
-  }
-  buf[buf_pos] = '\n';
-  buf_pos++;
-  buf[buf_pos] = 0;
-  error = g_file_write(fd, buf, buf_pos) == -1;
-  g_free(buf);
-  g_free(text);
-  return error;
+    buf[buf_pos] = 0;
+    error = g_file_write(fd, buf, buf_pos) == -1;
+    g_free(buf);
+    g_free(text);
+    return error;
 }
 
 /*****************************************************************************/
 static int APP_CC
-save_all(char* e_data, int e_len, char* n_data, int n_len,
-         char* d_data, int d_len, char* sign_data, int sign_len,
-         const char* path_and_file_name)
+save_all(char *e_data, int e_len, char *n_data, int n_len,
+         char *d_data, int d_len, char *sign_data, int sign_len,
+         const char *path_and_file_name)
 {
-  int fd;
-  char filename[256];
-
-  if (path_and_file_name == 0)
-  {
-    g_strncpy(filename, "rsakeys.ini", 255);
-  }
-  else
-  {
-    g_strncpy(filename, path_and_file_name, 255);
-  }
-  g_writeln("saving to %s", filename);
-  g_writeln("");
-  if (g_file_exist(filename))
-  {
-    if (g_file_delete(filename) == 0)
+    int fd;
+    char filename[256];
+
+    if (path_and_file_name == 0)
     {
-      g_writeln("problem deleting %s, maybe no rights", filename);
-      return 1;
+        g_strncpy(filename, "rsakeys.ini", 255);
     }
-  }
-  fd = g_file_open(filename);
-  if (fd > 0)
-  {
-    if (g_file_write(fd, "[keys]\n", 7) == -1)
+    else
     {
-      g_writeln("problem writing to %s, maybe no rights", filename);
-      return 1;
+        g_strncpy(filename, path_and_file_name, 255);
     }
-    write_out_line(fd, "pub_exp", e_data, e_len);
-    write_out_line(fd, "pub_mod", n_data, n_len);
-    write_out_line(fd, "pub_sig", sign_data, sign_len);
-    write_out_line(fd, "pri_exp", d_data, d_len);
-  }
-  else
-  {
-    g_writeln("problem opening %s, maybe no rights", filename);
-    return 1;
-  }
-  g_file_close(fd);  
-  return 0;
+
+    g_writeln("saving to %s", filename);
+    g_writeln("");
+
+    if (g_file_exist(filename))
+    {
+        if (g_file_delete(filename) == 0)
+        {
+            g_writeln("problem deleting %s, maybe no rights", filename);
+            return 1;
+        }
+    }
+
+    fd = g_file_open(filename);
+
+    if (fd > 0)
+    {
+        if (g_file_write(fd, "[keys]\n", 7) == -1)
+        {
+            g_writeln("problem writing to %s, maybe no rights", filename);
+            return 1;
+        }
+
+        write_out_line(fd, "pub_exp", e_data, e_len);
+        write_out_line(fd, "pub_mod", n_data, n_len);
+        write_out_line(fd, "pub_sig", sign_data, sign_len);
+        write_out_line(fd, "pri_exp", d_data, d_len);
+    }
+    else
+    {
+        g_writeln("problem opening %s, maybe no rights", filename);
+        return 1;
+    }
+
+    g_file_close(fd);
+    return 0;
 }
 
 /*****************************************************************************/
 static int APP_CC
-key_gen(const char* path_and_file_name)
+key_gen(const char *path_and_file_name)
 {
-  char* e_data;
-  char* n_data;
-  char* d_data;
-  char* sign_data;
-  int e_len;
-  int n_len;
-  int d_len;
-  int sign_len;
-  int error;
-
-  e_data = (char*)g_exponent;
-  n_data = (char*)g_malloc(64, 0);
-  d_data = (char*)g_malloc(64, 0);
-  sign_data = (char*)g_malloc(64, 0);
-  e_len = 4;
-  n_len = 64;
-  d_len = 64;
-  sign_len = 64;
-  error = 0;
-  g_writeln("");
-  g_writeln("Generating %d bit rsa key...", MY_KEY_SIZE);
-  g_writeln("");
-  if (error == 0)
-  {
-    error = ssl_gen_key_xrdp1(MY_KEY_SIZE, e_data, e_len, n_data, n_len,
-                              d_data, d_len);
-    if (error != 0)
+    char *e_data;
+    char *n_data;
+    char *d_data;
+    char *sign_data;
+    int e_len;
+    int n_len;
+    int d_len;
+    int sign_len;
+    int error;
+
+    e_data = (char *)g_exponent;
+    n_data = (char *)g_malloc(64, 0);
+    d_data = (char *)g_malloc(64, 0);
+    sign_data = (char *)g_malloc(64, 0);
+    e_len = 4;
+    n_len = 64;
+    d_len = 64;
+    sign_len = 64;
+    error = 0;
+    g_writeln("");
+    g_writeln("Generating %d bit rsa key...", MY_KEY_SIZE);
+    g_writeln("");
+
+    if (error == 0)
     {
-      g_writeln("error %d in key_gen, ssl_gen_key_xrdp1", error);
+        error = ssl_gen_key_xrdp1(MY_KEY_SIZE, e_data, e_len, n_data, n_len,
+                                  d_data, d_len);
+
+        if (error != 0)
+        {
+            g_writeln("error %d in key_gen, ssl_gen_key_xrdp1", error);
+        }
     }
-  }
-  if (error == 0)
-  {
-    g_writeln("ssl_gen_key_xrdp1 ok");
-    g_writeln("");
-    error = sign_key(e_data, e_len, n_data, n_len, sign_data, sign_len);
-    if (error != 0)
+
+    if (error == 0)
     {
-      g_writeln("error %d in key_gen, sign_key", error);
+        g_writeln("ssl_gen_key_xrdp1 ok");
+        g_writeln("");
+        error = sign_key(e_data, e_len, n_data, n_len, sign_data, sign_len);
+
+        if (error != 0)
+        {
+            g_writeln("error %d in key_gen, sign_key", error);
+        }
     }
-  }
-  if (error == 0)
-  {
-    error = save_all(e_data, e_len, n_data, n_len, d_data, d_len,
-                     sign_data, sign_len, path_and_file_name);
-    if (error != 0)
+
+    if (error == 0)
     {
-      g_writeln("error %d in key_gen, save_all", error);
+        error = save_all(e_data, e_len, n_data, n_len, d_data, d_len,
+                         sign_data, sign_len, path_and_file_name);
+
+        if (error != 0)
+        {
+            g_writeln("error %d in key_gen, save_all", error);
+        }
     }
-  }
-  g_free(n_data);
-  g_free(d_data);
-  g_free(sign_data);
-  return error;
+
+    g_free(n_data);
+    g_free(d_data);
+    g_free(sign_data);
+    return error;
 }
 
 /*****************************************************************************/
@@ -328,146 +344,156 @@ key_gen(const char* path_and_file_name)
 static int APP_CC
 key_gen_run_it(void)
 {
-  int fd;
-  int index;
-  int rv;
-  struct list* names;
-  struct list* values;
-  char* name;
-  char* value;
-
-  if (!g_file_exist("/etc/xrdp/rsakeys.ini"))
-  {
-    return 1;
-  }
-  if (g_file_get_size("/etc/xrdp/rsakeys.ini") < 10)
-  {
-    return 1;
-  }
-  fd = g_file_open("/etc/xrdp/rsakeys.ini");
-  if (fd < 0)
-  {
-    return 1;
-  }
-  rv = 0;
-  names = list_create();
-  names->auto_free = 1;
-  values = list_create();
-  values->auto_free = 1;
-  if (file_read_section(fd, "keys", names, values) == 0)
-  {
-    for (index = 0; index < names->count; index++)
+    int fd;
+    int index;
+    int rv;
+    struct list *names;
+    struct list *values;
+    char *name;
+    char *value;
+
+    if (!g_file_exist("/etc/xrdp/rsakeys.ini"))
+    {
+        return 1;
+    }
+
+    if (g_file_get_size("/etc/xrdp/rsakeys.ini") < 10)
+    {
+        return 1;
+    }
+
+    fd = g_file_open("/etc/xrdp/rsakeys.ini");
+
+    if (fd < 0)
+    {
+        return 1;
+    }
+
+    rv = 0;
+    names = list_create();
+    names->auto_free = 1;
+    values = list_create();
+    values->auto_free = 1;
+
+    if (file_read_section(fd, "keys", names, values) == 0)
     {
-      name = (char*)list_get_item(names, index);
-      value = (char*)list_get_item(values, index);
-      if (g_strcasecmp(name, "pub_sig") == 0)
-      {
-        if (g_strcasecmp(value, inst_pub_sig) == 0)
+        for (index = 0; index < names->count; index++)
         {
-          rv = 1;
+            name = (char *)list_get_item(names, index);
+            value = (char *)list_get_item(values, index);
+
+            if (g_strcasecmp(name, "pub_sig") == 0)
+            {
+                if (g_strcasecmp(value, inst_pub_sig) == 0)
+                {
+                    rv = 1;
+                }
+            }
         }
-      }
     }
-  }
-  else
-  {
-    g_writeln("error reading keys section of rsakeys.ini");
-  }
-  list_delete(names);
-  list_delete(values);
-  g_file_close(fd);
-  return rv;
+    else
+    {
+        g_writeln("error reading keys section of rsakeys.ini");
+    }
+
+    list_delete(names);
+    list_delete(values);
+    g_file_close(fd);
+    return rv;
 }
 
 /*****************************************************************************/
 static int APP_CC
 key_gen_auto(void)
 {
-  if (key_gen_run_it())
-  {
-    return key_gen("/etc/xrdp/rsakeys.ini");
-  }
-  g_writeln("xrdp-keygen does not need to run");
-  return 0;
+    if (key_gen_run_it())
+    {
+        return key_gen("/etc/xrdp/rsakeys.ini");
+    }
+
+    g_writeln("xrdp-keygen does not need to run");
+    return 0;
 }
 
 /*****************************************************************************/
 static int APP_CC
 key_test(void)
 {
-  char* md5_final;
-  char* sig;
-  void* md5;
-
-  md5_final = (char*)g_malloc(64, 0);
-  sig = (char*)g_malloc(64, 0);
-  md5 = ssl_md5_info_create();
-  g_writeln("original key is:");
-  g_hexdump((char*)g_testkey, 176);
-  g_writeln("original exponent is:");
-  g_hexdump((char*)g_testkey + 32, 4);
-  g_writeln("original modulus is:");
-  g_hexdump((char*)g_testkey + 36, 64);
-  g_writeln("original signature is:");
-  g_hexdump((char*)g_testkey + 112, 64);
-  ssl_md5_clear(md5);
-  ssl_md5_transform(md5, (char*)g_testkey, 108);
-  g_memset(md5_final, 0xff, 64);
-  ssl_md5_complete(md5, md5_final);
-  g_writeln("md5 hash of first 108 bytes of this key is:");
-  g_hexdump(md5_final, 16);
-  md5_final[16] = 0;
-  md5_final[62] = 1;
-  md5_final[63] = 0;
-  ssl_mod_exp(sig, 64, md5_final, 64, (char*)g_ppk_n, 64, (char*)g_ppk_d, 64);
-  g_writeln("produced signature(this should match original \
+    char *md5_final;
+    char *sig;
+    void *md5;
+
+    md5_final = (char *)g_malloc(64, 0);
+    sig = (char *)g_malloc(64, 0);
+    md5 = ssl_md5_info_create();
+    g_writeln("original key is:");
+    g_hexdump((char *)g_testkey, 176);
+    g_writeln("original exponent is:");
+    g_hexdump((char *)g_testkey + 32, 4);
+    g_writeln("original modulus is:");
+    g_hexdump((char *)g_testkey + 36, 64);
+    g_writeln("original signature is:");
+    g_hexdump((char *)g_testkey + 112, 64);
+    ssl_md5_clear(md5);
+    ssl_md5_transform(md5, (char *)g_testkey, 108);
+    g_memset(md5_final, 0xff, 64);
+    ssl_md5_complete(md5, md5_final);
+    g_writeln("md5 hash of first 108 bytes of this key is:");
+    g_hexdump(md5_final, 16);
+    md5_final[16] = 0;
+    md5_final[62] = 1;
+    md5_final[63] = 0;
+    ssl_mod_exp(sig, 64, md5_final, 64, (char *)g_ppk_n, 64, (char *)g_ppk_d, 64);
+    g_writeln("produced signature(this should match original \
 signature above) is:");
-  g_hexdump(sig, 64);
-  g_memset(md5_final, 0, 64);
-  ssl_mod_exp(md5_final, 64, (char*)g_testkey + 112, 64, (char*)g_ppk_n, 64,
-              (char*)g_ppk_e, 4);
-  g_writeln("decrypted hash of first 108 bytes of this key is:");
-  g_hexdump(md5_final, 64);
-  ssl_md5_info_delete(md5);
-  g_free(md5_final);
-  g_free(sig);
-  return 0;
+    g_hexdump(sig, 64);
+    g_memset(md5_final, 0, 64);
+    ssl_mod_exp(md5_final, 64, (char *)g_testkey + 112, 64, (char *)g_ppk_n, 64,
+                (char *)g_ppk_e, 4);
+    g_writeln("decrypted hash of first 108 bytes of this key is:");
+    g_hexdump(md5_final, 64);
+    ssl_md5_info_delete(md5);
+    g_free(md5_final);
+    g_free(sig);
+    return 0;
 }
 
 /*****************************************************************************/
 int DEFAULT_CC
-main(int argc, char** argv)
+main(int argc, char **argv)
 {
-  if (argc > 1)
-  {
-    if (g_strcasecmp(argv[1], "xrdp") == 0)
+    if (argc > 1)
     {
-      if (argc > 2)
-      {
-        if (g_strcasecmp(argv[2], "auto") == 0)
+        if (g_strcasecmp(argv[1], "xrdp") == 0)
         {
-          if (g_getuid() != 0)
-          {
-            g_writeln("must run as root");
-            return 0;
-          }
-          return key_gen_auto();
+            if (argc > 2)
+            {
+                if (g_strcasecmp(argv[2], "auto") == 0)
+                {
+                    if (g_getuid() != 0)
+                    {
+                        g_writeln("must run as root");
+                        return 0;
+                    }
+
+                    return key_gen_auto();
+                }
+                else
+                {
+                    return key_gen(argv[2]);
+                }
+            }
+            else
+            {
+                return key_gen(0);
+            }
         }
-        else
+        else if (g_strcasecmp(argv[1], "test") == 0)
         {
-          return key_gen(argv[2]);
+            return key_test();
         }
-      }
-      else
-      {
-        return key_gen(0);
-      }
-    }
-    else if (g_strcasecmp(argv[1], "test") == 0)
-    {
-      return key_test();
     }
-  }
-  out_params();
-  return 0;
+
+    out_params();
+    return 0;
 }