From 8616243660f6a041229034639d78114c281998cf Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Tue, 26 Feb 2019 08:12:18 +0200
Subject: [PATCH] use gpg to generate passwords

---
 README.md |  1 -
 pash      | 40 ++++++----------------------------------
 pash.1    |  6 +-----
 3 files changed, 7 insertions(+), 40 deletions(-)

diff --git a/README.md b/README.md
index 9242726..ea9ec03 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,6 @@ OPTIONS
 
 −c Copy password to clipboard.
 −l Length of generated passwords.
-−n Limit passwords to alphanumeric characters.
 −q Don't print password to stdout.
 -t Print list output as a tree.
 −h Show usage and exit.
diff --git a/pash b/pash
index e4a5414..306bc62 100755
--- a/pash
+++ b/pash
@@ -7,13 +7,14 @@ pw_add() {
 
     case $REPLY in
         [yY])
-            [[ $OSTYPE == linux* ]] &&
-                check_entropy
-
-            pw_gen
+            length=${length:=50}
+            password=$("${gpg[0]}" --armor --gen-random 0 "$length")
+            password=${password:0:length}
         ;;
 
-        *)  read -rsp "Enter password: " password ;;
+        *)
+            read -rsp "Enter password: " password
+        ;;
     esac
 
     [[ $password ]] ||
@@ -60,33 +61,6 @@ pw_list() {
         printf '└%s\b┘\n' "${nest//\//──┴}"
 }
 
-pw_gen() {
-    [[ -r /dev/urandom ]] ||
-        die "/dev/urandom is not readable."
-
-    mapfile -tn "${length:=50}" rand </dev/urandom
-
-    [[ $plain ]] &&
-        glob='[:alnum:]'
-
-    password=${rand[*]//[^${glob:-[:graph:]}]}
-    password=${password:0:$length}
-}
-
-check_entropy() {
-    kernel_path=/proc/sys/kernel/random
-    entropy_cur=$(< "${kernel_path}/entropy_avail")
-    entropy_min=$(< "${kernel_path}/read_wakeup_threshold")
-
-    [[ ${entropy_cur:=0} -lt ${entropy_min:=1} ]] && {
-        printf '%s\n' "warn: Not enough entropy to generate a secure password."
-        yn "warn: Continue anyway?"
-
-        [[ $REPLY != [yY] ]] &&
-            exit 1
-    }
-}
-
 yn() {
     read -rn 1 -p "$1 [y/n]: "
     printf '\n'
@@ -113,7 +87,6 @@ usage: pash [add|del|show|list] [name] [flags]
 
 -c          Copy password to clipboard.
 -l length   Length of generated passwords.
--n          Limit passwords to alphanumeric characters.
 -q          Don't print password to stdout.
 -t          Print list output as a tree.
 -h          Print this message.
@@ -131,7 +104,6 @@ get_args() {
     while getopts ":ncvqtl:" opt; do case $opt in
         c) clipboard=1 ;;
         l) length=${OPTARG//[^0-9]} ;;
-        n) plain=1 ;;
         q) quiet=1 ;;
         t) tree=1 ;;
         v) printf '%s\n' "pash 0.01"; exit ;;
diff --git a/pash.1 b/pash.1
index 90e21e6..682db0b 100644
--- a/pash.1
+++ b/pash.1
@@ -7,7 +7,7 @@ pash \- simple pasword manager
 .B pash
 [\fBadd|del|show|list\fR]
 [name]
-[\fB-cnqthv\fR]
+[\fB-cqthv\fR]
 [\fB-l\fR length]
 
 
@@ -48,10 +48,6 @@ Copy password to clipboard.
 Length of generated passwords.
 .TP
 
-.BR \-n
-Limit passwords to alphanumeric characters.
-.TP
-
 .BR \-q
 Don't print password to stdout.
 .TP