From owner-svn-src-head@freebsd.org Wed May 9 20:58:34 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5DD5DFCC25D for ; Wed, 9 May 2018 20:58:34 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: from mail-yb0-x242.google.com (mail-yb0-x242.google.com [IPv6:2607:f8b0:4002:c09::242]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E08836BDED for ; Wed, 9 May 2018 20:58:33 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: by mail-yb0-x242.google.com with SMTP id j143-v6so3710048ybg.2 for ; Wed, 09 May 2018 13:58:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd-org.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=CEmnw2Y7PbaPo1cN3aD2Jn8ZOv43pwNUWluZDcOhIyU=; b=KyqbduokcW5g8j1vvGVcGDUKNrAGL2qQSg7dLfawSIf5GhmF5FMZ49d6kAuIUWx7Q9 B4QTXB/+T73GlruFfqErYdVnmoqzCTlqYfEB16siSKz0gjKl8L3F8WhnGYfVSURq226c DxykdKPQYoT56nn1QUQn6Y25mwch5o8q4E2KenlOxUsi/5gQx3ziGguo0F2VZtVAzTKy bvFGN6RRlqNNoLU0CU3ARwNmP8iIqiVeI956iEO3yCzDUpFNY6NnEeVfGL01qLE9fYBU YRLwXye7kTwmis03dOKp2P4C1JOoaOBKXVjvlVRshcBz7pxsaThFGL7db8vB/ouY/myo R0Yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=CEmnw2Y7PbaPo1cN3aD2Jn8ZOv43pwNUWluZDcOhIyU=; b=kwstcBwQt9i1wsf3c+jgMRTcV+IHAc3euIny1MGWLbGmSij2oONlDqobE/kkGDL1G/ FX3CbBPXsUPKKz10O/qDj7qExYvqJGtYL305QyJStQprse8iL5XsOepIzblO/ZUqGLsY w/3Jj+ehllS+GIaolkXSYVupSuIAodZz64XD9HreBjj7ZYLmolbFasAr7v8BcmfRsr66 FWmddwSchFSnIZtetqy9SbuYK7nwURv8ev5Hz5zRv5x3ws5svI7bRBb2kga9CRiZm0a2 BwIchzVR62dx7pqWBY8R/ePoT/vNlKuDS/m8o/kmZfa5fttT5hJcEzNzDMJ7/EWQ6TQp RH/Q== X-Gm-Message-State: ALKqPweU2UKzbktAPPZQEIL6O1xoWk+8dpqHzPY6/QK/q+nFven8Ddh/ /hgJ03NhA6TF7XGsgafHcw2JV5bMYHtO7J70BGc/9w== X-Google-Smtp-Source: AB8JxZrtGvyC5FpBQIzEBnya3m86BsilK9tSrh4anQsVT7gK/oezqyDAq+bLiVxf7Jh5gxvN9S5vQB75RTNDYi53APA= X-Received: by 2002:a25:dcc4:: with SMTP id y187-v6mr9858416ybe.331.1525899513233; Wed, 09 May 2018 13:58:33 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a25:3894:0:0:0:0:0 with HTTP; Wed, 9 May 2018 13:58:32 -0700 (PDT) In-Reply-To: <201805092051.w49KpGZm079239@repo.freebsd.org> References: <201805092051.w49KpGZm079239@repo.freebsd.org> From: Oliver Pinter Date: Wed, 9 May 2018 22:58:32 +0200 Message-ID: Subject: Re: svn commit: r333438 - head/sbin/geom/class/eli To: Mariusz Zaborski Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.25 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: Wed, 09 May 2018 20:58:34 -0000 On Wednesday, May 9, 2018, Mariusz Zaborski wrote: > Author: oshogbo > Date: Wed May 9 20:51:16 2018 > New Revision: 333438 > URL: https://svnweb.freebsd.org/changeset/base/333438 > > Log: > Change option dry-run from 'n' to 'C' in geli attach command. > > 'n' is used in other commands to define the key index. > We should be consistent with that. > 'C' option is used by patch(1) to perform dryrun so lets use that. > > Reviewed by: allanjude > Differential Revision: https://reviews.freebsd.org/D15308 Relnotes: yes > > Modified: > head/sbin/geom/class/eli/geli.8 > head/sbin/geom/class/eli/geom_eli.c > > Modified: head/sbin/geom/class/eli/geli.8 > ============================================================ > ================== > --- head/sbin/geom/class/eli/geli.8 Wed May 9 20:49:50 2018 > (r333437) > +++ head/sbin/geom/class/eli/geli.8 Wed May 9 20:51:16 2018 > (r333438) > @@ -24,7 +24,7 @@ > .\" > .\" $FreeBSD$ > .\" > -.Dd April 10, 2018 > +.Dd May 9, 2018 > .Dt GELI 8 > .Os > .Sh NAME > @@ -67,7 +67,7 @@ utility: > .Cm init > .Nm > .Cm attach > -.Op Fl dnprv > +.Op Fl Cdprv > .Op Fl j Ar passfile > .Op Fl k Ar keyfile > .Ar prov > @@ -393,6 +393,9 @@ suffix. > .Pp > Additional options include: > .Bl -tag -width ".Fl j Ar passfile" > +.It Fl C > +Do a dry-run decryption. > +This is useful to verify passphrase and keyfile without decrypting the > device. > .It Fl d > If specified, a decrypted provider will be detached automatically on last > close. > This can help with scarce memory so the user does not have to remember to > detach the > @@ -420,9 +423,6 @@ For more information see the description of the > option for the > .Cm init > subcommand. > -.It Fl n > -Do a dry-run decryption. > -This is useful to verify passphrase and keyfile without decrypting the > device. > .It Fl p > Do not use a passphrase as a component of the User Key. > Cannot be combined with the > > Modified: head/sbin/geom/class/eli/geom_eli.c > ============================================================ > ================== > --- head/sbin/geom/class/eli/geom_eli.c Wed May 9 20:49:50 2018 > (r333437) > +++ head/sbin/geom/class/eli/geom_eli.c Wed May 9 20:51:16 2018 > (r333438) > @@ -86,7 +86,7 @@ static int eli_backup_create(struct gctl_req *req, con > * > * init [-bdgPTv] [-a aalgo] [-B backupfile] [-e ealgo] [-i iterations] > [-l keylen] [-J newpassfile] [-K newkeyfile] [-s sectorsize] [-V version] > prov > * label - alias for 'init' > - * attach [-dprv] [-j passfile] [-k keyfile] prov > + * attach [-Cdprv] [-j passfile] [-k keyfile] prov > * detach [-fl] prov ... > * stop - alias for 'detach' > * onetime [-d] [-a aalgo] [-e ealgo] [-l keylen] prov > @@ -145,15 +145,15 @@ struct g_command class_commands[] = { > }, > { "attach", G_FLAG_VERBOSE | G_FLAG_LOADKLD, eli_main, > { > + { 'C', "dryrun", NULL, G_TYPE_BOOL }, > { 'd', "detach", NULL, G_TYPE_BOOL }, > { 'j', "passfile", G_VAL_OPTIONAL, G_TYPE_STRING | > G_TYPE_MULTI }, > { 'k', "keyfile", G_VAL_OPTIONAL, G_TYPE_STRING | > G_TYPE_MULTI }, > - { 'n', "dryrun", NULL, G_TYPE_BOOL }, > { 'p', "nopassphrase", NULL, G_TYPE_BOOL }, > { 'r', "readonly", NULL, G_TYPE_BOOL }, > G_OPT_SENTINEL > }, > - "[-dnprv] [-j passfile] [-k keyfile] prov" > + "[-Cdprv] [-j passfile] [-k keyfile] prov" > }, > { "detach", 0, NULL, > { > _______________________________________________ > svn-src-head@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org" >