From 2a93cf52e5386eb1b3586565af6a06ade4d32a66 Mon Sep 17 00:00:00 2001 From: Ian Moffett Date: Sun, 13 Jul 2025 03:29:04 -0400 Subject: kernel: Move crypto specifics to sys/crypto/* Signed-off-by: Ian Moffett --- sys/include/dev/random/chacha20.h | 47 --------------------------------------- sys/include/dev/random/siphash.h | 34 ---------------------------- 2 files changed, 81 deletions(-) delete mode 100644 sys/include/dev/random/chacha20.h delete mode 100644 sys/include/dev/random/siphash.h (limited to 'sys/include/dev') diff --git a/sys/include/dev/random/chacha20.h b/sys/include/dev/random/chacha20.h deleted file mode 100644 index d35702a..0000000 --- a/sys/include/dev/random/chacha20.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2023-2025 Ian Marco Moffett and the Osmora Team. - * 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. Neither the name of Hyra nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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. - */ - -#include -#include -#include - -#define ROTL(a,b) (((a) << (b)) | ((a) >> (32 - (b)))) - -#define QR(a,b,c,d) \ - a += b; d ^= a; d = ROTL(d, 16); \ - c += d; b ^= c; b = ROTL(b, 12); \ - a += b; d ^= a; d = ROTL(d, 8); \ - c += d; b ^= c; b = ROTL(b, 7); - -void chacha20_init(uint32_t state[16], const uint8_t key[32], - const uint8_t nonce[12], uint32_t counter); - -void chacha20_block(uint32_t state[16], uint8_t out[64]); -void chacha20_encrypt(uint32_t state[16], uint8_t *in, uint8_t *out, size_t len); - diff --git a/sys/include/dev/random/siphash.h b/sys/include/dev/random/siphash.h deleted file mode 100644 index ecabb4a..0000000 --- a/sys/include/dev/random/siphash.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - Copyright (c) 2013 Marek Majkowski - - 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. - - - 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 - -uint64_t siphash24(const void *src, unsigned long src_sz, const char k[16]); -- cgit v1.2.3