From 206c63e187b3d3ba31f3064dabae05d6f3660f3a Mon Sep 17 00:00:00 2001 From: Jos Groot Lipman Date: Tue, 7 Mar 2017 14:38:25 +0000 Subject: [PATCH] FSN#39763 Versie 4.17 base64_decode kapte string af bij url-safe '-' en '_' svn path=/Slnkdwf/trunk/; revision=33070 --- Crypto/base64.cpp | 2 +- SlnkDWFCom/SLNKDWFVersion.h | 2 +- historie.txt | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Crypto/base64.cpp b/Crypto/base64.cpp index 42b5cc4..89d7f26 100644 --- a/Crypto/base64.cpp +++ b/Crypto/base64.cpp @@ -42,7 +42,7 @@ static const std::string base64_chars_urlsafe = "0123456789-_"; static inline bool is_base64(unsigned char c) { - return (isalnum(c) || (c == '+') || (c == '/')); + return (isalnum(c) || (c == '+') || (c == '/') || (c == '-') || (c == '_')); } std::string base64_encode(unsigned char const* bytes_to_encode, unsigned int in_len, bool padding /* = true */, bool url_safe /* = false */) { diff --git a/SlnkDWFCom/SLNKDWFVersion.h b/SlnkDWFCom/SLNKDWFVersion.h index 2765745..5d405c1 100644 --- a/SlnkDWFCom/SLNKDWFVersion.h +++ b/SlnkDWFCom/SLNKDWFVersion.h @@ -1,6 +1,6 @@ // Zorg dat versies alfabetisch altijd op elkaar volgen! #define SLNK_MAJOR_VERSION 4 -#define SLNK_MINOR_VERSION 16 +#define SLNK_MINOR_VERSION 17 #define SLNK_BUILD_VERSION 0 // Define resource strings diff --git a/historie.txt b/historie.txt index 14cf7c0..8651ff5 100644 --- a/historie.txt +++ b/historie.txt @@ -1,3 +1,6 @@ +V4.17 07-03-2017 + - base64_decode kapte string af bij url-safe '-' en '_' + V4.16 27-09-2016 - hex_sha1_file van niet bestaande files leidde tot Access denied