From owner-svn-src-head@freebsd.org  Wed May  9 07:46:58 2018
Return-Path: <owner-svn-src-head@freebsd.org>
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 9413BFADC31;
 Wed,  9 May 2018 07:46:58 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 3B999789FE;
 Wed,  9 May 2018 07:46:58 +0000 (UTC)
 (envelope-from eadler@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 17CD768F3;
 Wed,  9 May 2018 07:46:58 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w497kvY4078467;
 Wed, 9 May 2018 07:46:57 GMT (envelope-from eadler@FreeBSD.org)
Received: (from eadler@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w497kvjZ078465;
 Wed, 9 May 2018 07:46:57 GMT (envelope-from eadler@FreeBSD.org)
Message-Id: <201805090746.w497kvjZ078465@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: eadler set sender to
 eadler@FreeBSD.org using -f
From: Eitan Adler <eadler@FreeBSD.org>
Date: Wed, 9 May 2018 07:46:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r333395 - head/usr.bin/enigma
X-SVN-Group: head
X-SVN-Commit-Author: eadler
X-SVN-Commit-Paths: head/usr.bin/enigma
X-SVN-Commit-Revision: 333395
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
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 09 May 2018 07:46:58 -0000

Author: eadler
Date: Wed May  9 07:46:57 2018
New Revision: 333395
URL: https://svnweb.freebsd.org/changeset/base/333395

Log:
  enigma(1) Remove reference to PGP; modernize a bit
  
  - the port was removed 2017-06-07 in r442847
  - gnupg1 is the older version of gpg with legacy PGP support
  - remove unused macro
  - remove now-false statement about export restrictions

Modified:
  head/usr.bin/enigma/enigma.1
  head/usr.bin/enigma/enigma.c

Modified: head/usr.bin/enigma/enigma.1
==============================================================================
--- head/usr.bin/enigma/enigma.1	Wed May  9 04:09:49 2018	(r333394)
+++ head/usr.bin/enigma/enigma.1	Wed May  9 07:46:57 2018	(r333395)
@@ -6,7 +6,7 @@
 .\"
 .\" $FreeBSD$
 .\" "
-.Dd February 5, 2017
+.Dd May 8, 2018
 .Dt ENIGMA 1
 .Os
 .Sh NAME
@@ -85,13 +85,8 @@ with other operating systems that also provide an impl
 there).
 For real encryption, refer to
 .Xr openssl 1 ,
-.Xr pgp 1 Pq Pa ports/security/pgp ,
 or
-.Xr gpg 1 Pq Pa ports/security/gnupg .
-However, restrictions for exporting,
-importing or using such tools might exist in some countries, so those
-stronger programs are not being shipped as part of the operating
-system by default.
+.Xr gpg 1 Pq Pa security/gnupg1 .
 .Sh ENVIRONMENT
 .Bl -tag -offset indent -width ".Ev CrYpTkEy"
 .It Ev CrYpTkEy
@@ -116,7 +111,6 @@ This displays the previously created file on the termi
 .Sh SEE ALSO
 .Xr gpg 1 ,
 .Xr openssl 1 ,
-.Xr pgp 1 ,
 .Xr ps 1 ,
 .Xr getpass 3
 .Sh HISTORY

Modified: head/usr.bin/enigma/enigma.c
==============================================================================
--- head/usr.bin/enigma/enigma.c	Wed May  9 04:09:49 2018	(r333394)
+++ head/usr.bin/enigma/enigma.c	Wed May  9 07:46:57 2018	(r333395)
@@ -22,7 +22,6 @@ __FBSDID("$FreeBSD$");
 
 #define MINUSKVAR "CrYpTkEy"
 
-#define ECHO 010
 #define ROTORSZ 256
 #define MASK 0377
 static char	t1[ROTORSZ];