summaryrefslogtreecommitdiff
path: root/src/lib/emile
diff options
context:
space:
mode:
authorStefan Schmidt <stefan@osg.samsung.com>2015-10-21 14:23:08 +0200
committerStefan Schmidt <stefan@osg.samsung.com>2015-10-21 14:37:18 +0200
commit10c8650b1e6105dc415f7121d4fc6a88e7015842 (patch)
treeb174a4a92556ba0f010d0050c2d49f908a64714d /src/lib/emile
parentbfb275989190e03dcb3830a22f6bb85b3dd99f46 (diff)
emile: remove dead code
This seems to come from some intention to fetch dh from openssl somewhow but it was never implemented. fh always stays 0 since its init and thus we can remove the code it guards. CID: 1288930
Diffstat (limited to 'src/lib/emile')
-rw-r--r--src/lib/emile/emile_cipher_openssl.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/src/lib/emile/emile_cipher_openssl.c b/src/lib/emile/emile_cipher_openssl.c
index fe1279f446..b7f03c2a15 100644
--- a/src/lib/emile/emile_cipher_openssl.c
+++ b/src/lib/emile/emile_cipher_openssl.c
@@ -727,7 +727,6 @@ emile_cipher_server_connect(Emile_Cipher_Type t)
727 Emile_SSL *r; 727 Emile_SSL *r;
728 const char *msg; 728 const char *msg;
729 int options; 729 int options;
730 int dh = 0;
731 730
732 if (!emile_cipher_init()) return NULL; 731 if (!emile_cipher_init()) return NULL;
733 732
@@ -761,18 +760,7 @@ emile_cipher_server_connect(Emile_Cipher_Type t)
761 return r; 760 return r;
762 761
763 on_error: 762 on_error:
764 if (dh) 763 msg = ERR_reason_error_string(ERR_get_error());
765 {
766 if (dh & DH_CHECK_P_NOT_PRIME)
767 msg = "dh_params could not generate a prime!";
768 else
769 msg = "dh_params could not generate a safe prime!";
770 }
771 else
772 {
773 msg = ERR_reason_error_string(ERR_get_error());
774 }
775
776 ERR("OpenSSL error: '%s'.", msg); 764 ERR("OpenSSL error: '%s'.", msg);
777 emile_cipher_free(r); 765 emile_cipher_free(r);
778 return NULL; 766 return NULL;