diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2018-06-09 22:02:51 +0200 |
|---|---|---|
| committer | Rafał Miłecki <rafal@milecki.pl> | 2019-07-30 11:54:52 +0200 |
| commit | b7a648faaf12832eee94339ef5bfdfa82706422b (patch) | |
| tree | 32f011aa2c39bfc92595b9a7fcbbd6b72a513c0a | |
| parent | 545d2fadd7245783e40f235fe2c5d8c3ab1549cd (diff) | |
lighttpd: backport fix for plain auth from 1.4.49 release
Update commit 3d59ce6f502b ("lighttpd: update to 1.4.48") resulted in
plain auth regression: it simply stopped working with:
(mod_auth.c.525) password doesn't match for (...)
appearing on every authentication try.
This regression was fixed in 1.4.49 release. Backport the fix instead of
updating to the 1.4.49 to avoid risking more/other regressions.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit 4cc0c8871398d7c2fb879a319c87e320249bfdcc)
| -rw-r--r-- | net/lighttpd/Makefile | 2 | ||||
| -rw-r--r-- | net/lighttpd/patches/0001-core-fix-base64-decode-when-char-is-unsigned-fixes-2.patch | 43 |
2 files changed, 44 insertions, 1 deletions
diff --git a/net/lighttpd/Makefile b/net/lighttpd/Makefile index 16321e864..ed38ca118 100644 --- a/net/lighttpd/Makefile +++ b/net/lighttpd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lighttpd PKG_VERSION:=1.4.48 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://download.lighttpd.net/lighttpd/releases-1.4.x diff --git a/net/lighttpd/patches/0001-core-fix-base64-decode-when-char-is-unsigned-fixes-2.patch b/net/lighttpd/patches/0001-core-fix-base64-decode-when-char-is-unsigned-fixes-2.patch new file mode 100644 index 000000000..18a9a1dec --- /dev/null +++ b/net/lighttpd/patches/0001-core-fix-base64-decode-when-char-is-unsigned-fixes-2.patch @@ -0,0 +1,43 @@ +From d4083effab0f9bf76528d5c47198b17e7471ed13 Mon Sep 17 00:00:00 2001 +From: Glenn Strauss <gstrauss@gluelogic.com> +Date: Thu, 21 Dec 2017 17:41:17 -0500 +Subject: [PATCH] [core] fix base64 decode when char is unsigned (fixes #2848) + +thx, codehero + +x-ref: + "buffer_append_base64_decode() broken on compilers where char is assumed unsigned" + https://redmine.lighttpd.net/issues/2848 +--- + src/base64.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/src/base64.c ++++ b/src/base64.c +@@ -11,7 +11,7 @@ + + /* BASE64_STANDARD: "A-Z a-z 0-9 + /" maps to 0-63, pad with "=" */ + static const char base64_standard_table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="; +-static const char base64_standard_reverse_table[] = { ++static const signed char base64_standard_reverse_table[] = { + /* 0 1 2 3 4 5 6 7 8 9 A B C D E F */ + -1, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, /* 0x00 - 0x0F */ + -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, /* 0x10 - 0x1F */ +@@ -25,7 +25,7 @@ static const char base64_standard_revers + + /* BASE64_URL: "A-Z a-z 0-9 - _" maps to 0-63, pad with "." */ + static const char base64_url_table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_."; +-static const char base64_url_reverse_table[] = { ++static const signed char base64_url_reverse_table[] = { + /* 0 1 2 3 4 5 6 7 8 9 A B C D E F */ + -1, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, /* 0x00 - 0x0F */ + -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, /* 0x10 - 0x1F */ +@@ -42,7 +42,7 @@ unsigned char* buffer_append_base64_deco + size_t out_pos = 0; /* current output character (position) that is decoded. can contain partial result */ + unsigned int group = 0; /* how many base64 digits in the current group were decoded already. each group has up to 4 digits */ + size_t i; +- const char *base64_reverse_table; ++ const signed char *base64_reverse_table; + + switch (charset) { + case BASE64_STANDARD: |