diff options
| author | Warner Losh <imp@FreeBSD.org> | 2017-12-02 00:07:09 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2017-12-02 00:07:09 +0000 |
| commit | 3a7d67e741a28a341f053efb9f18b87835eeb902 (patch) | |
| tree | 9fcc0492ae3490e0a2e1007d712a490ad847164e | |
| parent | b65d7763288e39229a722a764ddd5b3f3302794e (diff) | |
Notes
| -rw-r--r-- | stand/geli/Makefile | 1 | ||||
| -rw-r--r-- | sys/geom/eli/pkcs5v2.c | 4 | ||||
| -rw-r--r-- | sys/opencrypto/xform_userland.h | 2 | ||||
| -rw-r--r-- | sys/sys/errno.h | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/stand/geli/Makefile b/stand/geli/Makefile index c7904311c08d9..33f81f5322cf7 100644 --- a/stand/geli/Makefile +++ b/stand/geli/Makefile @@ -45,7 +45,6 @@ SRCS+= rijndael-alg-fst.c rijndael-api-fst.c rijndael-api.c # local GELI Implementation .PATH: ${SYSDIR}/geom/eli -CFLAGS+= -D_STAND SRCS+= geliboot_crypto.c g_eli_hmac.c g_eli_key.c g_eli_key_cache.c pkcs5v2.c # aes diff --git a/sys/geom/eli/pkcs5v2.c b/sys/geom/eli/pkcs5v2.c index 8851345c1290d..0006fe0de1f14 100644 --- a/sys/geom/eli/pkcs5v2.c +++ b/sys/geom/eli/pkcs5v2.c @@ -89,7 +89,7 @@ pkcs5v2_genkey(uint8_t *key, unsigned keylen, const uint8_t *salt, } #ifndef _KERNEL -#ifndef _STAND +#ifndef _STANDALONE /* * Return the number of microseconds needed for 'interations' iterations. */ @@ -127,5 +127,5 @@ pkcs5v2_calculate(int usecs) } return (((intmax_t)iterations * (intmax_t)usecs) / v); } -#endif /* !_STAND */ +#endif /* !_STANDALONE */ #endif /* !_KERNEL */ diff --git a/sys/opencrypto/xform_userland.h b/sys/opencrypto/xform_userland.h index 04266dc8cd8ec..ef4845aa61741 100644 --- a/sys/opencrypto/xform_userland.h +++ b/sys/opencrypto/xform_userland.h @@ -34,7 +34,7 @@ #define KMALLOC(size, type, flags) malloc(size, type, flags) #define KFREE(ptr, type) free(ptr, type) #else /* not _KERNEL */ -#ifdef _STAND +#ifdef _STANDALONE #include <stand.h> #else /* !_STAND */ #include <stdlib.h> diff --git a/sys/sys/errno.h b/sys/sys/errno.h index 122e1b7a180f3..ad140ab147789 100644 --- a/sys/sys/errno.h +++ b/sys/sys/errno.h @@ -40,7 +40,7 @@ #ifndef _SYS_ERRNO_H_ #define _SYS_ERRNO_H_ -#if !defined(_KERNEL) && !defined(_STAND) +#if !defined(_KERNEL) && !defined(_STANDALONE) #include <sys/cdefs.h> __BEGIN_DECLS int * __error(void); |