summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorume <ume@FreeBSD.org>2003-11-12 04:22:37 +0000
committerume <ume@FreeBSD.org>2003-11-12 04:22:37 +0000
commit88488cca11ed31ba57f4907d49187c869369c6cd (patch)
treea4b8d5a8e4c78e6b087a24af518206763a8179e8 /sys
parente1aafea49411106110732817876fea23642ceb16 (diff)
downloadFreeBSD-src-88488cca11ed31ba57f4907d49187c869369c6cd.zip
FreeBSD-src-88488cca11ed31ba57f4907d49187c869369c6cd.tar.gz
avoid module name conflict with opencrypto/rijndael.c.
Reported by: tinderbox
Diffstat (limited to 'sys')
-rw-r--r--sys/conf/files2
-rw-r--r--sys/crypto/rijndael/rijndael-api.c (renamed from sys/crypto/rijndael/rijndael.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/sys/conf/files b/sys/conf/files
index b5e3db3..2482345 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -207,7 +207,7 @@ crypto/cast128/cast128.c optional ipsec ipsec_esp
crypto/des/des_ecb.c optional ipsec ipsec_esp
crypto/des/des_setkey.c optional ipsec ipsec_esp
crypto/rijndael/rijndael-alg-fst.c optional ipsec
-crypto/rijndael/rijndael.c optional ipsec
+crypto/rijndael/rijndael-api.c optional ipsec
opencrypto/rmd160.c optional ipsec
crypto/sha1.c optional ipsec
crypto/sha2/sha2.c optional ipsec
diff --git a/sys/crypto/rijndael/rijndael.c b/sys/crypto/rijndael/rijndael-api.c
index 9a7fda3..9a7fda3 100644
--- a/sys/crypto/rijndael/rijndael.c
+++ b/sys/crypto/rijndael/rijndael-api.c
OpenPOWER on IntegriCloud