X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspstring.cpp;h=38a51e82ffde04dcfc142e8989742201c56be9ea;hb=9133c3302428eb81f6d970502f811e8168079d5a;hp=98e7228d51ffefb23dcb9a7147660bbd498efc31;hpb=badadc427a99e5483402c21bf5b7ae64722930e9;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspstring.cpp b/src/inspstring.cpp index 98e7228d5..38a51e82f 100644 --- a/src/inspstring.cpp +++ b/src/inspstring.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2010 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -11,7 +11,7 @@ * --------------------------------------------------- */ -#include "inspstring.h" +#include "inspircd.h" /* * Copyright (c) 1998 Todd C. Miller @@ -22,9 +22,9 @@ * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products * derived from this software without specific prior written permission. * @@ -39,7 +39,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - + #ifndef HAS_STRLCPY CoreExport size_t strlcat(char *dst, const char *src, size_t siz) { @@ -135,3 +135,90 @@ CoreExport bool charremove(char* mp, char remove) return shift_down; } +static const char hextable[] = "0123456789abcdef"; + +std::string BinToHex(const std::string& data) +{ + int l = data.length(); + std::string rv; + rv.reserve(l * 2); + for(int i=0; i < l; i++) + { + unsigned char c = data[i]; + rv.append(1, hextable[c >> 4]); + rv.append(1, hextable[c & 0xF]); + } + return rv; +} + +static const char b64table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + +std::string BinToBase64(const std::string& data_str, const char* table, char pad) +{ + if (!table) + table = b64table; + + uint32_t buffer; + uint8_t* data = (uint8_t*)data_str.data(); + std::string rv; + size_t i = 0; + while (i + 2 < data_str.length()) + { + buffer = (data[i] << 16 | data[i+1] << 8 | data[i+2]); + rv.push_back(table[0x3F & (buffer >> 18)]); + rv.push_back(table[0x3F & (buffer >> 12)]); + rv.push_back(table[0x3F & (buffer >> 6)]); + rv.push_back(table[0x3F & (buffer >> 0)]); + i += 3; + } + if (data_str.length() == i) + { + // no extra characters + } + else if (data_str.length() == i + 1) + { + buffer = data[i] << 16; + rv.push_back(table[0x3F & (buffer >> 18)]); + rv.push_back(table[0x3F & (buffer >> 12)]); + if (pad) + { + rv.push_back(pad); + rv.push_back(pad); + } + } + else if (data_str.length() == i + 2) + { + buffer = (data[i] << 16 | data[i+1] << 8); + rv.push_back(table[0x3F & (buffer >> 18)]); + rv.push_back(table[0x3F & (buffer >> 12)]); + rv.push_back(table[0x3F & (buffer >> 6)]); + if (pad) + rv.push_back(pad); + } + return rv; +} + +std::string Base64ToBin(const std::string& data_str, const char* table) +{ + if (!table) + table = b64table; + + int bitcount = 0; + uint32_t buffer = 0; + const char* data = data_str.c_str(); + std::string rv; + while (true) + { + const char* find = strchr(table, *data++); + if (!find || find >= table + 64) + break; + buffer = (buffer << 6) | (find - table); + bitcount += 6; + if (bitcount >= 8) + { + bitcount -= 8; + rv.push_back((buffer >> bitcount) & 0xFF); + } + } + return rv; +}