Mercurial > hg > webserver / changeset

--- a/src/server/daemon/keyfile_auth.c	Tue May 27 18:41:23 2025 +0200
+++ b/src/server/daemon/keyfile_auth.c	Wed May 28 20:54:43 2025 +0200
@@ -30,14 +30,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <openssl/sha.h>
-#if defined(__sun) && defined(__SunOS_5_10)
-#include <sha2.h>
-#define SHA256_Init     SHA256Init
-#define SHA256_Update   SHA256Update
-#define SHA256_Final    SHA256Final
-#endif
-
+#include "../util/hashing.h"
 #include "../util/atomic.h"
 #include "../util/util.h"
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/server/util/hashing.c	Wed May 28 20:54:43 2025 +0200
@@ -0,0 +1,69 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2025 Olaf Wintermann. 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.
+ *
+ * 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 HOLDER 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 "hashing.h"
+
+#include <stdlib.h>
+
+WS_SHA_CTX* ws_sha256_create(void) {
+    WS_SHA_CTX *ctx = malloc(sizeof(WS_SHA_CTX));
+    ws_sha256_init(ctx);
+    return ctx;
+}
+
+#if OPENSSL_VERSION_NUMBER < 0x30000000L
+
+void ws_sha256_init(WS_SHA_CTX *ctx) {
+    SHA256_Init(ctx);
+}
+
+void ws_sha256_update(WS_SHA_CTX *ctx, const void *data, size_t length) {
+    SHA256_Update(ctx, data, length);
+}
+
+void ws_sha256_final(char *md, WS_SHA_CTX *ctx) {
+    SHA256_Final(md, ctx);
+}
+
+#else
+
+void ws_sha256_init(WS_SHA_CTX *ctx) {
+    EVP_MD_CTX *mdctx = EVP_MD_CTX_new();
+    EVP_DigestInit_ex(mdctx, EVP_sha256(), NULL);
+    *ctx = mdctx;
+}
+
+void ws_sha256_update(WS_SHA_CTX *ctx, const char *data, size_t length) {
+    EVP_DigestUpdate(*ctx, data, length);
+}
+
+void ws_sha256_final(WS_SHA_CTX *ctx, unsigned char *md) {
+    EVP_DigestFinal(*ctx, md, NULL);
+}
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/server/util/hashing.h	Wed May 28 20:54:43 2025 +0200
@@ -0,0 +1,113 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2025 Olaf Wintermann. 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.
+ *
+ * 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 HOLDER 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.
+ */
+
+#ifndef HASHING_H
+#define HASHING_H
+
+
+#ifdef __APPLE__
+/* macos */
+
+#define WS_CRYPTO_COMMON_CRYPTO
+
+#define WS_AES_CTX              CCCryptorRef
+#define WS_SHA_CTX              CC_SHA256_CTX
+#define WS_SHA256_DIGEST_LENGTH 32
+
+#include <CommonCrypto/CommonCrypto.h>
+#include <CommonCrypto/CommonDigest.h>
+
+#elif defined(_WIN32)
+
+#define WS_CRYPTO_CNG
+
+#include <windows.h>
+#include <bcrypt.h>
+
+typedef struct WinBCryptCTX {
+    BCRYPT_ALG_HANDLE hAlg;
+    BCRYPT_KEY_HANDLE hKey;
+    void              *pbKeyObject;
+    unsigned char     pbIV[16];
+    
+    unsigned char     buf[16];
+    ULONG             buflen;
+} WinBCryptCTX;
+
+typedef struct WinBCryptSHACTX {
+    BCRYPT_ALG_HANDLE  hAlg;
+    BCRYPT_HASH_HANDLE hHash;    
+    void               *pbHashObject;
+} WinBCryptSHACTX;
+
+#define WS_AES_CTX              WinBCryptCTX
+#define WS_SHA_CTX              WinBCryptSHACTX
+#define WS_SHA256_DIGEST_LENGTH 32
+
+#else
+/* unix/linux */
+
+#include <openssl/evp.h>
+#include <openssl/rand.h>
+
+#define WS_USE_OPENSSL
+
+#define WS_AES_CTX              EVP_CIPHER_CTX*
+
+#if OPENSSL_VERSION_NUMBER < 0x30000000L
+#define WS_SHA_CTX              SHA256_CTX
+#else
+#define WS_SHA_CTX              EVP_MD_CTX*
+#endif
+#define WS_SHA256_DIGEST_LENGTH 32
+
+
+#if defined(__sun) && defined(__SunOS_5_10)
+#include <sha2.h>
+#define SHA256_Init     SHA256Init
+#define SHA256_Update   SHA256Update
+#define SHA256_Final    SHA256Final
+#else
+#include <openssl/sha.h>
+#endif
+
+#endif
+
+
+void ws_sha256_init(WS_SHA_CTX *ctx);
+WS_SHA_CTX* ws_sha256_create(void);
+void ws_sha256_update(WS_SHA_CTX *ctx, const char *data, size_t len);
+void ws_sha256_final(WS_SHA_CTX *ctx, unsigned char *buf);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* HASHING_H */
+

--- a/src/server/util/objs.mk	Tue May 27 18:41:23 2025 +0200
+++ b/src/server/util/objs.mk	Wed May 28 20:54:43 2025 +0200
@@ -44,6 +44,7 @@
 UTILOBJ += date.o
 UTILOBJ += writer.o
 UTILOBJ += libxattr.o
+UTILOBJ += hashing.o
 
 UTILOBJS = $(UTILOBJ:%=$(UTIL_OBJPRE)%)
 UTILSOURCE = $(UTILOBJ:%.o=util/%.c)