From owner-svn-src-head@freebsd.org Sat Dec 2 00:07:13 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 63BE6DBB1CE; Sat, 2 Dec 2017 00:07:13 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9EE7377940; Sat, 2 Dec 2017 00:07:11 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vB207AgZ033721; Sat, 2 Dec 2017 00:07:10 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB2079IB033717; Sat, 2 Dec 2017 00:07:09 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201712020007.vB2079IB033717@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sat, 2 Dec 2017 00:07:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r326443 - in head: stand/geli sys/geom/eli sys/opencrypto sys/sys X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head: stand/geli sys/geom/eli sys/opencrypto sys/sys X-SVN-Commit-Revision: 326443 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Dec 2017 00:07:13 -0000 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 #else /* !_STAND */ #include 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 __BEGIN_DECLS int * __error(void);