From 0f652f57ccae638c06f298960b07cc1c616d64e3 Mon Sep 17 00:00:00 2001
From: Todd McDaniel <lazymutt@mac.com>
Date: Tue, 9 Apr 2019 16:01:51 -0600
Subject: [PATCH] 2.1.5

Corrects issue reporting no existing firmware password (#6), corrects poorly chosen version numbers.
---
 LICENSE                                                   | 2 +-
 README.md                                                 | 5 +++--
 ..._wrapped_remotely_set_firmpwarepassword_scp_keylist.sh | 4 ++--
 .../remotely_set_firmpwarepassword_scp_keylist.py         | 4 ++--
 firmware_password_manager.py                              | 8 +++++---
 setup.py                                                  | 4 ++--
 6 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/LICENSE b/LICENSE
index 8f92474..67a13f2 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 University of Utah, Marriott Library, Apple Support
+Copyright (c) 2019 University of Utah, Marriott Library, Client Platform Services
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index 4e36fa2..2634a53 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Firmware Password Manager 2.1.4
+# Firmware Password Manager 2.1.5
 
 A Python script to help Macintosh administrators manage the firmware passwords of their computers.
 
@@ -259,7 +259,8 @@ Thank you to macmule for <http://macmule.com/2014/05/11/ea-check-efi-password-st
 
 Date | Version | Notes
 -------|-----------|-------
-2017.10.23 | 2.1.4 | using rm -P for secure delete, added additional alerting, additional pylint cleanup.
+2019.10.23 | 2.1.5 | Corrected issue reporting no existing firmware password.
+2017.10.23 | 2.1.4 | Using rm -P for secure delete, added additional alerting, additional pylint cleanup.
 2016.03.16 | 2.1.2 | Cleaned up argparse, removed obsolete flag logic.
 2016.03.16 | 2.1.1 | Slack identifier flag, logic clarifications.
 2016.03.07 | 2.1.0 | Obfuscation, reboot flag, bug fixes
diff --git a/example scripts/ard_wrapped_remotely_set_firmpwarepassword_scp_keylist.sh b/example scripts/ard_wrapped_remotely_set_firmpwarepassword_scp_keylist.sh
index bee0c23..10ee6b2 100755
--- a/example scripts/ard_wrapped_remotely_set_firmpwarepassword_scp_keylist.sh	
+++ b/example scripts/ard_wrapped_remotely_set_firmpwarepassword_scp_keylist.sh	
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-# Copyright (c) 2016 University of Utah Student Computing Labs. ################
-# All Rights Reserved.
+# Copyright (c) 2019 University of Utah, Marriott Library, #####################
+# Client Platform Services. All Rights Reserved.
 #
 # Permission to use, copy, modify, and distribute this software and
 # its documentation for any purpose and without fee is hereby granted,
diff --git a/example scripts/remotely_set_firmpwarepassword_scp_keylist.py b/example scripts/remotely_set_firmpwarepassword_scp_keylist.py
index a92e8e1..d018d57 100755
--- a/example scripts/remotely_set_firmpwarepassword_scp_keylist.py	
+++ b/example scripts/remotely_set_firmpwarepassword_scp_keylist.py	
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
-# Copyright (c) 2016 University of Utah Student Computing Labs. ################
-# All Rights Reserved.
+# Copyright (c) 2019 University of Utah, Marriott Library, #####################
+# Client Platform Services. All Rights Reserved.
 #
 # Permission to use, copy, modify, and distribute this software and
 # its documentation for any purpose and without fee is hereby granted,
diff --git a/firmware_password_manager.py b/firmware_password_manager.py
index 85c0946..f5e3be2 100755
--- a/firmware_password_manager.py
+++ b/firmware_password_manager.py
@@ -3,8 +3,8 @@
 A Python script to help Macintosh administrators manage the firmware passwords of their computers.
 """
 
-# Copyright (c) 2016 University of Utah Student Computing Labs. ################
-# All Rights Reserved.
+# Copyright (c) 2019 University of Utah, Marriott Library, #####################
+# Client Platform Services. All Rights Reserved.
 #
 # Permission to use, copy, modify, and distribute this software and
 # its documentation for any purpose and without fee is hereby granted,
@@ -39,6 +39,8 @@
 #    2.1.4  2017.10.23      using rm -P for secure delete,
 #                           added additional alerting, additional pylint cleanup. tjm
 #
+#    2.1.5  2019.04.23      Corrected issue reporting no existing firmware password. tjm
+#
 #
 # keyfile format:
 #
@@ -183,7 +185,7 @@ def main():
                         help='Reboots the computer after the script completes successfully.')
     parser.add_argument('-t', '--testmode', action="store_true", default=False,
                         help='Test mode. Verbose logging, will not delete keyfile.')
-    parser.add_argument('-v', '--version', action='version', version='%(prog)s 2.1.4')
+    parser.add_argument('-v', '--version', action='version', version='%(prog)s 2.1.5')
 
     args = parser.parse_args()
 
diff --git a/setup.py b/setup.py
index b6b7466..4a42277 100644
--- a/setup.py
+++ b/setup.py
@@ -2,9 +2,9 @@
 
 setup(
     name='Firmware Password Manager',
-    version='2.1.4',
+    version='2.1.5',
     url='https://github.com/univ-of-utah-marriott-library-apple/firmware_password_manager',
-    author='Todd McDaniel, Marriott Library IT Services',
+    author='Todd McDaniel, Marriott Library Client Platform Services',
     author_email='mlib-its-mac-github@lists.utah.edu',
     description=('A Python script to help Macintosh administrators manage the firmware ',
                  'passwords of their computers.'),