X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspstring.cpp;h=b5949273806b61a537dfb94227f25a8404f077d3;hb=b200104cf2c61465acecaca111e3ec727fc3b954;hp=534b7ce008558a32ac466eaa786ea1f6c1194560;hpb=46a39046196f55b52336e19662bb7bac85b731ac;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/inspstring.cpp b/src/inspstring.cpp
index 534b7ce00..b59492738 100644
--- a/src/inspstring.cpp
+++ b/src/inspstring.cpp
@@ -21,140 +21,18 @@
 
 #include "inspircd.h"
 
-/*
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * 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.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED `AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * 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)
-{
-	char *d = dst;
-	const char *s = src;
-	size_t n = siz, dlen;
-
-	while (n-- != 0 && *d != '\0')
-		d++;
-
-	dlen = d - dst;
-	n = siz - dlen;
-
-	if (n == 0)
-		return(dlen + strlen(s));
-
-	while (*s != '\0')
-	{
-		if (n != 1)
-		{
-			*d++ = *s;
-			n--;
-		}
-
-		s++;
-	}
-
-	*d = '\0';
-	return(dlen + (s - src)); /* count does not include NUL */
-}
-
-CoreExport size_t strlcpy(char *dst, const char *src, size_t siz)
-{
-	char *d = dst;
-	const char *s = src;
-	size_t n = siz;
-
-	/* Copy as many bytes as will fit */
-	if (n != 0 && --n != 0)
-	{
-		do
-		{
-			if ((*d++ = *s++) == 0)
-				break;
-		} while (--n != 0);
-	}
-
-	/* Not enough room in dst, add NUL and traverse rest of src */
-	if (n == 0)
-	{
-		if (siz != 0)
-			*d = '\0'; /* NUL-terminate dst */
-		while (*s++);
-	}
-
-	return(s - src - 1); /* count does not include NUL */
-}
-#endif
-
-CoreExport int charlcat(char* x,char y,int z)
-{
-	char* x__n = x;
-	int v = 0;
-
-	while(*x__n++)
-		v++;
-
-	if (v < z - 1)
-	{
-		*--x__n = y;
-		*++x__n = 0;
-	}
-
-	return v;
-}
-
-CoreExport bool charremove(char* mp, char remove)
-{
-	char* mptr = mp;
-	bool shift_down = false;
-
-	while (*mptr)
-	{
-		if (*mptr == remove)
-		shift_down = true;
-
-		if (shift_down)
-			*mptr = *(mptr+1);
-
-		mptr++;
-	}
-
-	return shift_down;
-}
-
 static const char hextable[] = "0123456789abcdef";
 
-std::string BinToHex(const std::string& data)
+std::string BinToHex(const void* raw, size_t l)
 {
-	int l = data.length();
+	const char* data = static_cast<const char*>(raw);
 	std::string rv;
 	rv.reserve(l * 2);
-	for(int i=0; i < l; i++)
+	for (size_t i = 0; i < l; i++)
 	{
 		unsigned char c = data[i];
-		rv.append(1, hextable[c >> 4]);
-		rv.append(1, hextable[c & 0xF]);
+		rv.push_back(hextable[c >> 4]);
+		rv.push_back(hextable[c & 0xF]);
 	}
 	return rv;
 }
@@ -230,3 +108,19 @@ std::string Base64ToBin(const std::string& data_str, const char* table)
 	}
 	return rv;
 }
+
+bool InspIRCd::TimingSafeCompare(const std::string& one, const std::string& two)
+{
+	if (one.length() != two.length())
+		return false;
+
+	unsigned int diff = 0;
+	for (std::string::const_iterator i = one.begin(), j = two.begin(); i != one.end(); ++i, ++j)
+	{
+		unsigned char a = static_cast<unsigned char>(*i);
+		unsigned char b = static_cast<unsigned char>(*j);
+		diff |= a ^ b;
+	}
+
+	return (diff == 0);
+}