Page MenuHomeFreeBSD
Files F143518715

D23689.diff
No OneTemporary
Actions

D23689.diff
View Options

Index: head/sys/conf/files
===================================================================
--- head/sys/conf/files
+++ head/sys/conf/files
@@ -4824,6 +4824,23 @@
compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include -I$S/crypto/libsodium"
crypto/libsodium/utils.c optional crypto \
compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include -I$S/crypto/libsodium"
+contrib/libsodium/src/libsodium/crypto_core/hchacha20/core_hchacha20.c \
+ optional crypto \
+ compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium"
+contrib/libsodium/src/libsodium/crypto_stream/chacha20/stream_chacha20.c \
+ optional crypto \
+ compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium"
+contrib/libsodium/src/libsodium/crypto_stream/chacha20/ref/chacha20_ref.c \
+ optional crypto \
+ compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium"
+contrib/libsodium/src/libsodium/crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c \
+ optional crypto \
+ compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium"
+contrib/libsodium/src/libsodium/crypto_aead/xchacha20poly1305/sodium/aead_xchacha20poly1305.c \
+ optional crypto \
+ compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium"
+
+
opencrypto/cbc_mac.c optional crypto
opencrypto/xform_cbc_mac.c optional crypto
rpc/auth_none.c optional krpc | nfslockd | nfscl | nfsd
Index: head/sys/contrib/libsodium/src/libsodium/include/sodium/core.h
===================================================================
--- head/sys/contrib/libsodium/src/libsodium/include/sodium/core.h
+++ head/sys/contrib/libsodium/src/libsodium/include/sodium/core.h
@@ -16,11 +16,11 @@
SODIUM_EXPORT
int sodium_set_misuse_handler(void (*handler)(void));
-
+#ifndef _KERNEL
SODIUM_EXPORT
void sodium_misuse(void)
__attribute__ ((noreturn));
-
+#endif
#ifdef __cplusplus
}
#endif
Index: head/sys/contrib/libsodium/src/libsodium/include/sodium/export.h
===================================================================
--- head/sys/contrib/libsodium/src/libsodium/include/sodium/export.h
+++ head/sys/contrib/libsodium/src/libsodium/include/sodium/export.h
@@ -54,4 +54,14 @@
#define SODIUM_MIN(A, B) ((A) < (B) ? (A) : (B))
#define SODIUM_SIZE_MAX SODIUM_MIN(UINT64_MAX, SIZE_MAX)
+#ifdef _KERNEL
+#include <sys/param.h>
+#include <sys/libkern.h>
+static inline void
+sodium_misuse(void)
+{
+ panic("bad value passed to sodium");
+}
+#endif
+
#endif

File Metadata

Mime Type
text/plain
Expires
Sat, Jan 31, 7:49 PM (11 h, 54 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28170926
Default Alt Text
D23689.diff (2 KB)

Event Timeline