diff options
author | Christian Grothoff <christian@grothoff.org> | 2018-06-15 08:59:41 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2018-06-15 08:59:56 +0200 |
commit | cb7462c9712054d6844151412d1a10e227612826 (patch) | |
tree | 0aa7ff384e657fb0aaa50321a72de636039a34b4 /src/gns/gnunet-gns-proxy.c | |
parent | eab87ba800bf45782ed7ae2d2648079b7078787f (diff) | |
download | gnunet-cb7462c9712054d6844151412d1a10e227612826.tar.gz gnunet-cb7462c9712054d6844151412d1a10e227612826.zip |
oddly, works fine now without changes by me; very strange
Diffstat (limited to 'src/gns/gnunet-gns-proxy.c')
-rw-r--r-- | src/gns/gnunet-gns-proxy.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c index 9a405c49b..e68d6d540 100644 --- a/src/gns/gnunet-gns-proxy.c +++ b/src/gns/gnunet-gns-proxy.c | |||
@@ -46,14 +46,6 @@ | |||
46 | #include "gns.h" | 46 | #include "gns.h" |
47 | 47 | ||
48 | 48 | ||
49 | /** | ||
50 | * FIXME: GnuTLS right now sometimes rejects valid certs, so as a | ||
51 | * VERY temporary workaround we just WARN the user instead of | ||
52 | * dropping the page. THIS SHOULD NOT BE USED IN PRODUCTION, | ||
53 | * set to 1 in production!!! FIXME!!! | ||
54 | */ | ||
55 | #define FIXED_CERT_VALIDATION_BUG 0 | ||
56 | |||
57 | 49 | ||
58 | /** | 50 | /** |
59 | * Default Socks5 listen port. | 51 | * Default Socks5 listen port. |
@@ -1079,10 +1071,8 @@ check_ssl_certificate (struct Socks5Request *s5r) | |||
1079 | certdn, | 1071 | certdn, |
1080 | name, | 1072 | name, |
1081 | rc); | 1073 | rc); |
1082 | #if FIXED_CERT_VALIDATION_BUG | ||
1083 | gnutls_x509_crt_deinit (x509_cert); | 1074 | gnutls_x509_crt_deinit (x509_cert); |
1084 | return GNUNET_SYSERR; | 1075 | return GNUNET_SYSERR; |
1085 | #endif | ||
1086 | } | 1076 | } |
1087 | } | 1077 | } |
1088 | else | 1078 | else |
@@ -1996,7 +1986,8 @@ create_response (void *cls, | |||
1996 | us = MHD_lookup_connection_value (con, | 1986 | us = MHD_lookup_connection_value (con, |
1997 | MHD_HEADER_KIND, | 1987 | MHD_HEADER_KIND, |
1998 | MHD_HTTP_HEADER_CONTENT_LENGTH); | 1988 | MHD_HTTP_HEADER_CONTENT_LENGTH); |
1999 | if ( (NULL != us) && (1 == sscanf (us, | 1989 | if ( (NULL != us) && |
1990 | (1 == sscanf (us, | ||
2000 | "%ld", | 1991 | "%ld", |
2001 | &upload_size)) && | 1992 | &upload_size)) && |
2002 | (upload_size >= 0) ) | 1993 | (upload_size >= 0) ) |