Simplify account identifier generation.

2 files changed, 8 insertions, 153 deletions

diff --git a/src/nickcore.cpp b/src/nickcore.cpp
index 190a026bd..253f81c7a 100644
--- a/src/nickcore.cpp
+++ b/src/nickcore.cpp
@@ -213,24 +213,18 @@ uint64_t NickCore::GetId()
 	if (this->id)
 		return this->id;
 
-	Anope::string secretid = this->display + "\0" + Anope::ToString(this->time_registered);
-
-	// Generate the account id. This should almost always only have one
-	// iteration but in the rare case that we generate a duplicate id we try
-	// again with a new key.
+	// We base the account identifier on the account display at registration and
+	// when the account was first registered. This should be unique enough that
+	// it never collides. In the extremely rare case that it does generate a
+	// duplicate id we try with a new suffix.
+	uint64_t attempt = 0;
 	while (!this->id)
 	{
-		// Generate a random key for SipHash.
-		char key[16];
-		for (auto &chr : key)
-			chr = Anope::RandomNumber() % CHAR_MAX;
-
-		uint64_t newid = Anope::SipHash24(secretid.c_str(), secretid.length(), key);
-		nickcoreid_map::const_iterator it = NickCoreIdList.find(newid);
-		if (it == NickCoreIdList.end())
+		const auto newidstr = this->display + "\0" + Anope::ToString(this->time_registered) + "\0" + Anope::ToString(attempt++);
+		const auto newid = Anope::hash_cs()(newidstr);
+		if (NickCoreIdList.emplace(newid, this).second)
 		{
 			this->id = newid;
-			NickCoreIdList[this->id] = this;
 			this->QueueUpdate();
 			break;
 		}
diff --git a/src/siphash.cpp b/src/siphash.cpp
deleted file mode 100644
index d8a2228e6..000000000
--- a/src/siphash.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-/* SipHash-2-4 routines.
- *
- * (C) 2003-2024 Anope Team
- * Contact us at team@anope.org
- *
- * Please read COPYING and README for further details.
- *
- * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church.
- */
-
-/* <MIT License>
- Copyright (c) 2013  Marek Majkowski <marek@popcount.org>
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
- </MIT License>
- Original location:
-    https://github.com/majek/csiphash/
- Solution inspired by code from:
-    Samuel Neves (supercop/crypto_auth/siphash24/little)
-    djb (supercop/crypto_auth/siphash24/little2)
-    Jean-Philippe Aumasson (https://131002.net/siphash/siphash24.c)
-*/
-
-#include "services.h"
-#include "anope.h"
-
-// WARNING: This ifdef maze could be a lot simpler but unfortunately
-// that will cause find_includes to be unable to parse it.
-
-#ifdef __APPLE__
-#  include <libkern/OSByteOrder.h>
-#  define _le64toh(x) OSSwapLittleToHostInt64(x)
-#endif
-
-#ifdef __FreeBSD__
-#  include <sys/endian.h>
-#  define _le64toh(x) le64toh(x)
-#endif
-
-#ifdef __linux__
-#  include <endian.h>
-#endif
-
-#ifdef __NetBSD__
-#  include <sys/endian.h>
-#  define _le64toh(x) le64toh(x)
-#endif
-
-#ifdef __OpenBSD__
-#  include <sys/endian.h>
-#  define _le64toh(x) le64toh(x)
-#endif
-
-// Windows is always little endian.
-#ifdef _WIN32
-#  define _le64toh(x) ((uint64_t)(x))
-#endif
-
-// Attempt to work on unenumerated platforms.
-#if defined(le64toh) && !defined(_le64toh)
-#  define _le64toh le64toh
-#endif
-
-// We can't do anything about this.
-#ifndef _le64toh
-#  error Please define _le64toh for your platform!
-#endif
-
-#define ROTATE(x, b) (uint64_t)( ((x) << (b)) | ( (x) >> (64 - (b))) )
-
-#define HALF_ROUND(a,b,c,d,s,t)			\
-	a += b; c += d;				\
-	b = ROTATE(b, s) ^ a;			\
-	d = ROTATE(d, t) ^ c;			\
-	a = ROTATE(a, 32);
-
-#define DOUBLE_ROUND(v0,v1,v2,v3)		\
-	HALF_ROUND(v0,v1,v2,v3,13,16);		\
-	HALF_ROUND(v2,v1,v0,v3,17,21);		\
-	HALF_ROUND(v0,v1,v2,v3,13,16);		\
-	HALF_ROUND(v2,v1,v0,v3,17,21);
-
-
-uint64_t Anope::SipHash24(const void *src, unsigned long src_sz, const char key[16])
-{
-	const uint64_t *_key = (uint64_t *)key;
-	uint64_t k0 = _le64toh(_key[0]);
-	uint64_t k1 = _le64toh(_key[1]);
-	uint64_t b = (uint64_t)src_sz << 56;
-	const uint64_t *in = (uint64_t*)src;
-
-	uint64_t v0 = k0 ^ 0x736f6d6570736575ULL;
-	uint64_t v1 = k1 ^ 0x646f72616e646f6dULL;
-	uint64_t v2 = k0 ^ 0x6c7967656e657261ULL;
-	uint64_t v3 = k1 ^ 0x7465646279746573ULL;
-
-	while (src_sz >= 8)
-	{
-		uint64_t mi = _le64toh(*in);
-		in += 1; src_sz -= 8;
-		v3 ^= mi;
-		DOUBLE_ROUND(v0,v1,v2,v3);
-		v0 ^= mi;
-	}
-
-	uint64_t t = 0; uint8_t *pt = (uint8_t *)&t; uint8_t *m = (uint8_t *)in;
-	switch (src_sz)
-	{
-		case 7: pt[6] = m[6]; [[fallthrough]];
-		case 6: pt[5] = m[5]; [[fallthrough]];
-		case 5: pt[4] = m[4]; [[fallthrough]];
-		case 4: *((uint32_t*)&pt[0]) = *((uint32_t*)&m[0]); break;
-		case 3: pt[2] = m[2]; [[fallthrough]];
-		case 2: pt[1] = m[1]; [[fallthrough]];
-		case 1: pt[0] = m[0];
-	}
-	b |= _le64toh(t);
-
-	v3 ^= b;
-	DOUBLE_ROUND(v0,v1,v2,v3);
-	v0 ^= b; v2 ^= 0xff;
-	DOUBLE_ROUND(v0,v1,v2,v3);
-	DOUBLE_ROUND(v0,v1,v2,v3);
-	return (v0 ^ v1) ^ (v2 ^ v3);
-}