Codecleanup, Version bump 1.1.0

Drop AC_CHECK_INCLUDES_DEFAULT
AC_CHECK_INCLUDES_DEFAULT requires autoconf at least version 2.70 Bug: https://github.com/scsitape/stenc/issues/33
2022-04-22 00:47:33 +02:00 · 2022-04-21 22:44:41 +02:00 · 2022-04-21 22:24:51 +02:00 · 2022-04-20 01:00:40 +02:00 · 2022-04-20 00:24:59 +02:00 · 2022-04-20 00:12:52 +02:00
15 changed files with 1762 additions and 1466 deletions
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -0,0 +1,29 @@
+name: C/C++ CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: autoconf
+      run: autoreconf -i
+    - name: configure
+      run: ./configure
+    - name: make
+      run: make
+    - name: make check
+      run: make check
+    - name: make distcheck
+      run: make distcheck
+    - name: make check
+      run: make check
+    - name: make distcheck
+      run: make distcheck
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+# Tempfiles
+*~
+
 # Prerequisites
 *.d

@@ -16,10 +19,6 @@
 *.dylib
 *.dll

-# Fortran module files
-*.mod
-*.smod
-
 # Compiled Static libraries
 *.lai
 *.la
@@ -30,3 +29,41 @@
 *.exe
 *.out
 *.app
+src/stenc
+
+# Generated Makefile
+# (meta build system like autotools,
+# can automatically generate from config.status script
+# (which is called by configure script))
+Makefile
+
+# http://www.gnu.org/software/automake
+
+Makefile.in
+/ar-lib
+/mdate-sh
+/py-compile
+/test-driver
+/ylwrap
+.deps/
+.dirstamp
+
+# http://www.gnu.org/software/autoconf
+
+autom4te.cache
+/autoscan.log
+/autoscan-*.log
+/aclocal.m4
+/compile
+/config.cache
+/config.guess
+/config.h.in
+/config.log
+/config.status
+/config.sub
+/configure
+/configure.scan
+/depcomp
+/install-sh
+/missing
+/stamp-h1
--- a/41
+++ b/41
@@ -1,12 +1,12 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991

- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

-			    Preamble
+                            Preamble

  The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.

  When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.

  The precise terms and conditions for copying, distribution and
 modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
+
+                    GNU GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
    License.  (Exception: if the Program itself is interactive but
    does not normally print such an announcement, your work based on
    the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
  4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.

 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
  8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.

-			    NO WARRANTY
+                            NO WARRANTY

  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.

-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs

  If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 Also add information on how to contact you by electronic and paper mail.

 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:

-    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision version 69, Copyright (C) year name of author
    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.
@@ -336,5 +335,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
--- a/9
+++ b/9
@@ -1,3 +1,12 @@
+2022-04-22 Jonas Stein <news@jonasstein.de>
+* Version upgraded to 1.1.0
+* Code cleanup
+* Use /dev/random to create a key
+
+2020-06-16 Jonas Stein <news@jonasstein.de>
+* Version upgraded to 1.0.8
+* Merged patches to fix make files and provide more error messages
+
 2018-02-13 Jonas Stein <news@jonasstein.de>
 * Merged patches from various sources
 * move from SF to github in cooperation with John Coleman
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,2 +1,2 @@
 SUBDIRS = src man
-EXTRA_DIST = buildconf
+# EXTRA_DIST = buildconf
--- a/README.md
+++ b/README.md
@@ -1,3 +1,6 @@
+[![Total alerts](https://img.shields.io/lgtm/alerts/g/scsitape/stenc.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/scsitape/stenc/alerts/)
+[![Language grade: C/C++](https://img.shields.io/lgtm/grade/cpp/g/scsitape/stenc.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/scsitape/stenc/context:cpp)
+
 Stenc
 -----

@@ -16,6 +19,16 @@ Features
 * AES Encryption
 * Key Descriptor Management

+Get the source code and compile
+-------------------------------
+
+```
+git clone git@github.com:scsitape/stenc.git
+cd stenc/
+autoreconf --install
+./configure
+make
+```

 Linux Packages
 --------------
@@ -35,3 +48,9 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.

+Further reading
+---------------
+
+IBM Tape Library Guide for Open Systems
+ISBN-13: 9780738458342
+http://www.redbooks.ibm.com/abstracts/sg245946.html?Open
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,6 @@
-PACKAGE=stenc
-VERSION=1.0.7
-
-AC_INIT($PACKAGE, $VERSION)
+AC_INIT([stenc],[1.1.0])
 AC_CONFIG_SRCDIR([src/main.cpp])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([foreign])

 AC_CONFIG_HEADERS([config.h])
 AC_CHECK_HEADER([sys/types.h])
@@ -12,7 +9,19 @@ AC_CHECK_HEADER([sys/machine.h])
 AC_PROG_CXX

 # Checks for header files.
-AC_HEADER_STDC
+m4_warn([obsolete],
+[The preprocessor macro `STDC_HEADERS' is obsolete.
+  Except in unusual embedded environments, you can safely include all
+  ISO C90 headers unconditionally.])dnl
+# Autoupdate added the next two lines to ensure that your configure
+# script's behavior did not change.  They are probably safe to remove.
+
+# Disable AC_CHECK_INCLUDES_DEFAULT, because this macro requires autoconf at 
+# least version 2.70 which is not default yet in many distributions.
+# See: https://github.com/scsitape/stenc/issues/33
+# AC_CHECK_INCLUDES_DEFAULT
+AC_PROG_EGREP
+


 AC_MSG_CHECKING(whether to output raw SCSI messages)
@@ -96,5 +105,6 @@ fi
 	  


-AC_OUTPUT(Makefile src/Makefile man/Makefile) 
+AC_CONFIG_FILES([Makefile src/Makefile man/Makefile])
+AC_OUTPUT 

--- a/man/stenc.1
+++ b/man/stenc.1
@@ -27,7 +27,7 @@ Allows you to manage hardware encryption on SSP enabled tape devices (LTO4, LTO5
 .SH OPTIONS 
 .TP
 \fB\-g \fIlength\fR \fB\-k\fR \fB<file to save as>\fR [\fB\-kd\fR \fI<key descriptor(uKAD)>\fR]
-Generates a key file of \fIlength\fR (in bits) containing a random hexadecimal key. After entering this option, you will be required to press random keys followed by the enter key.  This will seed the random number generator so that your key is more secure.  Specify the file to save the key into with the -k option (you will need write permissions to that file location). Lastly you can enter an optional key description using the -kd flag (see \fIKEY DESCRIPTORS\fR). This key file can then be used with the \fB\-k\fR option. You should not generate a key file over an unsecured remote session. Typically, key files should be set to 256 bits (32 hexadecimal bytes), however your device may only support 128 bits.
+Generates a key file of \fIlength\fR (in bits) containing a random hexadecimal key. After entering this option, you will be required to press random keys followed by the enter key.  This will seed the random number generator so that your key is more secure. On systems with \fB/dev/random\fR, the key is automatically generated from the random content read from this file.  Specify the file to save the key into with the -k option (you will need write permissions to that file location). Lastly you can enter an optional key description using the -kd flag (see \fIKEY DESCRIPTORS\fR). This key file can then be used with the \fB\-k\fR option. You should not generate a key file over an unsecured remote session. Typically, key files should be set to 256 bits (32 hexadecimal bytes), however your device may only support 128 bits.

 .TP
 \fB\-f\fR \fIdevice\fR
@@ -116,7 +116,7 @@ Written by \fBJohn Coleman\fR and \fBSamuel Martinez Jr.\fR of SunWest Education
 Report \fBstenc\fR bugs to \fIjcoleman1981@live.com\fR. 

 .SH PROJECT UPDATES
-Visit \fBhttp://sourceforge.net/projects/stenc/\fR for more information.
+Visit \fBhttps://github.com/scsitape/stenc\fR for more information.

 .SH COPYRIGHT
 Copyright 2012 contributing authors. License GPLv2: GNU GPL version 2 <http://gnu.org/licenses/gpl.html>. This is free software: you are free  to  change  and  redistribute it. There is NO WARRANTY, to the extent permitted by law.
--- a/src/.clang-format
+++ b/src/.clang-format
@@ -0,0 +1,118 @@
+---
+Language:        Cpp
+# BasedOnStyle:  LLVM
+AccessModifierOffset: -2
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlines: Right
+AlignOperands:   true
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: MultiLine
+BinPackArguments: true
+BinPackParameters: true
+BraceWrapping:   
+  AfterClass:      false
+  AfterControlStatement: false
+  AfterEnum:       false
+  AfterFunction:   false
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     false
+  AfterUnion:      false
+  AfterExternBlock: false
+  BeforeCatch:     false
+  BeforeElse:      false
+  IndentBraces:    false
+  SplitEmptyFunction: true
+  SplitEmptyRecord: true
+  SplitEmptyNamespace: true
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Attach
+BreakBeforeInheritanceComma: false
+BreakInheritanceList: BeforeColon
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: BeforeColon
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: true
+ColumnLimit:     80
+CommentPragmas:  '^ IWYU pragma:'
+CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+DisableFormat:   false
+ExperimentalAutoDetectBinPacking: false
+FixNamespaceComments: true
+ForEachMacros:   
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+IncludeBlocks:   Preserve
+IncludeCategories: 
+  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
+    Priority:        2
+  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
+    Priority:        3
+  - Regex:           '.*'
+    Priority:        1
+IncludeIsMainRegex: '(Test)?$'
+IndentCaseLabels: false
+IndentPPDirectives: None
+IndentWidth:     2
+IndentWrappedFunctionNames: false
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: true
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBinPackProtocolList: Auto
+ObjCBlockIndentWidth: 2
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakAssignment: 2
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyBreakTemplateDeclaration: 10
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 60
+PointerAlignment: Right
+ReflowComments:  true
+SortIncludes:    true
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard:        Cpp11
+TabWidth:        8
+UseTab:          Never
+...
+
--- a/src/keyinfo.cpp
+++ b/src/keyinfo.cpp
@@ -1,123 +1,122 @@
-#include <config.h>
-#include <iostream>
-#include <string.h>
-#include <string>
-#include <sstream>
 #include "keyinfo.h"
 #include "scsiencrypt.h"
-using namespace std;
+#include <config.h>
+#include <iostream>
+#include <sstream>
+#include <string.h>
+#include <string>

-Keyinfo::Keyinfo(){
-	valid=false;
-	check="";
-	key=NULL;
-	keySize=0;
+Keyinfo::Keyinfo() {
+  valid = false;
+  check = "";
+  key = NULL;
+  keySize = 0;
 }
-void Keyinfo::load(string hexinput){
-	valid=true;
-	if(hexinput.size()<2){
-		valid=false;
-                cout<<"Key input too short!"<<endl;
-                return;
-
-	}
-	//parse for invalid characters
-	for(unsigned int i=0;i<hexinput.size();i++){
-		switch((unsigned char)hexinput.at(i)){
-			case '0': 
-			case '1': 
-			case '2': 
-			case '3': 
-			case '4': 
-			case '5': 
-			case '6': 
-			case '7': 
-			case '8':  
-			case '9': 
-			case 'a': 
-			case 'b': 
-			case 'c': 
-			case 'd': 
-			case 'e': 
-			case 'f': 
-			case 'A': 
-			case 'B': 
-			case 'C': 
-			case 'D': 
-			case 'E': 
-			case 'F': 
-				break;
-			default:
-				cout<<"Invalid character '"<<hexinput.at(i)<<"' found in key!"<<endl;
-				valid=false;
-				return;
-		}	
-	}
-	// delete the key if its already allocated
-	if(key!=NULL)
-		delete key;
-	// check that the input size is divisible by 2
-	if(hexinput.size()%2!=0){
-		valid=false;
-		cout<<"Each hexadecimal byte must consist of 2 digits!"<<endl;
-		return;
-	}
-	//convert the hex input to a char*
-	loadKey(hexinput);
-	//load the check value
-	loadCheck();
-	//check for oversized key
-    	if(keySize==0 || keySize>SSP_KEY_LENGTH){
-		cout<<"Key size cannot exceed "<<(SSP_KEY_LENGTH*8)<<" bits!"<<endl;
-		cout<<"Provided key is "<<(keySize*8)<<" bits in length."<<endl;
-		valid=false;
-		return;
-    	}	
-	cout<<"Provided key length is "<<(keySize*8)<<" bits."<<endl;
-	cout<<"Key checksum is "<<check<<"."<<endl;
-
-
+void Keyinfo::load(std::string hexinput) {
+  valid = true;
+  if (hexinput.size() < 2) {
+    valid = false;
+    std::cout << "Key input too short!\n";
+    return;
+  }
+  // parse for invalid characters
+  for (unsigned int i = 0; i < hexinput.size(); i++) {
+    switch ((unsigned char)hexinput.at(i)) {
+    case '0':
+    case '1':
+    case '2':
+    case '3':
+    case '4':
+    case '5':
+    case '6':
+    case '7':
+    case '8':
+    case '9':
+    case 'a':
+    case 'b':
+    case 'c':
+    case 'd':
+    case 'e':
+    case 'f':
+    case 'A':
+    case 'B':
+    case 'C':
+    case 'D':
+    case 'E':
+    case 'F':
+      break;
+    default:
+      std::cout << "Invalid character '" << hexinput.at(i)
+                << "' found in key!\n";
+      valid = false;
+      return;
+    }
+  }
+  // delete the key if its already allocated
+  if (key != NULL)
+    delete[] key;
+  // check that the input size is divisible by 2
+  if (hexinput.size() % 2 != 0) {
+    valid = false;
+    std::cout << "Each hexadecimal byte must consist of 2 digits!\n";
+    return;
+  }
+  // convert the hex input to a char*
+  loadKey(hexinput);
+  // load the check value
+  loadCheck();
+  // check for oversized key
+  if (keySize == 0 || keySize > SSP_KEY_LENGTH) {
+    std::cout << "Key size cannot exceed " << (SSP_KEY_LENGTH * 8)
+              << " bits!\n";
+    std::cout << "Provided key is " << (keySize * 8) << " bits in length.\n";
+    valid = false;
+    return;
+  }
+  std::cout << "Provided key length is " << (keySize * 8) << " bits.\n";
+  std::cout << "Key checksum is " << check << ".\n";
 }
-void Keyinfo::loadCheck() {   
-	int i;   
-	int chk = 0;    
-	for (i = 0; i<keySize;i++) {     
-		chk += ((int)key[i]) * (i + 1);   
-	}
-	stringstream retval;
-	retval<<hex<<chk;    
-	check=retval.str();
+void Keyinfo::loadCheck() {
+  int i;
+  int chk = 0;
+  for (i = 0; i < keySize; i++) {
+    chk += ((int)key[i]) * (i + 1);
+  }
+  std::stringstream retval;
+  retval << std::hex << chk;
+  check = retval.str();
 }
-Keyinfo::~Keyinfo(){
-	delete key;
-}
-void Keyinfo::loadKey(string str)
-{
-	int length = str.size();
-	// make sure the input string has an even digit numbers
-	if(length%2 == 1)
-	{
-		str = "0" + str;
-		length++;
-	}
+Keyinfo::~Keyinfo() { delete[] key; }
+void Keyinfo::loadKey(std::string str) {
+  int length = str.size();
+  // make sure the input string has an even digit numbers
+  if (length % 2 == 1) {
+    str = "0" + str;
+    length++;
+  }

-	// allocate memory for the output array
-	key = new char[length/2];
-	memset(key,0,(length/2)+1);
-	keySize = length/2;
+  // allocate memory for the output array
+  key = new char[length / 2];
+  memset(key, 0, (length / 2) + 1);
+  keySize = length / 2;

-	stringstream sstr(str);
-	for(int i=0; i < keySize; i++)
-	{
-		char ch1, ch2;
-		sstr >> ch1 >> ch2;
-		int dig1=0, dig2=0;
-		if(isdigit(ch1)) dig1 = ch1 - '0';
-		else if(ch1>='A' && ch1<='F') dig1 = ch1 - 'A' + 10;
-		else if(ch1>='a' && ch1<='f') dig1 = ch1 - 'a' + 10;
-		if(isdigit(ch2)) dig2 = ch2 - '0';
-		else if(ch2>='A' && ch2<='F') dig2 = ch2 - 'A' + 10;
-		else if(ch2>='a' && ch2<='f') dig2 = ch2 - 'a' + 10;
-		key[i] = dig1*16 + dig2;
-	}
+  std::stringstream sstr(str);
+  for (int i = 0; i < keySize; i++) {
+    char ch1, ch2;
+    sstr >> ch1 >> ch2;
+    int dig1 = 0, dig2 = 0;
+    if (isdigit(ch1))
+      dig1 = ch1 - '0';
+    else if (ch1 >= 'A' && ch1 <= 'F')
+      dig1 = ch1 - 'A' + 10;
+    else if (ch1 >= 'a' && ch1 <= 'f')
+      dig1 = ch1 - 'a' + 10;
+    if (isdigit(ch2))
+      dig2 = ch2 - '0';
+    else if (ch2 >= 'A' && ch2 <= 'F')
+      dig2 = ch2 - 'A' + 10;
+    else if (ch2 >= 'a' && ch2 <= 'f')
+      dig2 = ch2 - 'a' + 10;
+    key[i] = dig1 * 16 + dig2;
+  }
 }
--- a/src/keyinfo.h
+++ b/src/keyinfo.h
@@ -2,19 +2,19 @@
 #define KEYINFO_H
 #include <string>

-class Keyinfo{
-	public:
-		char* key;
-	        int keySize;
-		bool valid;
-		std::string check;
-		void load(std::string hexinput);
-		Keyinfo();
-		~Keyinfo();
-	private:
-		void loadKey(std::string str);
-		void loadCheck();
-	
+class Keyinfo {
+public:
+  char *key;
+  int keySize;
+  bool valid;
+  std::string check;
+  void load(std::string hexinput);
+  Keyinfo();
+  ~Keyinfo();
+
+private:
+  void loadKey(std::string str);
+  void loadCheck();
 };

 #endif
--- a/src/main.cpp
+++ b/src/main.cpp
--- a/src/scsiencrypt.cpp
+++ b/src/scsiencrypt.cpp
--- a/src/scsiencrypt.h
+++ b/src/scsiencrypt.h
@@ -15,350 +15,346 @@ GNU General Public License for more details.

 #ifndef _SCSIENC_H
 #define _SCSIENC_H
-#include <string>
 #include <bitset>
+#include <string>
 #include <vector>
-#define SSP_KEY_LENGTH          0X20
-#define SSP_DESCRIPTOR_LENGTH	1024
-#define SSP_PAGE_DES_LENGTH  	24
-#define SSP_PAGE_NBES_LENGTH 	16
-#define SSP_KAD_HEAD_LENGTH    	4
-#define SSP_PAGE_ALLOCATION     8192
-#define SSP_UKAD_LENGTH		0x1e
+#define SSP_KEY_LENGTH 0X20
+#define SSP_DESCRIPTOR_LENGTH 1024
+#define SSP_PAGE_DES_LENGTH 24
+#define SSP_PAGE_NBES_LENGTH 16
+#define SSP_KAD_HEAD_LENGTH 4
+#define SSP_PAGE_ALLOCATION 8192
+#define SSP_UKAD_LENGTH 0x1e

-#define KAD_TYPE_UKAD		0x00
-#define KAD_TYPE_AKAD		0x01
-#define KAD_TYPE_NONCE		0x02
-#define KAD_TYPE_META		0x03
+#define KAD_TYPE_UKAD 0x00
+#define KAD_TYPE_AKAD 0x01
+#define KAD_TYPE_NONCE 0x02
+#define KAD_TYPE_META 0x03

-#define RDMC_PROTECT		0x03
-#define RDMC_UNPROTECT		0x02
-#define RDMC_DEFAULT		0x00
+#define RDMC_PROTECT 0x03
+#define RDMC_UNPROTECT 0x02
+#define RDMC_DEFAULT 0x00

-//outputs hex in a 2 digit pair
-#define HEX( x )    right<<setw(2)<< setfill('0') << hex << (int)( x )<<setfill(' ')
-//macro for a byte swapped short
-#define BSSHORT( x ) ((unsigned short)( (x[0]<<8) + x[1] ))
-//macro for a byte swapped int
-#define BSLONG( x )    ((unsigned int)( (int)( x[0] << 24 ) + (int)( x[1] << 16 ) + (int)( x[2] << 8 ) + (int)( x[3] ) ))
+// outputs hex in a 2 digit pair
+#define HEX(x)                                                                 \
+  right << setw(2) << setfill('0') << hex << (int)(x) << setfill(' ')
+// macro for a byte swapped short
+#define BSSHORT(x) ((unsigned short)((x[0] << 8) + x[1]))
+// macro for a byte swapped int
+#define BSLONG(x)                                                              \
+  ((unsigned int)((int)(x[0] << 24) + (int)(x[1] << 16) + (int)(x[2] << 8) +   \
+                  (int)(x[3])))

 #ifdef HAVE_SYS_MACHINE_H
- #include <sys/machine.h>
+#include <sys/machine.h>
 #endif

-#ifdef HAVE_SYS_TYPES_H 
- #include <sys/types.h>
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
 #endif

 #ifdef BYTE_ORDER
- #define STENC_BYTE_ORDER BYTE_ORDER
+#define STENC_BYTE_ORDER BYTE_ORDER
 #endif
 #ifndef STENC_BYTE_ORDER
- #ifdef __BYTE_ORDER
-  #define STENC_BYTE_ORDER __BYTE_ORDER
- #endif
+#ifdef __BYTE_ORDER
+#define STENC_BYTE_ORDER __BYTE_ORDER
+#endif
 #endif

 #ifdef BIG_ENDIAN
- #define STENC_TYPE_BIG_ENDIAN BIG_ENDIAN
+#define STENC_TYPE_BIG_ENDIAN BIG_ENDIAN
 #endif
 #ifndef STENC_TYPE_BIG_ENDIAN
- #ifdef __BIG_ENDIAN
-  #define STENC_TYPE_BIG_ENDIAN __BIG_ENDIAN
- #endif
+#ifdef __BIG_ENDIAN
+#define STENC_TYPE_BIG_ENDIAN __BIG_ENDIAN
+#endif
 #endif

 #if STENC_BYTE_ORDER == STENC_TYPE_BIG_ENDIAN
- #define STENC_BIG_ENDIAN 1
+#define STENC_BIG_ENDIAN 1
 #else
- #define STENC_BIG_ENDIAN 0
+#define STENC_BIG_ENDIAN 0
 #endif

-
-
-
-
 typedef struct {
-    unsigned char pageCode		[2]; 
-    unsigned char length		[2];
+  unsigned char pageCode[2];
+  unsigned char length[2];

 #if STENC_BIG_ENDIAN == 1
-    unsigned char nexusScope 		:3;
-    unsigned char res_bits_1		:2;
-    unsigned char keyScope		:3;
+  unsigned char nexusScope : 3;
+  unsigned char res_bits_1 : 2;
+  unsigned char keyScope : 3;
 #else
-    unsigned char keyScope		:3;
-    unsigned char res_bits_1		:2;
-    unsigned char nexusScope 		:3;
+  unsigned char keyScope : 3;
+  unsigned char res_bits_1 : 2;
+  unsigned char nexusScope : 3;
 #endif
-    unsigned char encryptionMode;
-    unsigned char decryptionMode;
-    unsigned char algorithmIndex;
-    unsigned char keyInstance		[4];
+  unsigned char encryptionMode;
+  unsigned char decryptionMode;
+  unsigned char algorithmIndex;
+  unsigned char keyInstance[4];
 #if STENC_BIG_ENDIAN == 1
-    unsigned char res_bits_2		:1;
-    unsigned char parametersControl	:3;
-    unsigned char VCELB			:1;
-    unsigned char CEEMS			:2;
-    unsigned char RDMD 			:1;
+  unsigned char res_bits_2 : 1;
+  unsigned char parametersControl : 3;
+  unsigned char VCELB : 1;
+  unsigned char CEEMS : 2;
+  unsigned char RDMD : 1;
 #else
-    
-    unsigned char RDMD 			:1;
-    unsigned char CEEMS			:2;
-    unsigned char VCELB			:1;
-    unsigned char parametersControl	:3;
-    unsigned char res_bits_2		:1;
-#endif
-    unsigned char res_bits_3;
-    unsigned char ASDKCount		[2];
-    unsigned char res_bits_4		[8];

-} SSP_PAGE_DES; //device encryption status page
+  unsigned char RDMD : 1;
+  unsigned char CEEMS : 2;
+  unsigned char VCELB : 1;
+  unsigned char parametersControl : 3;
+  unsigned char res_bits_2 : 1;
+#endif
+  unsigned char res_bits_3;
+  unsigned char ASDKCount[2];
+  unsigned char res_bits_4[8];
+
+} SSP_PAGE_DES; // device encryption status page

 typedef struct {
-    unsigned char type;
+  unsigned char type;
 #if STENC_BIG_ENDIAN == 1
-    unsigned char res_bits_1 		:5;
-    unsigned char authenticated 	:3;
+  unsigned char res_bits_1 : 5;
+  unsigned char authenticated : 3;
 #else
-    unsigned char authenticated 	:3;
-    unsigned char res_bits_1 		:5;
+  unsigned char authenticated : 3;
+  unsigned char res_bits_1 : 5;
 #endif
-    unsigned char descriptorLength	[2];
-    unsigned char descriptor		[SSP_DESCRIPTOR_LENGTH]; //will actually be the size of descriptorLength
+  unsigned char descriptorLength[2];
+  unsigned char descriptor[SSP_DESCRIPTOR_LENGTH]; // will actually be the size
+                                                   // of descriptorLength
 } SSP_KAD;

-typedef struct{
-        unsigned char pageCode		[2];
-        unsigned char length		[2];
-	unsigned char buffer		[SSP_PAGE_ALLOCATION];
-} SSP_PAGE_BUFFER; //generic ssp page buffer
-
+typedef struct {
+  unsigned char pageCode[2];
+  unsigned char length[2];
+  unsigned char buffer[SSP_PAGE_ALLOCATION];
+} SSP_PAGE_BUFFER; // generic ssp page buffer

 typedef struct {
-    unsigned char pageCode		[2];
-    unsigned char length		[2];
-    unsigned char log_obj_num		[8];
-#if STENC_BIG_ENDIAN == 1    
-    unsigned char compressionStatus 	:4;
-    unsigned char encryptionStatus 	:4;
-#else
-    unsigned char encryptionStatus      :4;
-    unsigned char compressionStatus     :4;
-#endif
-	    
-    unsigned char algorithmIndex;
-#if STENC_BIG_ENDIAN == 1    
-    unsigned char res_bits_1 		:6;
-    unsigned char EMES 			:1;
-    unsigned char RDMDS 		:1;
-#else
-    unsigned char RDMDS 		:1;
-    unsigned char EMES 			:1;
-    unsigned char res_bits_1 		:6;
-#endif
-    
-    unsigned char res_bits_2;
-} SSP_PAGE_NBES; //next block encryption status page
-
-
-typedef struct{
-    
-#if STENC_BIG_ENDIAN == 0
-    unsigned char peripheralQualifier	:3;
-    unsigned char periphrealDeviceType	:5;
-#else
-    unsigned char periphrealDeviceType	:5;
-    unsigned char peripheralQualifier	:3;
-#endif
-
-#if STENC_BIG_ENDIAN == 0
-    unsigned char RMB			:1;
-    unsigned char res_bits_1		:7;
-#else
-    unsigned char res_bits_1		:7;
-    unsigned char RMB			:1;
-#endif
-    unsigned char Version		[1];
-
-#if STENC_BIG_ENDIAN == 0
-    unsigned char obs_bits_1		:2;
-    unsigned char NORMACA		:1;
-    unsigned char HISUP			:1;
-    unsigned char responseDataFormat	:4;
-#else
-    unsigned char responseDataFormat	:4;
-    unsigned char HISUP			:1;
-    unsigned char NORMACA		:1;
-    unsigned char obs_bits_1		:2;
-#endif
-
-    unsigned char additionalLength	[1];
-    
-#if STENC_BIG_ENDIAN == 0
-    unsigned char SCCS			:1;
-    unsigned char ACC			:1;
-    unsigned char TPGS			:2;
-    unsigned char threePC		:1;
-    unsigned char res_bits_2		:2;
-    unsigned char protect		:1;
-#else
-    unsigned char protect		:1;
-    unsigned char res_bits_2		:2;
-    unsigned char threePC		:1;
-    unsigned char TPGS			:2;
-    unsigned char ACC			:1;
-    unsigned char SCCS			:1;
-#endif
-
-
-#if STENC_BIG_ENDIAN == 0
-    unsigned char obs_bits_2		:1;
-    unsigned char ENCSERV		:1;
-    unsigned char VS			:1;
-    unsigned char MULTIP		:1;
-    unsigned char MCHNGR		:1;
-    unsigned char obs_bits_3		:2;
-    unsigned char ADDR16		:1;
-#else
-    unsigned char ADDR16		:1;
-    unsigned char obs_bits_3		:2;
-    unsigned char MCHNGR		:1;
-    unsigned char MULTIP		:1;
-    unsigned char VS			:1;
-    unsigned char ENCSERV		:1;
-    unsigned char obs_bits_2		:1;
-#endif
-
-
-#if STENC_BIG_ENDIAN == 0
-    unsigned char obs_bits_4		:2;
-    unsigned char WBUS16		:1;
-    unsigned char SYNC			:1;
-    unsigned char obs_bits_5		:2;
-    unsigned char CMDQUE		:1;
-    unsigned char VS2			:1;
-#else
-    unsigned char VS2			:1;
-    unsigned char CMDQUE		:1;
-    unsigned char obs_bits_5		:2;
-    unsigned char SYNC			:1;
-    unsigned char WBUS16		:1;
-    unsigned char obs_bits_4		:2;
-#endif
-
-    unsigned char vender		[8];
-    unsigned char productID		[16];
-    unsigned char productRev		[4];
-    unsigned char SN			[7];
-    unsigned char venderUnique		[12];
-
-#if STENC_BIG_ENDIAN == 0
-    unsigned char res_bits_3		:4;
-    unsigned char CLOCKING		:2;
-    unsigned char QAS			:1;
-    unsigned char IUS			:1;
-#else
-    unsigned char IUS			:1;
-    unsigned char QAS			:1;
-    unsigned char CLOCKING		:2;
-    unsigned char res_bits_3		:4;
-#endif
-
-    unsigned char res_bits_4		[1];
-    unsigned char versionDescriptor	[16];
-    unsigned char res_bits_5		[22];
-    unsigned char copyright		[1];																			
-} SCSI_PAGE_INQ; //device inquiry response
-typedef struct{
+  unsigned char pageCode[2];
+  unsigned char length[2];
+  unsigned char log_obj_num[8];
 #if STENC_BIG_ENDIAN == 1
-	unsigned char valid		:1;
-	unsigned char responseCode 	:7;
+  unsigned char compressionStatus : 4;
+  unsigned char encryptionStatus : 4;
 #else
-	unsigned char responseCode 	:7;
-	unsigned char valid		:1;
-#endif	
-	unsigned char res_bits_1;
+  unsigned char encryptionStatus : 4;
+  unsigned char compressionStatus : 4;
+#endif
+
+  unsigned char algorithmIndex;
+#if STENC_BIG_ENDIAN == 1
+  unsigned char res_bits_1 : 6;
+  unsigned char EMES : 1;
+  unsigned char RDMDS : 1;
+#else
+  unsigned char RDMDS : 1;
+  unsigned char EMES : 1;
+  unsigned char res_bits_1 : 6;
+#endif
+
+  unsigned char res_bits_2;
+} SSP_PAGE_NBES; // next block encryption status page
+
+typedef struct {
+
+#if STENC_BIG_ENDIAN == 0
+  unsigned char peripheralQualifier : 3;
+  unsigned char periphrealDeviceType : 5;
+#else
+  unsigned char periphrealDeviceType : 5;
+  unsigned char peripheralQualifier : 3;
+#endif
+
+#if STENC_BIG_ENDIAN == 0
+  unsigned char RMB : 1;
+  unsigned char res_bits_1 : 7;
+#else
+  unsigned char res_bits_1 : 7;
+  unsigned char RMB : 1;
+#endif
+  unsigned char Version[1];
+
+#if STENC_BIG_ENDIAN == 0
+  unsigned char obs_bits_1 : 2;
+  unsigned char NORMACA : 1;
+  unsigned char HISUP : 1;
+  unsigned char responseDataFormat : 4;
+#else
+  unsigned char responseDataFormat : 4;
+  unsigned char HISUP : 1;
+  unsigned char NORMACA : 1;
+  unsigned char obs_bits_1 : 2;
+#endif
+
+  unsigned char additionalLength[1];
+
+#if STENC_BIG_ENDIAN == 0
+  unsigned char SCCS : 1;
+  unsigned char ACC : 1;
+  unsigned char TPGS : 2;
+  unsigned char threePC : 1;
+  unsigned char res_bits_2 : 2;
+  unsigned char protect : 1;
+#else
+  unsigned char protect : 1;
+  unsigned char res_bits_2 : 2;
+  unsigned char threePC : 1;
+  unsigned char TPGS : 2;
+  unsigned char ACC : 1;
+  unsigned char SCCS : 1;
+#endif
+
+#if STENC_BIG_ENDIAN == 0
+  unsigned char obs_bits_2 : 1;
+  unsigned char ENCSERV : 1;
+  unsigned char VS : 1;
+  unsigned char MULTIP : 1;
+  unsigned char MCHNGR : 1;
+  unsigned char obs_bits_3 : 2;
+  unsigned char ADDR16 : 1;
+#else
+  unsigned char ADDR16 : 1;
+  unsigned char obs_bits_3 : 2;
+  unsigned char MCHNGR : 1;
+  unsigned char MULTIP : 1;
+  unsigned char VS : 1;
+  unsigned char ENCSERV : 1;
+  unsigned char obs_bits_2 : 1;
+#endif
+
+#if STENC_BIG_ENDIAN == 0
+  unsigned char obs_bits_4 : 2;
+  unsigned char WBUS16 : 1;
+  unsigned char SYNC : 1;
+  unsigned char obs_bits_5 : 2;
+  unsigned char CMDQUE : 1;
+  unsigned char VS2 : 1;
+#else
+  unsigned char VS2 : 1;
+  unsigned char CMDQUE : 1;
+  unsigned char obs_bits_5 : 2;
+  unsigned char SYNC : 1;
+  unsigned char WBUS16 : 1;
+  unsigned char obs_bits_4 : 2;
+#endif
+
+  unsigned char vender[8];
+  unsigned char productID[16];
+  unsigned char productRev[4];
+  unsigned char SN[7];
+  unsigned char venderUnique[12];
+
+#if STENC_BIG_ENDIAN == 0
+  unsigned char res_bits_3 : 4;
+  unsigned char CLOCKING : 2;
+  unsigned char QAS : 1;
+  unsigned char IUS : 1;
+#else
+  unsigned char IUS : 1;
+  unsigned char QAS : 1;
+  unsigned char CLOCKING : 2;
+  unsigned char res_bits_3 : 4;
+#endif
+
+  unsigned char res_bits_4[1];
+  unsigned char versionDescriptor[16];
+  unsigned char res_bits_5[22];
+  unsigned char copyright[1];
+} SCSI_PAGE_INQ; // device inquiry response
+typedef struct {
+#if STENC_BIG_ENDIAN == 1
+  unsigned char valid : 1;
+  unsigned char responseCode : 7;
+#else
+  unsigned char responseCode : 7;
+  unsigned char valid : 1;
+#endif
+  unsigned char res_bits_1;

 #if STENC_BIG_ENDIAN == 1
-	unsigned char filemark		:1;
-	unsigned char EOM		:1;
-	unsigned char ILI		:1;
-	unsigned char res_bits_2	:1;
-	unsigned char senseKey		:4;
-#else	
-	unsigned char senseKey		:4;
-	unsigned char res_bits_2	:1;
-	unsigned char ILI		:1;
-	unsigned char EOM		:1;
-	unsigned char filemark		:1;
-#endif	
-	unsigned char information	[4];
-	unsigned char addSenseLen;
-	unsigned char cmdSpecificInfo	[4];
-	unsigned char addSenseCode;
-	unsigned char addSenseCodeQual;
-	unsigned char fieldRepUnitCode;
+  unsigned char filemark : 1;
+  unsigned char EOM : 1;
+  unsigned char ILI : 1;
+  unsigned char res_bits_2 : 1;
+  unsigned char senseKey : 4;
+#else
+  unsigned char senseKey : 4;
+  unsigned char res_bits_2 : 1;
+  unsigned char ILI : 1;
+  unsigned char EOM : 1;
+  unsigned char filemark : 1;
+#endif
+  unsigned char information[4];
+  unsigned char addSenseLen;
+  unsigned char cmdSpecificInfo[4];
+  unsigned char addSenseCode;
+  unsigned char addSenseCodeQual;
+  unsigned char fieldRepUnitCode;
 #if STENC_BIG_ENDIAN == 1
-	unsigned char sim		:3; // system information message 
-	unsigned char bpv		:1; // bit pointer valid 
-	unsigned char resvd2		:2; // reserved 
-	unsigned char cd		:1; // control/data 
-	unsigned char SKSV		:1;
+  unsigned char sim : 3;    // system information message
+  unsigned char bpv : 1;    // bit pointer valid
+  unsigned char resvd2 : 2; // reserved
+  unsigned char cd : 1;     // control/data
+  unsigned char SKSV : 1;

-#else	
-	unsigned char SKSV		:1;
-	unsigned char cd		:1; // control/data 
-	unsigned char resvd2		:2; // reserved 
-	unsigned char bpv		:1; // bit pointer valid 
-	unsigned char sim		:3; // system information message 
-#endif	
-        unsigned char field		[2]; // field pointer 
-	unsigned char addSenseData	[109];
-} SCSI_PAGE_SENSE; //sense data response
-class KAD_CLASS{
-	public:
-		std::vector<SSP_KAD> kads;
-	protected:
-		void loadKADs(SSP_PAGE_BUFFER* buffer, int start);
+#else
+  unsigned char SKSV : 1;
+  unsigned char cd : 1;     // control/data
+  unsigned char resvd2 : 2; // reserved
+  unsigned char bpv : 1;    // bit pointer valid
+  unsigned char sim : 3;    // system information message
+#endif
+  unsigned char field[2]; // field pointer
+  unsigned char addSenseData[109];
+} SCSI_PAGE_SENSE; // sense data response
+class KAD_CLASS {
+public:
+  std::vector<SSP_KAD> kads;
+
+protected:
+  void loadKADs(SSP_PAGE_BUFFER *buffer, int start);
 };

-
-//class used to parse next block encryption status page
-class SSP_NBES: public KAD_CLASS{
-	public:
-		SSP_PAGE_NBES nbes;
-		SSP_NBES(SSP_PAGE_BUFFER* buffer);
+// class used to parse next block encryption status page
+class SSP_NBES : public KAD_CLASS {
+public:
+  SSP_PAGE_NBES nbes;
+  SSP_NBES(SSP_PAGE_BUFFER *buffer);
 };
-//class used to parse data encryption status page
-class SSP_DES: public KAD_CLASS{
-        public:
-                SSP_PAGE_DES des;
-                SSP_DES(SSP_PAGE_BUFFER* buffer);
+// class used to parse data encryption status page
+class SSP_DES : public KAD_CLASS {
+public:
+  SSP_PAGE_DES des;
+  SSP_DES(SSP_PAGE_BUFFER *buffer);
 };

+// enum for SCSIEncryptOptions.cryptMode
+enum { CRYPTMODE_OFF, CRYPTMODE_MIXED, CRYPTMODE_ON, CRYPTMODE_RAWREAD };

-//enum for SCSIEncryptOptions.cryptMode
-enum { CRYPTMODE_OFF, CRYPTMODE_MIXED,CRYPTMODE_ON,CRYPTMODE_RAWREAD};
-
-//used to pass parameters to SCSIWriteEncryptOptions
+// used to pass parameters to SCSIWriteEncryptOptions
 class SCSIEncryptOptions {
-	public:
-	    int rdmc;
-	    bool CKOD;
-	    int cryptMode;
-	    unsigned int algorithmIndex;
-	    std::string cryptoKey;
-	    std::string keyName;
-	    SCSIEncryptOptions();
+public:
+  int rdmc;
+  bool CKOD;
+  int cryptMode;
+  unsigned int algorithmIndex;
+  std::string cryptoKey;
+  std::string keyName;
+  SCSIEncryptOptions();
 };

-//Gets encryption options on the tape drive
-SSP_DES* SSPGetDES(std::string tapeDevice);
-//Gets the encryption status from the tape volume
-SSP_NBES* SSPGetNBES(std::string tapeDevice,bool retry);
-//Writes encryption options to the tape drive
-bool SCSIWriteEncryptOptions(std::string tapeDevice, SCSIEncryptOptions* eOptions);
-//Gets device inquiry
-SCSI_PAGE_INQ* SCSIGetInquiry(std::string tapeDevice);
+// Gets encryption options on the tape drive
+SSP_DES *SSPGetDES(std::string tapeDevice);
+// Gets the encryption status from the tape volume
+SSP_NBES *SSPGetNBES(std::string tapeDevice, bool retry);
+// Writes encryption options to the tape drive
+bool SCSIWriteEncryptOptions(std::string tapeDevice,
+                             SCSIEncryptOptions *eOptions);
+// Gets device inquiry
+SCSI_PAGE_INQ *SCSIGetInquiry(std::string tapeDevice);
 #endif
--- a/stenc.spec
+++ b/stenc.spec
@@ -0,0 +1,50 @@
+Name:           stenc
+Version:        1.1.0
+Release:        3%{?dist}
+Summary:        SCSI Tape Encryption Manager
+
+License:        GPLv2
+URL:            https://github.com/scsitape/stenc
+Source0:        https://github.com/scsitape/stenc/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+
+BuildRequires:  gcc-c++
+BuildRequires:  make
+BuildRequires:  autoconf
+BuildRequires:  automake
+
+%description
+SCSI Tape Encryption Manager - Manages encryption on LTO 4 and newer tape
+drives with hardware-based encryption
+
+%prep
+%setup -q
+
+%build
+./autogen.sh
+%configure
+make %{?_smp_mflags}
+
+%install
+make install DESTDIR=%{buildroot}
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root,-)
+%license COPYING
+%doc README.md AUTHORS
+%{_bindir}/stenc
+%{_mandir}/man1/stenc.1*
+
+
+
+%changelog
+* Wed Nov 11 2020 Paweł Marciniak <sunwire+repo@gmail.com> - 1.0.8-3
+- Remove BuildRoot tag, add smp flags to make and license macro
+
+* Sat Nov 07 2020 Paweł Marciniak <sunwire+repo@gmail.com> - 1.0.8-2
+- Make will no longer be in BuildRoot by default
+
+* Sat Jul 4 2020 Paweł Marciniak <sunwire+repo@gmail.com> 1.0.8-1
+- Initial SPEC file
Author	SHA1	Message	Date
Jonas Stein	8ff2e4c4eb	Codecleanup, Version bump 1.1.0	2022-04-22 00:47:33 +02:00
Jonas Stein	0ad0a208d5	Drop AC_CHECK_INCLUDES_DEFAULT AC_CHECK_INCLUDES_DEFAULT requires autoconf at least version 2.70 Bug: https://github.com/scsitape/stenc/issues/33	2022-04-21 22:44:41 +02:00
Jonas Stein	59d5c6c0fa	ignore temporary files	2022-04-21 22:24:51 +02:00
Jonas Stein	35b852cfeb	add .clang-cormat Add .clang-cormat config file to src folder for unified formatting.	2022-04-20 01:00:40 +02:00
Jonas Stein	88a507932e	reformat and cleanup more reformat the source in an unified way. (improve later with clang-format config) fix order of includes use proper delete[] operator	2022-04-20 00:24:59 +02:00
Jonas Stein	aa2244308d	cleaned code removed std namespace initialized variables cleaned endl added const for constants tagged new version 1.0.8	2022-04-20 00:12:52 +02:00
Paweł Marciniak	e1e3676660	Use /dev/random to create a key (#22 ) Co-authored-by: Paweł Marciniak <sunwire+git@gmail.com>	2022-04-19 22:16:37 +02:00
Jonas Stein	d4ffed77ab	Create c-cpp.yml	2022-04-07 20:16:55 +02:00
Jonas Stein	82aca41962	do not make distbuilds anymore	2022-04-07 20:13:00 +02:00
Jonas Stein	b6b7cd90c0	Add LGTM Codeanalysis	2022-04-05 21:31:16 +02:00
John Coleman	e92ccb49ff	Merge pull request #17 from fpiecka/patch-1 Remove duplicate zeroing	2020-11-13 20:11:27 -07:00
John Coleman	9feb3f8739	Merge pull request #23 from sunwire/spec Add example spec file for Fedora/CentOS/RHEL	2020-11-13 20:10:40 -07:00
John Coleman	1dce245cce	Merge pull request #25 from sunwire/license Update GPL2 license	2020-11-13 20:10:18 -07:00
sunwire	b650fb67c0	Update URL from sf to github (#21 ) * Correct url from sf to github Co-authored-by: Paweł Marciniak <sunwire+git@gmail.com>	2020-11-13 00:25:23 +01:00
Paweł Marciniak	70859dfdaa	Update GPL2 license	2020-11-11 14:29:13 +01:00
Paweł Marciniak	fc403b6267	Remove BuildRoot tag, add smp flags to make and license macro	2020-11-11 13:57:35 +01:00
Jonas Stein	aefb37e563	link IBM Tape Library Guide Add link to documentation. IBM Tape Library Guide for Open Systems	2020-11-09 12:02:19 +01:00
Paweł Marciniak	90586aa018	Add example spec file for Fedora/CentOS/RHEL	2020-07-26 22:06:11 +02:00
Jonas Stein	dc99d2b3e6	Merge pull request #20 from jonasstein/master Release 1.0.8	2020-06-17 01:13:03 +02:00
Jonas Stein	d9d8b158c5	Release 1.0.8	2020-06-17 01:11:56 +02:00
Jonas Stein	f175bf4c0b	Merge pull request #19 from jonasstein/master README .md syntax	2020-06-16 22:29:48 +02:00
Jonas Stein	41df2d0c0b	README .md syntax	2020-06-16 22:28:45 +02:00
Jonas Stein	2f3d5d27a5	Merge pull request #18 from jonasstein/master README compile	2020-06-16 22:25:25 +02:00
Jonas Stein	57727c43fe	README compile	2020-06-16 22:22:43 +02:00
Jonas Stein	6fc15b72e7	Merge pull request #16 from JosefMeixner/errorreporting Added output of strerror to undecoded error codes	2020-06-16 22:13:53 +02:00
Jonas Stein	65464950e0	Merge pull request #10 from scsitape/jonasstein-patch-1 Create CONTRIBUTING.md	2020-06-16 22:07:24 +02:00
Jonas Stein	1e89afd60e	Merge pull request #14 from Malvineous/master Fix errors in autogen.sh	2020-06-16 21:30:55 +02:00
Fedor Piecka	a4f407f361	Remove duplicate zeroing memset zeroes whole &kad. No need to set it's parts to zero. Proposed in	2020-05-29 06:37:31 +02:00
Josef Meixner	e8d1f6b66b	Added output of strerror to undecoded error codes	2020-04-13 12:11:26 +02:00
Adam Nielsen	a43678d209	Use Automake 'foreign' option This avoids errors on missing files NEWS and README.	2018-12-21 00:02:34 +10:00
Adam Nielsen	9022262489	$VARS are not permitted in AC_INIT	2018-12-21 00:02:34 +10:00