From ba2f553ef41ec6681c4ab6591fb65af2bbdc85a3 Mon Sep 17 00:00:00 2001
From: Jeremy Dubois <jdubois@evolix.fr>
Date: Thu, 14 Apr 2022 15:01:09 +0200
Subject: [PATCH] Do not use --password and --password-file together

---
 shellpki | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/shellpki b/shellpki
index 09c664b..9fc7c5b 100755
--- a/shellpki
+++ b/shellpki
@@ -417,6 +417,8 @@ create() {
     end_date=""
     days_set=0
     end_date_set=0
+    password_set=0
+    password_file_set=0
 
     # Parse options
     # based on https://gist.github.com/deshion/10d3cb5f88a21671e17a
@@ -451,6 +453,7 @@ create() {
                 ;;
             -p|--password)
                 ask_pass=1
+                password_set=1
                 ;;
             --password-file)
                 # password-file option, with value separated by space
@@ -460,6 +463,7 @@ create() {
                     if [ "$?" -ne 0 ]; then
                         error "Error accessing file \`${2}'"
                     fi
+                    password_file_set=1
                     shift
                 else
                     error "Argument error: \`--password-file' requires a value"
@@ -472,6 +476,7 @@ create() {
                 if [ "$?" -ne 0 ]; then
                     error "Error accessing file \`${1#*=}'"
                 fi
+                password_file_set=1
                 ;;
             --password-file=)
                 # password-file options, without value
@@ -543,6 +548,10 @@ create() {
         error "Argument error: \`--end-date' and \`--days' cannot be used together."
     fi
 
+    if [ "${password_set}" -eq 1 ] && [ "${password_file_set}" -eq 1 ]; then
+        error "Argument error: \`--password' and \`--password-file' cannot be used together."
+    fi
+
     # The name of the certificate
     cn="${1:-}"