]> git.ipfire.org Git - thirdparty/openvpn.git/commitdiff
Fix a null-pointer dereference in establish_http_proxy_passthru()
authorGuido Vranken <guidovranken@gmail.com>
Fri, 16 Jun 2017 00:58:56 +0000 (02:58 +0200)
committerGert Doering <gert@greenie.muc.de>
Fri, 16 Jun 2017 07:20:10 +0000 (09:20 +0200)
Prevents that the client crashes if the peer does not specify
the 'realm' and/or 'nonce' values. These pointers are
dereferenced in DigestCalcHA1() and DigestCalcResponse();
hence, if not set, a null-pointer dereference would occur.

Signed-off-by: Guido Vranken <guidovranken@gmail.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <1497574736-2092-1-git-send-email-gv@guidovranken.nl>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg14844.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit 14865773ad64d861128bc80ad44c37bdc307c996)

src/openvpn/proxy.c

index 1b3af0e67122c4bc8c86bd24037930281cdf817c..f47be7dc10d52ef4283539d0a12018e4227f5f37 100644 (file)
@@ -725,6 +725,12 @@ establish_http_proxy_passthru (struct http_proxy_info *p,
              const char *algor = get_pa_var("algorithm", pa, &gc);
              const char *opaque = get_pa_var("opaque", pa, &gc);
 
+             if ( !realm || !nonce )
+               {
+                 msg(D_LINK_ERRORS, "HTTP proxy: digest auth failed, malformed response from server: realm= or nonce= missing" );
+                 goto error;
+               }
+
              /* generate a client nonce */
              ASSERT(rand_bytes(cnonce_raw, sizeof(cnonce_raw)));
              cnonce = make_base64_string2(cnonce_raw, sizeof(cnonce_raw), &gc);