stop including rijndael-api-fst.h from rijndael.h.
this is required to integrate opencrypto into crypto.
This commit is contained in:
parent
35a196154f
commit
68527b3aad
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=143418
@ -31,7 +31,6 @@
|
||||
#define __RIJNDAEL_H
|
||||
|
||||
#include <crypto/rijndael/rijndael-alg-fst.h>
|
||||
#include <crypto/rijndael/rijndael-api-fst.h>
|
||||
|
||||
/* XXX: avoid conflicts with opencrypto */
|
||||
#define rijndael_set_key _rijndael_set_key
|
||||
|
@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$");
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
||||
#include <crypto/rijndael/rijndael.h>
|
||||
#include <crypto/rijndael/rijndael-api-fst.h>
|
||||
#include <crypto/sha2/sha2.h>
|
||||
|
||||
#include <dev/random/hash.h>
|
||||
|
@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
|
||||
#include <sys/sysctl.h>
|
||||
#include <sys/systm.h>
|
||||
|
||||
#include <crypto/rijndael/rijndael.h>
|
||||
#include <crypto/rijndael/rijndael-api-fst.h>
|
||||
#include <crypto/sha2/sha2.h>
|
||||
|
||||
#include <dev/random/hash.h>
|
||||
|
@ -42,7 +42,7 @@
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/kthread.h>
|
||||
|
||||
#include <crypto/rijndael/rijndael.h>
|
||||
#include <crypto/rijndael/rijndael-api-fst.h>
|
||||
#include <crypto/sha2/sha2.h>
|
||||
#include <geom/geom.h>
|
||||
#include <geom/bde/g_bde.h>
|
||||
|
@ -46,7 +46,7 @@
|
||||
#include <sys/endian.h>
|
||||
#include <sys/md5.h>
|
||||
|
||||
#include <crypto/rijndael/rijndael.h>
|
||||
#include <crypto/rijndael/rijndael-api-fst.h>
|
||||
#include <crypto/sha2/sha2.h>
|
||||
|
||||
#include <geom/geom.h>
|
||||
|
@ -57,7 +57,7 @@
|
||||
#define g_free(foo) free(foo)
|
||||
#endif
|
||||
|
||||
#include <crypto/rijndael/rijndael.h>
|
||||
#include <crypto/rijndael/rijndael-api-fst.h>
|
||||
#include <crypto/sha2/sha2.h>
|
||||
|
||||
#include <geom/geom.h>
|
||||
|
@ -70,7 +70,7 @@
|
||||
#include <sys/proc.h>
|
||||
#include <sys/kthread.h>
|
||||
|
||||
#include <crypto/rijndael/rijndael.h>
|
||||
#include <crypto/rijndael/rijndael-api-fst.h>
|
||||
#include <crypto/sha2/sha2.h>
|
||||
#include <geom/geom.h>
|
||||
#include <geom/bde/g_bde.h>
|
||||
|
@ -57,9 +57,7 @@ __FBSDID("$FreeBSD$");
|
||||
#include <sys/errno.h>
|
||||
#include <geom/geom.h>
|
||||
|
||||
#include <crypto/rijndael/rijndael.h>
|
||||
|
||||
#include <crypto/rijndael/rijndael.h>
|
||||
#include <crypto/rijndael/rijndael-api-fst.h>
|
||||
|
||||
#define AES_CLASS_NAME "AES"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user