M1: vendored sha2/md5 (OpenBSD 8.0) + endian/swap compat; module builds green
This commit is contained in:
lgcosta committed
1 parent
da2e9b679a
commit
a84b2c91f3
26 files changed
+4810
-91
No files matched your search
@@ -0,0 +1,23 @@
|
||||
/* PFLINUX compat: <crypto/md5.h> — MD5 as used by pf_ctl ruleset checksum.
|
||||
* Implementation: compat/md5.c (vendored OpenBSD 8.0 source). */
|
||||
#ifndef _PFK_MD5_H
|
||||
#define _PFK_MD5_H
|
||||
|
||||
#define MD5_BLOCK_LENGTH 64
|
||||
#define MD5_DIGEST_LENGTH 16
|
||||
#define MD5_DIGEST_STRING_LENGTH (MD5_DIGEST_LENGTH * 2 + 1)
|
||||
|
||||
typedef struct MD5Context {
|
||||
u_int32_t state[4];
|
||||
u_int64_t count;
|
||||
u_int8_t buffer[MD5_BLOCK_LENGTH];
|
||||
} MD5_CTX;
|
||||
|
||||
void MD5Init(MD5_CTX *);
|
||||
void MD5Update(MD5_CTX *, const void *, size_t);
|
||||
void MD5Final(u_int8_t[MD5_DIGEST_LENGTH], MD5_CTX *);
|
||||
void MD5Pad(MD5_CTX *);
|
||||
void MD5Transform(u_int32_t[4], const u_int8_t[MD5_BLOCK_LENGTH]);
|
||||
char *MD5End(MD5_CTX *, char *);
|
||||
|
||||
#endif /* _PFK_MD5_H */
|
||||
@@ -1,56 +1,16 @@
|
||||
/* $OpenBSD: sha2.h,v 1.5 2014/11/16 17:39:09 tedu Exp $ */
|
||||
/* PFLINUX compat: <crypto/sha2.h> — declarations matching OpenBSD's
|
||||
* sys/crypto/sha2.h API used by PF (SHA2_CTX union + SHA256/384/512).
|
||||
* Implementation: compat/sha2.c (vendored OpenBSD 8.0 source). */
|
||||
#ifndef _PFK_SHA2_H
|
||||
#define _PFK_SHA2_H
|
||||
|
||||
/*
|
||||
* FILE: sha2.h
|
||||
* AUTHOR: Aaron D. Gifford <me@aarongifford.com>
|
||||
*
|
||||
* Copyright (c) 2000-2001, Aaron D. Gifford
|
||||
* 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 the copyright holder nor the names of contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTOR(S) ``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 OR CONTRIBUTOR(S) 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.
|
||||
*
|
||||
* $From: sha2.h,v 1.1 2001/11/08 00:02:01 adg Exp adg $
|
||||
*/
|
||||
#define SHA256_BLOCK_LENGTH 64
|
||||
#define SHA256_DIGEST_LENGTH 32
|
||||
#define SHA384_BLOCK_LENGTH 128
|
||||
#define SHA384_DIGEST_LENGTH 48
|
||||
#define SHA512_BLOCK_LENGTH 128
|
||||
#define SHA512_DIGEST_LENGTH 64
|
||||
|
||||
#ifndef _SHA2_H
|
||||
#define _SHA2_H
|
||||
|
||||
|
||||
/*** SHA-256/384/512 Various Length Definitions ***********************/
|
||||
#define SHA256_BLOCK_LENGTH 64
|
||||
#define SHA256_DIGEST_LENGTH 32
|
||||
#define SHA256_DIGEST_STRING_LENGTH (SHA256_DIGEST_LENGTH * 2 + 1)
|
||||
#define SHA384_BLOCK_LENGTH 128
|
||||
#define SHA384_DIGEST_LENGTH 48
|
||||
#define SHA384_DIGEST_STRING_LENGTH (SHA384_DIGEST_LENGTH * 2 + 1)
|
||||
#define SHA512_BLOCK_LENGTH 128
|
||||
#define SHA512_DIGEST_LENGTH 64
|
||||
#define SHA512_DIGEST_STRING_LENGTH (SHA512_DIGEST_LENGTH * 2 + 1)
|
||||
|
||||
|
||||
/*** SHA-256/384/512 Context Structure *******************************/
|
||||
typedef struct _SHA2_CTX {
|
||||
union {
|
||||
u_int32_t st32[8];
|
||||
@@ -60,24 +20,14 @@ typedef struct _SHA2_CTX {
|
||||
u_int8_t buffer[SHA512_BLOCK_LENGTH];
|
||||
} SHA2_CTX;
|
||||
|
||||
__BEGIN_DECLS
|
||||
void SHA256Init(SHA2_CTX *);
|
||||
void SHA256Update(SHA2_CTX *, const void *, size_t)
|
||||
__attribute__((__bounded__(__string__,2,3)));
|
||||
void SHA256Final(u_int8_t[SHA256_DIGEST_LENGTH], SHA2_CTX *)
|
||||
__attribute__((__bounded__(__minbytes__,1,SHA256_DIGEST_LENGTH)));
|
||||
|
||||
void SHA256Update(SHA2_CTX *, const void *, size_t);
|
||||
void SHA256Final(u_int8_t *, SHA2_CTX *);
|
||||
void SHA384Init(SHA2_CTX *);
|
||||
void SHA384Update(SHA2_CTX *, const void *, size_t)
|
||||
__attribute__((__bounded__(__string__,2,3)));
|
||||
void SHA384Final(u_int8_t[SHA384_DIGEST_LENGTH], SHA2_CTX *)
|
||||
__attribute__((__bounded__(__minbytes__,1,SHA384_DIGEST_LENGTH)));
|
||||
|
||||
void SHA384Update(SHA2_CTX *, const void *, size_t);
|
||||
void SHA384Final(u_int8_t *, SHA2_CTX *);
|
||||
void SHA512Init(SHA2_CTX *);
|
||||
void SHA512Update(SHA2_CTX *, const void *, size_t)
|
||||
__attribute__((__bounded__(__string__,2,3)));
|
||||
void SHA512Final(u_int8_t[SHA512_DIGEST_LENGTH], SHA2_CTX *)
|
||||
__attribute__((__bounded__(__minbytes__,1,SHA512_DIGEST_LENGTH)));
|
||||
__END_DECLS
|
||||
void SHA512Update(SHA2_CTX *, const void *, size_t);
|
||||
void SHA512Final(u_int8_t *, SHA2_CTX *);
|
||||
|
||||
#endif /* _SHA2_H */
|
||||
#endif /* _PFK_SHA2_H */
|
||||
@@ -3,4 +3,17 @@
|
||||
#define _PFK_SYS_ENDIAN_H
|
||||
#include <linux/byteorder/generic.h>
|
||||
#include <linux/byteorder/little_endian.h>
|
||||
#include <linux/stddef.h>
|
||||
/* BSD byte-order names used by ported code */
|
||||
#define LITTLE_ENDIAN 1234
|
||||
#define BIG_ENDIAN 4321
|
||||
#define PDP_ENDIAN 3412
|
||||
#if defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
|
||||
#define BYTE_ORDER BIG_ENDIAN
|
||||
#else
|
||||
#define BYTE_ORDER LITTLE_ENDIAN
|
||||
#endif
|
||||
#define swap16(x) swab16(x)
|
||||
#define swap32(x) swab32(x)
|
||||
#define swap64(x) swab64(x)
|
||||
#endif
|
||||
@@ -155,7 +155,9 @@ struct pfk_rwlock {
|
||||
#define PFKIOC_DIR(nr) (((nr) >> PFKXIOC_DIRSHIFT) & ((1U<<PFKXIOC_DIRBITS)-1))
|
||||
|
||||
/* OpenBSD endian names htobe64/htole64/beXXXtoh and ntoh/hton are already
|
||||
* provided by linux/byteorder/generic.h — do NOT redefine (Werror). */
|
||||
* provided by linux/byteorder/generic.h — do NOT redefine (Werror).
|
||||
* BSD byte-order names (BYTE_ORDER/LITTLE_ENDIAN) via compat header: */
|
||||
#include "compat/sys/endian.h"
|
||||
|
||||
/* pfvar.h pulls <net/route.h> → resolves to the kernel's net/route.h;
|
||||
* BSD-only bits it expects must be provided here. */
|
||||
@@ -275,6 +277,7 @@ static inline u_int32_t random(void) { return get_random_u32(); }
|
||||
/* copyin/copyout */
|
||||
#define copyin(u, k, l) (copy_from_user((k), (u), (l)) ? EFAULT : 0)
|
||||
#define copyout(k, u, l) (copy_to_user((u), (k), (l)) ? EFAULT : 0)
|
||||
#define explicit_bzero(p, l) memzero_explicit((p), (l))
|
||||
|
||||
/* assert-ish */
|
||||
#define KASSERT(cond) WARN_ON(!(cond))
|
||||
@@ -323,8 +326,10 @@ int rw_status(struct rwlock_s *l);
|
||||
#include "pfk_if.h"
|
||||
|
||||
/* OpenBSD digest + toeplitz helpers (vendored into compat/crypto, compat/net) */
|
||||
#include "compat/net/toeplitz.h"
|
||||
#include "compat/crypto/sha2.h"
|
||||
#include "compat/crypto/md5.h"
|
||||
#include "compat/crypto/siphash.h"
|
||||
#include "compat/net/toeplitz.h"
|
||||
|
||||
/* pf headers resolve via -I module/include */
|
||||
#define NPFSYNC 0
|
||||
|
||||
Reference in new issue
Block a user