security complished rm rewrite

Author: qazwsxedckll

client/bin/crypto.c

@@ -34,7 +34,7 @@ int rsa_generate_key(const char* user_name)
     return 0;
 }
 
-char* rsa_encrypt(char* str)
+char* rsa_encrypt(const char* str)
 {
     int ret;
     char* en_str;;
@@ -58,8 +58,9 @@ char* rsa_encrypt(char* str)
         return NULL;
     }
 
+    int len = strlen(str);
     en_str = (char*)calloc(SER_EN_LEN, sizeof(char));
-    ret = RSA_public_encrypt(RSA_EN_LEN, (unsigned char*)str, (unsigned char*)en_str, rsa, RSA_PKCS1_PADDING);
+    ret = RSA_public_encrypt(len, (unsigned char*)str, (unsigned char*)en_str, rsa, RSA_PKCS1_PADDING);
     if (ret == -1)
     {
         printf("rsa_encrypt failed\n");
@@ -84,7 +85,7 @@ char* rsa_sign(char* str, const char* user_name)
     fp = fopen(pk_path, "rb");
     if (fp == NULL)
     {
-        printf("client_rsa.key not found\n");
+        printf("%s not found\n", pk_path);
         return NULL;
     }
 

client/bin/main.c

@@ -30,7 +30,7 @@ int main(int argc, char** argv)
         if (ret == '1')
         {
             //user authentication
-            ret = tran_authen(&socketFd, argv[1], argv[2], user_name, &data);
+            ret = tran_authen(&socketFd, argv[1], argv[2], user_name, &data, &trans_info);
             if (ret == -1)
             {
                 continue;
@@ -43,6 +43,20 @@ int main(int argc, char** argv)
             ret = user_signup(&socketFd, argv[1], argv[2], user_name, &data);
             if (ret == -1)
             {
+                //delete key file
+                char pk_path[FILE_NAME_LEN];
+                sprintf(pk_path, "%s_rsa.key", user_name);
+                ret = access(pk_path, F_OK);
+                if (ret)
+                {
+                    remove(pk_path);
+                }
+                sprintf(pk_path, "%s_rsa_pub.key", user_name);
+                ret = access(pk_path, F_OK);
+                if (ret)
+                {
+                    remove(pk_path);
+                }
                 regi_flag = -1;
                 continue;
             }