From dfca89c7e7f3b972c5f152bb0ae078ec16c11ca1 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Tue, 21 Mar 2017 12:12:50 -0500
Subject: hashpwd.cpp in correct directory

---
 hashpwd.cpp     | 277 --------------------------------------------------------
 src/hashpwd.cpp | 277 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 277 insertions(+), 277 deletions(-)
 delete mode 100644 hashpwd.cpp
 create mode 100644 src/hashpwd.cpp

diff --git a/hashpwd.cpp b/hashpwd.cpp
deleted file mode 100644
index 76e656a..0000000
--- a/hashpwd.cpp
+++ /dev/null
@@ -1,277 +0,0 @@
-//============================================================================
-// Name        : hashpwd.cpp
-// Author      : 
-// Version     :
-// Copyright   : Your copyright notice
-// Description : Hello World in C++, Ansi-style
-//============================================================================
-
-#include <iostream>
-#include <sstream>
-#include <string>
-#include <stdio.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <iomanip>
-#include <string.h>
-#include <openssl/sha.h>
-
-using namespace std;
-int v = 0;
-
-string magic_comp = "fc1c";
-
-static const string base64_chars =
-             "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-             "abcdefghijklmnopqrstuvwxyz"
-             "0123456789+/";
-
-void escapeOutput(string &input, string &outstr)
-{
-	outstr.clear();
-	int idx = 0; int lastnl = 0;
-	for (string::iterator it=input.begin(); it!=input.end(); ++it) {
-		stringstream conv;
-		lastnl = 0;
-	    if (isprint(*it)) {
-	    	if (idx > 0) {
-	    		outstr += ' ';
-	    		idx++;
-	    	}
-	    	outstr += *it;
-	    	idx++;
-	    	if(idx > 74) {
-	    		outstr += '\n';
-	    		lastnl = 1;
-	    	}
-	    } else {
-	      conv.str(string());
-	      conv << "\\x" << hex << setw(2) << ((unsigned int)*it & 0xff);
-    	  if (idx > 0) {
-	    	outstr += ' ';
-	    	idx++;
-	      }
-	      idx+=5;
-	      outstr += conv.str();
-	      if(idx > 74) {
-	    	outstr += '\n';
-	    	lastnl = 1;
-	      }
-	    }
-	}
-	if(lastnl)
-		if (outstr.size () > 0)  outstr.resize (outstr.size () - 1);
-}
-
-void binTo64(const unsigned char *data, unsigned int datalen, string &str, unsigned int strLen)
-{
-	unsigned int idx = 0;
-	int sex;
-	unsigned char incoming[3];
-	int last;
-
-	str.clear();
-	(v == 1) && cout << "binTo64 datalen: " << datalen << endl;
-	(v == 1) && cout << "binTo64 strLen: " << strLen << endl;
-	for(unsigned int i=0; i<strLen; i+=4) {
-		if(idx >= datalen)
-		  break;
-		if (idx + 3 > datalen) {
-			memset(incoming,0,3);
-			memcpy(incoming,data+idx,datalen-idx);
-			last = datalen - idx - 1;
-		} else {
-			memcpy(incoming,data+idx,sizeof incoming);
-			last = 4;
-		}
-		idx += 3;
-
-		(v == 1) && cout << hex << "in[0]: " << (int)incoming[0] << " in[1]: " << (int)incoming[1]<< " in[2] " << (int)incoming[2] << endl;
-
-		sex = (incoming[0] >> 2);
-		str  += base64_chars[sex];
-		(v == 1) && cout << "1st, 4th inp char: " << hex << sex << " to: " << str << endl;
-
-		sex = (incoming[1] >> 4);
-		(v == 1) && cout << "2nd, 5th inp char: " << hex << sex << endl;
-		sex += (incoming[0] << 4) & 0x30;
-		str  += base64_chars[sex];
-		(v == 1) && cout << "3rd, 6th inp char: " << hex << sex << " to: " << str << endl;
-		(v == 1) && cout << "last: " << last << endl;
-		if (last == 0)
-		  continue;
-	    sex = (incoming[2] >> 6);
-		sex += ((incoming[1] << 2) & 0x3c);
-		str  += base64_chars[sex];
-
-		if(last == 1)
-		  continue;
-
-	    sex = (incoming[2] & 0x3f);
-		str  += base64_chars[sex];
-
-		(v == 1) && cout << "Converted " << idx << "chars: " << str << endl;
-	}
-	while (str.length() < strLen)
-		str += '=';
-	return;
-}
-
-int badPassword(string &passwd)
-{
-	unsigned char a[3];
-	int i = 0;
-	int lower=0, upper=0, numeric=0, special=0;
-	a[0] = a[1] = a[2] = 0;
-	for (string::iterator it=passwd.begin(); it!=passwd.end(); ++it) {
-		a[0] = *it;
-		if (i > 1) {
-			if ((a[0] == a[1]) && (a[1] == a[2]))
-				return 1;
-			if ((a[0] == a[1]+1) && (a[1] == a[2]+1))
-				return 1;
-			if ((a[0] == a[1]-1) && (a[1] == a[2]-1))
-				return 1;
-		}
-		a[2] = a[1];
-		a[1] = a[0];
-		if(islower(*it))
-			lower=1;
-		if(isupper(*it))
-			upper=1;
-		if(isdigit(*it))
-			numeric=1;
-		if((*it == '/') || (*it == '+'))
-			special=1;
-		i++;
-	}
-	if (lower + upper + numeric + special < 3)
-		return 1;
-	return 0;
-}
-
-void usage(void)
-{
-	cout << "usage:" << endl <<
-      "  hashpwd [-v] [[-d did] [-m mac] | [-p password]] salt" << endl <<
-      "    -v              verbose" << endl <<
-      "    -d did          Device ID (serial #)" << endl <<
-      "    -m mac          Ethernet mac address" << endl <<
-      "    -p              password" << endl <<
-      "Either password must be supplied, or Device-ID and Ethernet Mac address" << endl <<
-	  "salt is required." <<endl;
-    exit(1);
-}
-
-int main(int argc, char **argv) {
-	int opt = 0, p = 0, d = 0, m = 0;
-	unsigned long long fudge = 0;
-	short unsigned int prefix;
-	string did, mac, pwd, salt;
-
-    while ((opt = getopt(argc,argv,"d:m:p:v")) != EOF)
-        switch(opt)
-        {
-            case 'v': v = 1; cout << " verbose" <<endl; break;
-            case 'd': d = 1; did = optarg ; (v==1) && cout << "device-id is " << did << endl; break;
-            case 'm': m = 1; mac = optarg ; (v==1) && cout << "Ethernet mac is " << mac << endl; break;
-            case 'p': p = 1; mac = optarg ; (v==1) && cout << "User defined password is \"" << pwd << "\"" << endl; break;
-            case '?': usage(); break;
-            default: cout<<endl; abort();
-        }
-    (v == 1) && cout << "optind is " << optind << " and argc is " << argc << endl;
-    if (v == 1) {
-    	cout << "arguments:" << endl;
-    	for (int i = 0; i < argc; i++)
-    		cout << "  argv[" << i << "]=\"" << argv[i] << "\"" << endl;
-    }
-
-    if ((p && d) || (p && m)) {
-    	cout << "Must use either a supplied password or Device ID and Ethernet MAC address, but not all three." << endl;
-    	usage();
-    }
-    if ((d && !m) || (m && !d)) {
-    	cout << "Must have both a Device-ID and an Ethernet MAC address." << endl;
-    	usage();
-    }
-    if (optind != argc-1) {
-    	cout << "Must have exactly one salt argument." << endl;
-    	usage();
-    }
-    salt = argv[optind];
-    (v == 1) && cout << "Salt is \"" << salt << "\"" << endl;
-
-    prefix = strtol(magic_comp.c_str(),NULL,16);
-
-    prefix = ~prefix;
-
-    stringstream prefixStream;
-
-    prefixStream << setw(4) << setfill('0') << hex << prefix;
-
-    (v == 1) && cout << "prefix is " << prefixStream.str() << endl;
-
-
-    string passwd_str;
-    string passwd0, passwdnew;
-    SHA256_CTX sha256;
-    unsigned char hash[SHA256_DIGEST_LENGTH];
-
-    if (p)
-    	passwd_str = prefixStream.str() + pwd + salt;
-    else {
-    	passwd0 = did + "|" + mac;
-		passwdnew = passwd0;
-
-	    while (1) {
-	    	unsigned char append[9];
-    	    (v == 1) && cout << "pwdinput: " << passwdnew << endl;
-
-    		SHA256_Init(&sha256);
-    		SHA256_Update(&sha256,passwdnew.c_str(),passwdnew.length());
-    		SHA256_Final(hash, &sha256);
-    		if (v == 1) {
-    			for (int i = 0; i < SHA256_DIGEST_LENGTH; i++)
-    				cout << hex << setw(2) << setfill('0') << (int)hash[i];
-    			cout << endl;
-    		}
-    		pwd = "";
-    		binTo64(hash,SHA256_DIGEST_LENGTH,passwd_str,8);
-    		(v == 1) && cout << "passwd_str: " << passwd_str << endl;
-    		if(!badPassword(passwd_str))
-    			break;
-	    	fudge++;
-	    	memcpy(append,&fudge,sizeof fudge);
-	    	append[8]=0;
-	    	string b64Appendstr;
-	    	binTo64(append,8,b64Appendstr,12);
-	    	unsigned int found = b64Appendstr.find_first_of('=');
-	    	if(found != string::npos)
-	    		b64Appendstr = b64Appendstr.substr(0,found);
-	    	passwdnew = passwd0 + b64Appendstr;
-        }
-#ifdef Runtest
-		// Test
-		string testencode = "aX2t^%~Q\377\377\xef", outencode, escaped ;
-		escapeOutput(testencode,escaped);
-		binTo64((unsigned char *)testencode.c_str(),testencode.length(),outencode,testencode.length()*2);
-		cout << "TEST encode input: " << escaped << " Output: " <<
-				outencode << endl;
-#endif
-    }
-    cout << "pass=" << passwd_str << endl;
-
-    SHA256_Init(&sha256);
-    SHA256_Update(&sha256,passwd_str.c_str(),passwd_str.length());
-    SHA256_Final(hash, &sha256);
-
-    cout << setw(2) << setfill('0') << hex;
-    cout << "password_hash=";
-    for (int i=0; i < SHA256_DIGEST_LENGTH; i++)
-    	cout << (int)hash[i];
-    cout << endl;
-    cout << "salt=" << salt << endl;
-	return 0;
-}
diff --git a/src/hashpwd.cpp b/src/hashpwd.cpp
new file mode 100644
index 0000000..76e656a
--- /dev/null
+++ b/src/hashpwd.cpp
@@ -0,0 +1,277 @@
+//============================================================================
+// Name        : hashpwd.cpp
+// Author      : 
+// Version     :
+// Copyright   : Your copyright notice
+// Description : Hello World in C++, Ansi-style
+//============================================================================
+
+#include <iostream>
+#include <sstream>
+#include <string>
+#include <stdio.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <iomanip>
+#include <string.h>
+#include <openssl/sha.h>
+
+using namespace std;
+int v = 0;
+
+string magic_comp = "fc1c";
+
+static const string base64_chars =
+             "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+             "abcdefghijklmnopqrstuvwxyz"
+             "0123456789+/";
+
+void escapeOutput(string &input, string &outstr)
+{
+	outstr.clear();
+	int idx = 0; int lastnl = 0;
+	for (string::iterator it=input.begin(); it!=input.end(); ++it) {
+		stringstream conv;
+		lastnl = 0;
+	    if (isprint(*it)) {
+	    	if (idx > 0) {
+	    		outstr += ' ';
+	    		idx++;
+	    	}
+	    	outstr += *it;
+	    	idx++;
+	    	if(idx > 74) {
+	    		outstr += '\n';
+	    		lastnl = 1;
+	    	}
+	    } else {
+	      conv.str(string());
+	      conv << "\\x" << hex << setw(2) << ((unsigned int)*it & 0xff);
+    	  if (idx > 0) {
+	    	outstr += ' ';
+	    	idx++;
+	      }
+	      idx+=5;
+	      outstr += conv.str();
+	      if(idx > 74) {
+	    	outstr += '\n';
+	    	lastnl = 1;
+	      }
+	    }
+	}
+	if(lastnl)
+		if (outstr.size () > 0)  outstr.resize (outstr.size () - 1);
+}
+
+void binTo64(const unsigned char *data, unsigned int datalen, string &str, unsigned int strLen)
+{
+	unsigned int idx = 0;
+	int sex;
+	unsigned char incoming[3];
+	int last;
+
+	str.clear();
+	(v == 1) && cout << "binTo64 datalen: " << datalen << endl;
+	(v == 1) && cout << "binTo64 strLen: " << strLen << endl;
+	for(unsigned int i=0; i<strLen; i+=4) {
+		if(idx >= datalen)
+		  break;
+		if (idx + 3 > datalen) {
+			memset(incoming,0,3);
+			memcpy(incoming,data+idx,datalen-idx);
+			last = datalen - idx - 1;
+		} else {
+			memcpy(incoming,data+idx,sizeof incoming);
+			last = 4;
+		}
+		idx += 3;
+
+		(v == 1) && cout << hex << "in[0]: " << (int)incoming[0] << " in[1]: " << (int)incoming[1]<< " in[2] " << (int)incoming[2] << endl;
+
+		sex = (incoming[0] >> 2);
+		str  += base64_chars[sex];
+		(v == 1) && cout << "1st, 4th inp char: " << hex << sex << " to: " << str << endl;
+
+		sex = (incoming[1] >> 4);
+		(v == 1) && cout << "2nd, 5th inp char: " << hex << sex << endl;
+		sex += (incoming[0] << 4) & 0x30;
+		str  += base64_chars[sex];
+		(v == 1) && cout << "3rd, 6th inp char: " << hex << sex << " to: " << str << endl;
+		(v == 1) && cout << "last: " << last << endl;
+		if (last == 0)
+		  continue;
+	    sex = (incoming[2] >> 6);
+		sex += ((incoming[1] << 2) & 0x3c);
+		str  += base64_chars[sex];
+
+		if(last == 1)
+		  continue;
+
+	    sex = (incoming[2] & 0x3f);
+		str  += base64_chars[sex];
+
+		(v == 1) && cout << "Converted " << idx << "chars: " << str << endl;
+	}
+	while (str.length() < strLen)
+		str += '=';
+	return;
+}
+
+int badPassword(string &passwd)
+{
+	unsigned char a[3];
+	int i = 0;
+	int lower=0, upper=0, numeric=0, special=0;
+	a[0] = a[1] = a[2] = 0;
+	for (string::iterator it=passwd.begin(); it!=passwd.end(); ++it) {
+		a[0] = *it;
+		if (i > 1) {
+			if ((a[0] == a[1]) && (a[1] == a[2]))
+				return 1;
+			if ((a[0] == a[1]+1) && (a[1] == a[2]+1))
+				return 1;
+			if ((a[0] == a[1]-1) && (a[1] == a[2]-1))
+				return 1;
+		}
+		a[2] = a[1];
+		a[1] = a[0];
+		if(islower(*it))
+			lower=1;
+		if(isupper(*it))
+			upper=1;
+		if(isdigit(*it))
+			numeric=1;
+		if((*it == '/') || (*it == '+'))
+			special=1;
+		i++;
+	}
+	if (lower + upper + numeric + special < 3)
+		return 1;
+	return 0;
+}
+
+void usage(void)
+{
+	cout << "usage:" << endl <<
+      "  hashpwd [-v] [[-d did] [-m mac] | [-p password]] salt" << endl <<
+      "    -v              verbose" << endl <<
+      "    -d did          Device ID (serial #)" << endl <<
+      "    -m mac          Ethernet mac address" << endl <<
+      "    -p              password" << endl <<
+      "Either password must be supplied, or Device-ID and Ethernet Mac address" << endl <<
+	  "salt is required." <<endl;
+    exit(1);
+}
+
+int main(int argc, char **argv) {
+	int opt = 0, p = 0, d = 0, m = 0;
+	unsigned long long fudge = 0;
+	short unsigned int prefix;
+	string did, mac, pwd, salt;
+
+    while ((opt = getopt(argc,argv,"d:m:p:v")) != EOF)
+        switch(opt)
+        {
+            case 'v': v = 1; cout << " verbose" <<endl; break;
+            case 'd': d = 1; did = optarg ; (v==1) && cout << "device-id is " << did << endl; break;
+            case 'm': m = 1; mac = optarg ; (v==1) && cout << "Ethernet mac is " << mac << endl; break;
+            case 'p': p = 1; mac = optarg ; (v==1) && cout << "User defined password is \"" << pwd << "\"" << endl; break;
+            case '?': usage(); break;
+            default: cout<<endl; abort();
+        }
+    (v == 1) && cout << "optind is " << optind << " and argc is " << argc << endl;
+    if (v == 1) {
+    	cout << "arguments:" << endl;
+    	for (int i = 0; i < argc; i++)
+    		cout << "  argv[" << i << "]=\"" << argv[i] << "\"" << endl;
+    }
+
+    if ((p && d) || (p && m)) {
+    	cout << "Must use either a supplied password or Device ID and Ethernet MAC address, but not all three." << endl;
+    	usage();
+    }
+    if ((d && !m) || (m && !d)) {
+    	cout << "Must have both a Device-ID and an Ethernet MAC address." << endl;
+    	usage();
+    }
+    if (optind != argc-1) {
+    	cout << "Must have exactly one salt argument." << endl;
+    	usage();
+    }
+    salt = argv[optind];
+    (v == 1) && cout << "Salt is \"" << salt << "\"" << endl;
+
+    prefix = strtol(magic_comp.c_str(),NULL,16);
+
+    prefix = ~prefix;
+
+    stringstream prefixStream;
+
+    prefixStream << setw(4) << setfill('0') << hex << prefix;
+
+    (v == 1) && cout << "prefix is " << prefixStream.str() << endl;
+
+
+    string passwd_str;
+    string passwd0, passwdnew;
+    SHA256_CTX sha256;
+    unsigned char hash[SHA256_DIGEST_LENGTH];
+
+    if (p)
+    	passwd_str = prefixStream.str() + pwd + salt;
+    else {
+    	passwd0 = did + "|" + mac;
+		passwdnew = passwd0;
+
+	    while (1) {
+	    	unsigned char append[9];
+    	    (v == 1) && cout << "pwdinput: " << passwdnew << endl;
+
+    		SHA256_Init(&sha256);
+    		SHA256_Update(&sha256,passwdnew.c_str(),passwdnew.length());
+    		SHA256_Final(hash, &sha256);
+    		if (v == 1) {
+    			for (int i = 0; i < SHA256_DIGEST_LENGTH; i++)
+    				cout << hex << setw(2) << setfill('0') << (int)hash[i];
+    			cout << endl;
+    		}
+    		pwd = "";
+    		binTo64(hash,SHA256_DIGEST_LENGTH,passwd_str,8);
+    		(v == 1) && cout << "passwd_str: " << passwd_str << endl;
+    		if(!badPassword(passwd_str))
+    			break;
+	    	fudge++;
+	    	memcpy(append,&fudge,sizeof fudge);
+	    	append[8]=0;
+	    	string b64Appendstr;
+	    	binTo64(append,8,b64Appendstr,12);
+	    	unsigned int found = b64Appendstr.find_first_of('=');
+	    	if(found != string::npos)
+	    		b64Appendstr = b64Appendstr.substr(0,found);
+	    	passwdnew = passwd0 + b64Appendstr;
+        }
+#ifdef Runtest
+		// Test
+		string testencode = "aX2t^%~Q\377\377\xef", outencode, escaped ;
+		escapeOutput(testencode,escaped);
+		binTo64((unsigned char *)testencode.c_str(),testencode.length(),outencode,testencode.length()*2);
+		cout << "TEST encode input: " << escaped << " Output: " <<
+				outencode << endl;
+#endif
+    }
+    cout << "pass=" << passwd_str << endl;
+
+    SHA256_Init(&sha256);
+    SHA256_Update(&sha256,passwd_str.c_str(),passwd_str.length());
+    SHA256_Final(hash, &sha256);
+
+    cout << setw(2) << setfill('0') << hex;
+    cout << "password_hash=";
+    for (int i=0; i < SHA256_DIGEST_LENGTH; i++)
+    	cout << (int)hash[i];
+    cout << endl;
+    cout << "salt=" << salt << endl;
+	return 0;
+}
-- 
cgit v1.2.3