svn commit: r326443 - in head: stand/geli sys/geom/eli sys/opencrypto sys/sys

[Warner Losh]

Author: imp
Date: Sat Dec  2 00:07:09 2017
New Revision: 326443
URL: https://svnweb.freebsd.org/changeset/base/326443

Log:
  We don't need both _STAND and _STANDALONE. There's more places that
  use _STANDALONE, so change the former to the latter.
  
  Sponsored by: Netflix

Modified:
  head/stand/geli/Makefile
  head/sys/geom/eli/pkcs5v2.c
  head/sys/opencrypto/xform_userland.h
  head/sys/sys/errno.h

Modified: head/stand/geli/Makefile
==============================================================================
--- head/stand/geli/Makefile	Sat Dec  2 00:07:04 2017	(r326442)
+++ head/stand/geli/Makefile	Sat Dec  2 00:07:09 2017	(r326443)
@@ -45,7 +45,6 @@ SRCS+=		rijndael-alg-fst.c rijndael-api-fst.c rijndael
 
 # 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

Modified: head/sys/geom/eli/pkcs5v2.c
==============================================================================
--- head/sys/geom/eli/pkcs5v2.c	Sat Dec  2 00:07:04 2017	(r326442)
+++ head/sys/geom/eli/pkcs5v2.c	Sat Dec  2 00:07:09 2017	(r326443)
@@ -89,7 +89,7 @@ pkcs5v2_genkey(uint8_t *key, unsigned keylen, const ui
 }
 
 #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 */

Modified: head/sys/opencrypto/xform_userland.h
==============================================================================
--- head/sys/opencrypto/xform_userland.h	Sat Dec  2 00:07:04 2017	(r326442)
+++ head/sys/opencrypto/xform_userland.h	Sat Dec  2 00:07:09 2017	(r326443)
@@ -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>

Modified: head/sys/sys/errno.h
==============================================================================
--- head/sys/sys/errno.h	Sat Dec  2 00:07:04 2017	(r326442)
+++ head/sys/sys/errno.h	Sat Dec  2 00:07:09 2017	(r326443)
@@ -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);