diff options
| author | gjb <gjb@FreeBSD.org> | 2015-07-07 20:36:48 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2015-07-07 20:36:48 +0000 |
| commit | 82385ff48486e123bf3fa1268e68a2d8f3e60b61 (patch) | |
| tree | 85361cc5f410ae96991d34211e6dab63ce8abd63 /sys/geom | |
| parent | 4b4ce39bb7a197a48d25e0fc4b1c3445277f2f60 (diff) | |
| download | FreeBSD-src-82385ff48486e123bf3fa1268e68a2d8f3e60b61.zip FreeBSD-src-82385ff48486e123bf3fa1268e68a2d8f3e60b61.tar.gz | |
Revert r285249, pending further investigation on how the build
broke.
Approved by: re (implicit)
Pointyhat: gjb (self)
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'sys/geom')
| -rw-r--r-- | sys/geom/eli/g_eli.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/sys/geom/eli/g_eli.c b/sys/geom/eli/g_eli.c index 2e5810d..01c3b53 100644 --- a/sys/geom/eli/g_eli.c +++ b/sys/geom/eli/g_eli.c @@ -99,25 +99,6 @@ SYSCTL_UINT(_kern_geom_eli, OID_AUTO, boot_passcache, CTLFLAG_RD, &g_eli_boot_passcache, 0, "Passphrases are cached during boot process for possible reuse"); static void -fetch_loader_passphrase(void * dummy) -{ - char * env_passphrase; - - KASSERT(dynamic_kenv, ("need dynamic kenv")); - - if ((env_passphrase = kern_getenv("kern.geom.eli.passphrase")) != NULL) { - /* Extract passphrase from the environment. */ - strlcpy(cached_passphrase, env_passphrase, - sizeof(cached_passphrase)); - freeenv(env_passphrase); - - /* Wipe the passphrase from the environment. */ - kern_unsetenv("kern.geom.eli.passphrase"); - } -} -SYSINIT(geli_fetch_loader_passphrase, SI_SUB_KMEM + 1, SI_ORDER_ANY, - fetch_loader_passphrase, NULL); -static void zero_boot_passcache(void * dummy) { |
