Update files to match FreeBSD layout

Add compatibility with Newlib header files.  Some FreeBSD header files
are mapped by the translation script:

     o rtems/bsd/sys/_types.h
     o rtems/bsd/sys/errno.h
     o rtems/bsd/sys/lock.h
     o rtems/bsd/sys/param.h
     o rtems/bsd/sys/resource.h
     o rtems/bsd/sys/time.h
     o rtems/bsd/sys/timespec.h
     o rtems/bsd/sys/types.h
     o rtems/bsd/sys/unistd.h

It is now possible to include <sys/socket.h> directly for example.

Generate one Makefile which builds everything including tests.

14 files changed, 164 insertions, 164 deletions

diff --git a/freebsd/sys/opencrypto/cast.c b/freebsd/sys/opencrypto/cast.c
index fde6352c..53fe23b1 100644
--- a/freebsd/sys/opencrypto/cast.c
+++ b/freebsd/sys/opencrypto/cast.c
@@ -1,4 +1,4 @@
-#include <freebsd/machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-config.h>
 
 /*      $OpenBSD: cast.c,v 1.2 2000/06/06 06:49:47 deraadt Exp $       */
 /*-
@@ -8,12 +8,12 @@
  *	Released 1997.10.11
  */
 
-#include <freebsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <freebsd/sys/types.h>
-#include <freebsd/opencrypto/cast.h>
-#include <freebsd/opencrypto/castsb.h>
+#include <rtems/bsd/sys/types.h>
+#include <opencrypto/cast.h>
+#include <opencrypto/castsb.h>
 
 /* Macros to access 8-bit bytes out of a 32-bit word */
 #define U_INT8_Ta(x) ( (u_int8_t) (x>>24) )
diff --git a/freebsd/sys/opencrypto/cast.h b/freebsd/sys/opencrypto/cast.h
index 25d6c763..8e2d0d19 100644
--- a/freebsd/sys/opencrypto/cast.h
+++ b/freebsd/sys/opencrypto/cast.h
@@ -8,8 +8,8 @@
  *	Released 1997.10.11
  */
 
-#ifndef _CAST_HH_
-#define _CAST_HH_
+#ifndef _CAST_H_
+#define _CAST_H_
 
 typedef struct {
 	u_int32_t	xkey[32];	/* Key, after expansion */
@@ -20,4 +20,4 @@ void cast_setkey(cast_key * key, u_int8_t * rawkey, int keybytes);
 void cast_encrypt(cast_key * key, u_int8_t * inblock, u_int8_t * outblock);
 void cast_decrypt(cast_key * key, u_int8_t * inblock, u_int8_t * outblock);
 
-#endif /* ifndef _CAST_HH_ */
+#endif /* ifndef _CAST_H_ */
diff --git a/freebsd/sys/opencrypto/criov.c b/freebsd/sys/opencrypto/criov.c
index 1e389c1d..63ba4c66 100644
--- a/freebsd/sys/opencrypto/criov.c
+++ b/freebsd/sys/opencrypto/criov.c
@@ -1,4 +1,4 @@
-#include <freebsd/machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-config.h>
 
 /*      $OpenBSD: criov.c,v 1.9 2002/01/29 15:48:29 jason Exp $	*/
 
@@ -29,19 +29,19 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <freebsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <freebsd/sys/param.h>
-#include <freebsd/sys/systm.h>
-#include <freebsd/sys/proc.h>
-#include <freebsd/sys/errno.h>
-#include <freebsd/sys/malloc.h>
-#include <freebsd/sys/kernel.h>
-#include <freebsd/sys/mbuf.h>
-#include <freebsd/sys/uio.h>
+#include <rtems/bsd/sys/param.h>
+#include <sys/systm.h>
+#include <sys/proc.h>
+#include <rtems/bsd/sys/errno.h>
+#include <sys/malloc.h>
+#include <sys/kernel.h>
+#include <sys/mbuf.h>
+#include <sys/uio.h>
 
-#include <freebsd/opencrypto/cryptodev.h>
+#include <opencrypto/cryptodev.h>
 
 /*
  * This macro is only for avoiding code duplication, as we need to skip
diff --git a/freebsd/sys/opencrypto/crypto.c b/freebsd/sys/opencrypto/crypto.c
index 597bbc94..006d33ea 100644
--- a/freebsd/sys/opencrypto/crypto.c
+++ b/freebsd/sys/opencrypto/crypto.c
@@ -1,4 +1,4 @@
-#include <freebsd/machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-config.h>
 
 /*-
  * Copyright (c) 2002-2006 Sam Leffler.  All rights reserved.
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <freebsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 /*
@@ -58,34 +58,34 @@ __FBSDID("$FreeBSD$");
 
 #define	CRYPTO_TIMING				/* enable timing support */
 
-#include <freebsd/local/opt_ddb.h>
-#include <freebsd/local/opt_kdtrace.h>
+#include <rtems/bsd/local/opt_ddb.h>
+#include <rtems/bsd/local/opt_kdtrace.h>
 
-#include <freebsd/sys/param.h>
-#include <freebsd/sys/systm.h>
-#include <freebsd/sys/eventhandler.h>
-#include <freebsd/sys/kernel.h>
-#include <freebsd/sys/kthread.h>
-#include <freebsd/sys/lock.h>
-#include <freebsd/sys/module.h>
-#include <freebsd/sys/mutex.h>
-#include <freebsd/sys/malloc.h>
-#include <freebsd/sys/proc.h>
-#include <freebsd/sys/sdt.h>
-#include <freebsd/sys/sysctl.h>
+#include <rtems/bsd/sys/param.h>
+#include <sys/systm.h>
+#include <sys/eventhandler.h>
+#include <sys/kernel.h>
+#include <sys/kthread.h>
+#include <rtems/bsd/sys/lock.h>
+#include <sys/module.h>
+#include <sys/mutex.h>
+#include <sys/malloc.h>
+#include <sys/proc.h>
+#include <sys/sdt.h>
+#include <sys/sysctl.h>
 
-#include <freebsd/ddb/ddb.h>
+#include <ddb/ddb.h>
 
-#include <freebsd/vm/uma.h>
-#include <freebsd/opencrypto/cryptodev.h>
-#include <freebsd/opencrypto/xform.h>			/* XXX for M_XDATA */
+#include <vm/uma.h>
+#include <opencrypto/cryptodev.h>
+#include <opencrypto/xform.h>			/* XXX for M_XDATA */
 
-#include <freebsd/sys/kobj.h>
-#include <freebsd/sys/bus.h>
-#include <freebsd/local/cryptodev_if.h>
+#include <sys/kobj.h>
+#include <sys/bus.h>
+#include <rtems/bsd/local/cryptodev_if.h>
 
 #if defined(__i386__) || defined(__amd64__)
-#include <freebsd/machine/pcb.h>
+#include <machine/pcb.h>
 #endif
 
 SDT_PROVIDER_DEFINE(opencrypto);
diff --git a/freebsd/sys/opencrypto/cryptodev.c b/freebsd/sys/opencrypto/cryptodev.c
index fed4f5df..71cc5b23 100644
--- a/freebsd/sys/opencrypto/cryptodev.c
+++ b/freebsd/sys/opencrypto/cryptodev.c
@@ -1,4 +1,4 @@
-#include <freebsd/machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-config.h>
 
 /*	$OpenBSD: cryptodev.c,v 1.52 2002/06/19 07:22:46 deraadt Exp $	*/
 
@@ -34,35 +34,35 @@
  * Materiel Command, USAF, under agreement number F30602-01-2-0537.
  */
 
-#include <freebsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <freebsd/local/opt_compat.h>
-
-#include <freebsd/sys/param.h>
-#include <freebsd/sys/systm.h>
-#include <freebsd/sys/malloc.h>
-#include <freebsd/sys/mbuf.h>
-#include <freebsd/sys/lock.h>
-#include <freebsd/sys/mutex.h>
-#include <freebsd/sys/sysctl.h>
-#include <freebsd/sys/file.h>
-#include <freebsd/sys/filedesc.h>
-#include <freebsd/sys/errno.h>
-#include <freebsd/sys/uio.h>
-#include <freebsd/sys/random.h>
-#include <freebsd/sys/conf.h>
-#include <freebsd/sys/kernel.h>
-#include <freebsd/sys/module.h>
-#include <freebsd/sys/fcntl.h>
-#include <freebsd/sys/bus.h>
-
-#include <freebsd/opencrypto/cryptodev.h>
-#include <freebsd/opencrypto/xform.h>
+#include <rtems/bsd/local/opt_compat.h>
+
+#include <rtems/bsd/sys/param.h>
+#include <sys/systm.h>
+#include <sys/malloc.h>
+#include <sys/mbuf.h>
+#include <rtems/bsd/sys/lock.h>
+#include <sys/mutex.h>
+#include <sys/sysctl.h>
+#include <sys/file.h>
+#include <sys/filedesc.h>
+#include <rtems/bsd/sys/errno.h>
+#include <sys/uio.h>
+#include <sys/random.h>
+#include <sys/conf.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+#include <sys/fcntl.h>
+#include <sys/bus.h>
+
+#include <opencrypto/cryptodev.h>
+#include <opencrypto/xform.h>
 
 #ifdef COMPAT_FREEBSD32
-#include <freebsd/sys/mount.h>
-#include <freebsd/compat/freebsd32/freebsd32.h>
+#include <sys/mount.h>
+#include <compat/freebsd32/freebsd32.h>
 
 struct session_op32 {
 	u_int32_t	cipher;
diff --git a/freebsd/sys/opencrypto/cryptodev.h b/freebsd/sys/opencrypto/cryptodev.h
index 2ca71802..e2995221 100644
--- a/freebsd/sys/opencrypto/cryptodev.h
+++ b/freebsd/sys/opencrypto/cryptodev.h
@@ -53,10 +53,10 @@
  *
  */
 
-#ifndef _CRYPTO_CRYPTO_HH_
-#define _CRYPTO_CRYPTO_HH_
+#ifndef _CRYPTO_CRYPTO_H_
+#define _CRYPTO_CRYPTO_H_
 
-#include <freebsd/sys/ioccom.h>
+#include <sys/ioccom.h>
 
 /* Some initial values */
 #define CRYPTO_DRIVERS_INITIAL	4
@@ -429,4 +429,4 @@ extern	void crypto_copydata(int flags, caddr_t buf, int off, int size,
 extern	int crypto_apply(int flags, caddr_t buf, int off, int len,
 	    int (*f)(void *, void *, u_int), void *arg);
 #endif /* _KERNEL */
-#endif /* _CRYPTO_CRYPTO_HH_ */
+#endif /* _CRYPTO_CRYPTO_H_ */
diff --git a/freebsd/sys/opencrypto/cryptosoft.c b/freebsd/sys/opencrypto/cryptosoft.c
index 69b2d656..cee58527 100644
--- a/freebsd/sys/opencrypto/cryptosoft.c
+++ b/freebsd/sys/opencrypto/cryptosoft.c
@@ -1,4 +1,4 @@
-#include <freebsd/machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-config.h>
 
 /*	$OpenBSD: cryptosoft.c,v 1.35 2002/04/26 08:43:50 deraadt Exp $	*/
 
@@ -24,34 +24,34 @@
  * PURPOSE.
  */
 
-#include <freebsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <freebsd/sys/param.h>
-#include <freebsd/sys/systm.h>
-#include <freebsd/sys/malloc.h>
-#include <freebsd/sys/mbuf.h>
-#include <freebsd/sys/module.h>
-#include <freebsd/sys/sysctl.h>
-#include <freebsd/sys/errno.h>
-#include <freebsd/sys/random.h>
-#include <freebsd/sys/kernel.h>
-#include <freebsd/sys/uio.h>
-
-#include <freebsd/crypto/blowfish/blowfish.h>
-#include <freebsd/crypto/sha1.h>
-#include <freebsd/opencrypto/rmd160.h>
-#include <freebsd/opencrypto/cast.h>
-#include <freebsd/opencrypto/skipjack.h>
-#include <freebsd/sys/md5.h>
-
-#include <freebsd/opencrypto/cryptodev.h>
-#include <freebsd/opencrypto/cryptosoft.h>
-#include <freebsd/opencrypto/xform.h>
-
-#include <freebsd/sys/kobj.h>
-#include <freebsd/sys/bus.h>
-#include <freebsd/local/cryptodev_if.h>
+#include <rtems/bsd/sys/param.h>
+#include <sys/systm.h>
+#include <sys/malloc.h>
+#include <sys/mbuf.h>
+#include <sys/module.h>
+#include <sys/sysctl.h>
+#include <rtems/bsd/sys/errno.h>
+#include <sys/random.h>
+#include <sys/kernel.h>
+#include <sys/uio.h>
+
+#include <crypto/blowfish/blowfish.h>
+#include <crypto/sha1.h>
+#include <opencrypto/rmd160.h>
+#include <opencrypto/cast.h>
+#include <opencrypto/skipjack.h>
+#include <sys/md5.h>
+
+#include <opencrypto/cryptodev.h>
+#include <opencrypto/cryptosoft.h>
+#include <opencrypto/xform.h>
+
+#include <sys/kobj.h>
+#include <sys/bus.h>
+#include <rtems/bsd/local/cryptodev_if.h>
 
 static	int32_t swcr_id;
 static	struct swcr_data **swcr_sessions = NULL;
diff --git a/freebsd/sys/opencrypto/cryptosoft.h b/freebsd/sys/opencrypto/cryptosoft.h
index 363fdbba..af78dc18 100644
--- a/freebsd/sys/opencrypto/cryptosoft.h
+++ b/freebsd/sys/opencrypto/cryptosoft.h
@@ -22,8 +22,8 @@
  * PURPOSE.
  */
 
-#ifndef _CRYPTO_CRYPTOSOFT_HH_
-#define _CRYPTO_CRYPTOSOFT_HH_
+#ifndef _CRYPTO_CRYPTOSOFT_H_
+#define _CRYPTO_CRYPTOSOFT_H_
 
 /* Software session entry */
 struct swcr_data {
@@ -64,4 +64,4 @@ extern u_int8_t hmac_ipad_buffer[];
 extern u_int8_t hmac_opad_buffer[];
 #endif /* _KERNEL */
 
-#endif /* _CRYPTO_CRYPTO_HH_ */
+#endif /* _CRYPTO_CRYPTO_H_ */
diff --git a/freebsd/sys/opencrypto/deflate.c b/freebsd/sys/opencrypto/deflate.c
index ddf8239e..5806d33e 100644
--- a/freebsd/sys/opencrypto/deflate.c
+++ b/freebsd/sys/opencrypto/deflate.c
@@ -1,4 +1,4 @@
-#include <freebsd/machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-config.h>
 
 /* $OpenBSD: deflate.c,v 1.3 2001/08/20 02:45:22 hugh Exp $ */
 
@@ -34,22 +34,22 @@
  * functions using the zlib library (see net/zlib.{c,h})
  */
 
-#include <freebsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <freebsd/local/opt_kdtrace.h>
+#include <rtems/bsd/local/opt_kdtrace.h>
 
-#include <freebsd/sys/types.h>
-#include <freebsd/sys/param.h>
-#include <freebsd/sys/malloc.h>
-#include <freebsd/sys/param.h>
-#include <freebsd/sys/kernel.h>
-#include <freebsd/sys/sdt.h>
-#include <freebsd/sys/systm.h>
-#include <freebsd/net/zlib.h>
+#include <rtems/bsd/sys/types.h>
+#include <rtems/bsd/sys/param.h>
+#include <sys/malloc.h>
+#include <rtems/bsd/sys/param.h>
+#include <sys/kernel.h>
+#include <sys/sdt.h>
+#include <sys/systm.h>
+#include <net/zlib.h>
 
-#include <freebsd/opencrypto/cryptodev.h>
-#include <freebsd/opencrypto/deflate.h>
+#include <opencrypto/cryptodev.h>
+#include <opencrypto/deflate.h>
 
 SDT_PROVIDER_DECLARE(opencrypto);
 SDT_PROBE_DEFINE2(opencrypto, deflate, deflate_global, entry,
diff --git a/freebsd/sys/opencrypto/deflate.h b/freebsd/sys/opencrypto/deflate.h
index 732620b5..dcf7a844 100644
--- a/freebsd/sys/opencrypto/deflate.h
+++ b/freebsd/sys/opencrypto/deflate.h
@@ -33,10 +33,10 @@
  * algorithm used in /sys/crypto
  */
 
-#ifndef _CRYPTO_DEFLATE_HH_
-#define _CRYPTO_DEFLATE_HH_
+#ifndef _CRYPTO_DEFLATE_H_
+#define _CRYPTO_DEFLATE_H_
 
-#include <freebsd/net/zlib.h>
+#include <net/zlib.h>
 
 #define Z_METHOD	8
 #define Z_MEMLEVEL	8
@@ -57,4 +57,4 @@ struct deflate_buf {
 	uint8_t data[];
 };
 
-#endif /* _CRYPTO_DEFLATE_HH_ */
+#endif /* _CRYPTO_DEFLATE_H_ */
diff --git a/freebsd/sys/opencrypto/rmd160.c b/freebsd/sys/opencrypto/rmd160.c
index 99f987ee..92b5c2e7 100644
--- a/freebsd/sys/opencrypto/rmd160.c
+++ b/freebsd/sys/opencrypto/rmd160.c
@@ -1,4 +1,4 @@
-#include <freebsd/machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-config.h>
 
 /*	$OpenBSD: rmd160.c,v 1.3 2001/09/26 21:40:13 markus Exp $	*/
 /*-
@@ -31,13 +31,13 @@
  * ftp://ftp.rsasecurity.com/pub/cryptobytes/crypto3n2.pdf
  */
 
-#include <freebsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <freebsd/sys/param.h>
-#include <freebsd/sys/systm.h>
-#include <freebsd/sys/endian.h>
-#include <freebsd/opencrypto/rmd160.h>
+#include <rtems/bsd/sys/param.h>
+#include <sys/systm.h>
+#include <sys/endian.h>
+#include <opencrypto/rmd160.h>
 
 #define PUT_64BIT_LE(cp, value) do { \
 	(cp)[7] = (value) >> 56; \
diff --git a/freebsd/sys/opencrypto/skipjack.c b/freebsd/sys/opencrypto/skipjack.c
index ae06dc1b..08edc4c2 100644
--- a/freebsd/sys/opencrypto/skipjack.c
+++ b/freebsd/sys/opencrypto/skipjack.c
@@ -1,4 +1,4 @@
-#include <freebsd/machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-config.h>
 
 /*	$OpenBSD: skipjack.c,v 1.3 2001/05/05 00:31:34 angelos Exp $	*/
 /*-
@@ -14,12 +14,12 @@
  * 29 May 1998
 */
 
-#include <freebsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <freebsd/sys/param.h>
+#include <rtems/bsd/sys/param.h>
 
-#include <freebsd/opencrypto/skipjack.h>
+#include <opencrypto/skipjack.h>
 
 static const u_int8_t ftable[0x100] =
 { 
diff --git a/freebsd/sys/opencrypto/xform.c b/freebsd/sys/opencrypto/xform.c
index e54a6740..7fceb4ec 100644
--- a/freebsd/sys/opencrypto/xform.c
+++ b/freebsd/sys/opencrypto/xform.c
@@ -1,4 +1,4 @@
-#include <freebsd/machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-config.h>
 
 /*	$OpenBSD: xform.c,v 1.16 2001/08/28 12:20:43 ben Exp $	*/
 /*-
@@ -38,33 +38,33 @@
  * PURPOSE.
  */
 
-#include <freebsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <freebsd/sys/param.h>
-#include <freebsd/sys/systm.h>
-#include <freebsd/sys/malloc.h>
-#include <freebsd/sys/sysctl.h>
-#include <freebsd/sys/errno.h>
-#include <freebsd/sys/time.h>
-#include <freebsd/sys/kernel.h>
-#include <freebsd/machine/cpu.h>
-
-#include <freebsd/crypto/blowfish/blowfish.h>
-#include <freebsd/crypto/des/des.h>
-#include <freebsd/crypto/rijndael/rijndael.h>
-#include <freebsd/crypto/camellia/camellia.h>
-#include <freebsd/crypto/sha1.h>
-
-#include <freebsd/opencrypto/cast.h>
-#include <freebsd/opencrypto/deflate.h>
-#include <freebsd/opencrypto/rmd160.h>
-#include <freebsd/opencrypto/skipjack.h>
-
-#include <freebsd/sys/md5.h>
-
-#include <freebsd/opencrypto/cryptodev.h>
-#include <freebsd/opencrypto/xform.h>
+#include <rtems/bsd/sys/param.h>
+#include <sys/systm.h>
+#include <sys/malloc.h>
+#include <sys/sysctl.h>
+#include <rtems/bsd/sys/errno.h>
+#include <rtems/bsd/sys/time.h>
+#include <sys/kernel.h>
+#include <machine/cpu.h>
+
+#include <crypto/blowfish/blowfish.h>
+#include <crypto/des/des.h>
+#include <crypto/rijndael/rijndael.h>
+#include <crypto/camellia/camellia.h>
+#include <crypto/sha1.h>
+
+#include <opencrypto/cast.h>
+#include <opencrypto/deflate.h>
+#include <opencrypto/rmd160.h>
+#include <opencrypto/skipjack.h>
+
+#include <sys/md5.h>
+
+#include <opencrypto/cryptodev.h>
+#include <opencrypto/xform.h>
 
 static	int null_setkey(u_int8_t **, u_int8_t *, int);
 static	int des1_setkey(u_int8_t **, u_int8_t *, int);
diff --git a/freebsd/sys/opencrypto/xform.h b/freebsd/sys/opencrypto/xform.h
index 7c70ca90..0a7f981d 100644
--- a/freebsd/sys/opencrypto/xform.h
+++ b/freebsd/sys/opencrypto/xform.h
@@ -22,13 +22,13 @@
  * PURPOSE.
  */
 
-#ifndef _CRYPTO_XFORM_HH_
-#define _CRYPTO_XFORM_HH_
+#ifndef _CRYPTO_XFORM_H_
+#define _CRYPTO_XFORM_H_
 
-#include <freebsd/sys/md5.h>
-#include <freebsd/crypto/sha1.h>
-#include <freebsd/crypto/sha2/sha2.h>
-#include <freebsd/opencrypto/rmd160.h>
+#include <sys/md5.h>
+#include <crypto/sha1.h>
+#include <crypto/sha2/sha2.h>
+#include <opencrypto/rmd160.h>
 
 /* Declarations */
 struct auth_hash {
@@ -98,7 +98,7 @@ extern struct auth_hash auth_hash_hmac_sha2_512;
 extern struct comp_algo comp_algo_deflate;
 
 #ifdef _KERNEL
-#include <freebsd/sys/malloc.h>
+#include <sys/malloc.h>
 MALLOC_DECLARE(M_XDATA);
 #endif
-#endif /* _CRYPTO_XFORM_HH_ */
+#endif /* _CRYPTO_XFORM_H_ */