[PC-BSD Commits] r6474 - pcbsd/trunk/build-files/src-patches

[svn at pcbsd.org]

Author: kris
Date: 2010-03-30 11:32:52 -0700 (Tue, 30 Mar 2010)
New Revision: 6474

Modified:
   pcbsd/trunk/build-files/src-patches/sbin-geom-class-eli-geli.8
   pcbsd/trunk/build-files/src-patches/sbin-geom-class-eli-geom_eli.c
Log:

Updated the geli command patch, fixed the "attach" command which may want to use -S as well



Modified: pcbsd/trunk/build-files/src-patches/sbin-geom-class-eli-geli.8
===================================================================
--- pcbsd/trunk/build-files/src-patches/sbin-geom-class-eli-geli.8	2010-03-30 18:14:41 UTC (rev 6473)
+++ pcbsd/trunk/build-files/src-patches/sbin-geom-class-eli-geli.8	2010-03-30 18:32:52 UTC (rev 6474)
@@ -1,5 +1,5 @@
---- sbin/geom/class/eli/geli.8.o	2010-03-24 08:50:57.447541944 -0400
-+++ sbin/geom/class/eli/geli.8	2010-03-11 20:47:47.721908379 -0500
+--- sbin/geom/class/eli/geli.8.o	2010-03-30 14:29:04.529376215 +0000
++++ sbin/geom/class/eli/geli.8	2010-03-30 14:30:11.387890636 +0000
 @@ -51,7 +51,7 @@
  .Pp
  .Nm
@@ -9,6 +9,15 @@
  .Op Fl a Ar aalgo
  .Op Fl B Ar backupfile
  .Op Fl e Ar ealgo
+@@ -65,7 +65,7 @@
+ .Cm init
+ .Nm
+ .Cm attach
+-.Op Fl dprv
++.Op Fl dprvS
+ .Op Fl k Ar keyfile
+ .Ar prov
+ .Nm
 @@ -89,7 +89,7 @@
  .Ar prov ...
  .Nm
@@ -39,7 +48,16 @@
  .El
  .It Cm attach
  Attach the given provider.
-@@ -424,6 +429,11 @@
+@@ -326,6 +331,8 @@
+ .It Fl r
+ Attach read-only provider.
+ It will not be opened for writing.
++.It Fl S
++Reads the new passphrase from standard in, cannot be used in conjunction with '-K -'
+ .El
+ .It Cm detach
+ Detach the given providers, which means remove the devfs entry
+@@ -424,6 +431,11 @@
  Do not use passphrase as the old key component.
  .It Fl P
  Do not use passphrase as the new key component.

Modified: pcbsd/trunk/build-files/src-patches/sbin-geom-class-eli-geom_eli.c
===================================================================
--- pcbsd/trunk/build-files/src-patches/sbin-geom-class-eli-geom_eli.c	2010-03-30 18:14:41 UTC (rev 6473)
+++ pcbsd/trunk/build-files/src-patches/sbin-geom-class-eli-geom_eli.c	2010-03-30 18:32:52 UTC (rev 6474)
@@ -1,5 +1,5 @@
---- sbin/geom/class/eli/geom_eli.c.o	2010-03-24 08:51:15.570834147 -0400
-+++ sbin/geom/class/eli/geom_eli.c	2010-03-11 20:32:33.858090837 -0500
+--- sbin/geom/class/eli/geom_eli.c.o	2010-03-30 14:24:40.318372303 +0000
++++ sbin/geom/class/eli/geom_eli.c	2010-03-30 14:32:17.311798842 +0000
 @@ -83,14 +83,14 @@
  /*
   * Available commands:
@@ -7,7 +7,8 @@
 - * init [-bhPv] [-a aalgo] [-B backupfile] [-e ealgo] [-i iterations] [-l keylen] [-K newkeyfile] prov
 + * init [-bhPSv] [-a aalgo] [-B backupfile] [-e ealgo] [-i iterations] [-l keylen] [-K newkeyfile] prov
   * label - alias for 'init'
-  * attach [-dprv] [-k keyfile] prov
+- * attach [-dprv] [-k keyfile] prov
++ * attach [-dprSv] [-k keyfile] prov
   * detach [-fl] prov ...
   * stop - alias for 'detach'
   * onetime [-d] [-a aalgo] [-e ealgo] [-l keylen] prov
@@ -17,14 +18,18 @@
   * delkey [-afv] [-n keyno] prov
   * kill [-av] [prov ...]
   * backup [-v] prov file
-@@ -110,6 +110,7 @@
+@@ -110,9 +110,10 @@
  		{ 'l', "keylen", &keylen, G_TYPE_NUMBER },
  		{ 'P', "nonewpassphrase", NULL, G_TYPE_BOOL },
  		{ 's', "sectorsize", &sectorsize, G_TYPE_NUMBER },
 +		{ 'S', "readphrasestdin", NULL, G_TYPE_BOOL },
  		G_OPT_SENTINEL
  	    },
- 	    NULL, "[-bPv] [-a aalgo] [-B backupfile] [-e ealgo] [-i iterations] [-l keylen] [-K newkeyfile] [-s sectorsize] prov"
+-	    NULL, "[-bPv] [-a aalgo] [-B backupfile] [-e ealgo] [-i iterations] [-l keylen] [-K newkeyfile] [-s sectorsize] prov"
++	    NULL, "[-bPvS] [-a aalgo] [-B backupfile] [-e ealgo] [-i iterations] [-l keylen] [-K newkeyfile] [-s sectorsize] prov"
+ 	},
+ 	{ "label", G_FLAG_VERBOSE, eli_main,
+ 	    {
 @@ -125,6 +126,7 @@
  		{ 'l', "keylen", &keylen, G_TYPE_NUMBER },
  		{ 'P', "nonewpassphrase", NULL, G_TYPE_BOOL },
@@ -33,7 +38,19 @@
  		G_OPT_SENTINEL
  	    },
  	    NULL, "- an alias for 'init'"
-@@ -182,9 +184,10 @@
+@@ -135,9 +137,10 @@
+ 		{ 'k', "keyfile", keyfile, G_TYPE_STRING },
+ 		{ 'p', "nopassphrase", NULL, G_TYPE_BOOL },
+ 		{ 'r', "readonly", NULL, G_TYPE_BOOL },
++		{ 'S', "readphrasestdin", NULL, G_TYPE_BOOL },
+ 		G_OPT_SENTINEL
+ 	    },
+-	    NULL, "[-dprv] [-k keyfile] prov"
++	    NULL, "[-dprSv] [-k keyfile] prov"
+ 	},
+ 	{ "detach", 0, NULL,
+ 	    {
+@@ -182,9 +185,10 @@
  		{ 'n', "keyno", &keyno, G_TYPE_NUMBER },
  		{ 'p', "nopassphrase", NULL, G_TYPE_BOOL },
  		{ 'P', "nonewpassphrase", NULL, G_TYPE_BOOL },
@@ -45,7 +62,7 @@
  	},
  	{ "delkey", G_FLAG_VERBOSE, eli_main,
  	    {
-@@ -320,11 +323,14 @@
+@@ -320,11 +324,14 @@
  {
  	struct hmac_ctx ctx;
  	const char *str;
@@ -61,7 +78,7 @@
  	g_eli_crypto_hmac_init(&ctx, NULL, 0);
  
  	str = gctl_get_ascii(req, new ? "newkeyfile" : "keyfile");
-@@ -336,9 +342,13 @@
+@@ -336,9 +343,13 @@
  		ssize_t done;
  		int fd;
  
@@ -77,7 +94,7 @@
  			fd = open(str, O_RDONLY);
  			if (fd == -1) {
  				gctl_error(req, "Cannot open keyfile %s: %s.",
-@@ -367,36 +377,71 @@
+@@ -367,36 +378,71 @@
  			return (NULL);
  		}
  		for (;;) {