Procházet zdrojové kódy

tls: removed useless checks

(cherry picked from commit 590c8d9d23e578df38d332ebcfa64421bbedb604)
Daniel-Constantin Mierla před 8 roky
rodič
revize
726d726ee0
2 změnil soubory, kde provedl 9 přidání a 13 odebrání
  1. 9 12
      src/modules/tls/tls_domain.c
  2. 0 1
      src/modules/tls/tls_select.c

+ 9 - 12
src/modules/tls/tls_domain.c

@@ -1086,12 +1086,12 @@ static int fix_domain(tls_domain_t* d, tls_domain_t* def)
  */
 static int passwd_cb(char *buf, int size, int rwflag, void *filename)
 {
-#if OPENSSL_VERSION_NUMBER >= 0x00907000L	
-	UI             *ui;
-	const char     *prompt;
-	
+#if OPENSSL_VERSION_NUMBER >= 0x00907000L
+	UI *ui;
+	const char *prompt;
+
 	ui = UI_new();
-	if (ui == NULL)
+	if(ui == NULL)
 		goto err;
 
 	prompt = UI_construct_prompt(ui, "passphrase", filename);
@@ -1099,16 +1099,13 @@ static int passwd_cb(char *buf, int size, int rwflag, void *filename)
 	UI_process(ui);
 	UI_free(ui);
 	return strlen(buf);
- 
- err:
+
+err:
 	ERR("passwd_cb: Error in passwd_cb\n");
-	if (ui) {
-		UI_free(ui);
-	}
 	return 0;
-	
+
 #else
-	if (des_read_pw_string(buf, size-1, "Enter Private Key password:", 0)) {
+	if(des_read_pw_string(buf, size - 1, "Enter Private Key password:", 0)) {
 		ERR("Error in passwd_cb\n");
 		return 0;
 	}

+ 0 - 1
src/modules/tls/tls_select.c

@@ -461,7 +461,6 @@ static int check_cert(str* res, int* ires, int local, int err, sip_msg_t* msg)
 	return 0;
 
  error:
-	if (cert) X509_free(cert);
 	if (c) tcpconn_put(c);
 	return -1;
 }