From 542e7bf807caaabc300e529dbf4bb0457ad6c084 Mon Sep 17 00:00:00 2001
From: OutCast3k <OutCast3k@gmail.com>
Date: Thu, 8 Jan 2015 22:57:49 +0000
Subject: [PATCH] added the option to encrypt private keys using aes256

---
 index.html    | 30 +++++++++++++++++++++++++++++-
 js/coinbin.js | 17 +++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 3baaa5a..a83801e 100644
--- a/index.html
+++ b/index.html
@@ -21,6 +21,7 @@
 		<script type="text/javascript" src="js/crypto-sha256.js"></script>
 		<script type="text/javascript" src="js/crypto-sha256-hmac.js"></script>
 		<script type="text/javascript" src="js/ripemd160.js"></script>
+		<script type="text/javascript" src="js/aes.js"></script>
 
 		<script type="text/javascript" src="js/qrcode.js"></script>
 		<script type="text/javascript" src="js/jsbn.js"></script>
@@ -191,7 +192,7 @@
 							</span>
 						</div>
 
-						<label>Pubkey (Share)</label>
+						<label>Public key (Share)</label>
 						<input id="newPubKey" type="text" class="form-control" readonly>
 						<label>Private key (WIF key)</label>
 						<div class="input-group">
@@ -200,6 +201,12 @@
 								<button class="showKey btn btn-default" type="button">Show</button>
 							</span>
 						</div>
+
+						<div id="ase256wifkey" class="hidden">
+							<label>AES-256 Encrypted WIF key</label>
+							<input id="newPrivKeyEnc" type="text" class="form-control" value="" readonly>
+						</div>
+
 						<h3>Address Options</h3>
 						<p>You can use the advanced options below to generate different kind of keys and addresses.</p>
 						<div class="checkbox">
@@ -209,6 +216,27 @@
 							<label><input type="checkbox" id="newBrainwallet" class="checkbox-inline"> Custom Seed or Brain Wallet</label>
 							<input type="text" class="form-control hidden" id="brainwallet">
 						</div>
+
+						<div class="checkbox">
+							<label><input type="checkbox" id="encryptKey" class="checkbox-inline"> Encrypt Private Key with AES-256 Password</label>
+							<div id="aes256passform" class="row hidden">
+								<div class="col-md-6">
+									<input type="password" class="form-control" id="aes256pass" placeholder="Password"></label>
+								</div>
+								<div class="col-md-6">
+									<input type="password" class="form-control" id="aes256pass_confirm" placeholder="Confirm Password">
+								</div>
+							</div>
+
+							<div id="aes256passStatus" class="row hidden">
+								<div class="col-md-12">
+									<br>
+									<div class="alert alert-danger"> <span class="glyphicon glyphicon-exclamation-sign"></span> Your passwords do not match, please try again!</div>
+								</div>
+							</div>
+
+						</div>
+
 						<input type="button" class="btn btn-primary" value="Generate" id="newKeysBtn">
 						<br>
 					</div>
diff --git a/js/coinbin.js b/js/coinbin.js
index c77bee4..4833ce5 100644
--- a/js/coinbin.js
+++ b/js/coinbin.js
@@ -249,6 +249,15 @@ $(document).ready(function() {
 		$("#newBitcoinAddress").val(coin.address);
 		$("#newPubKey").val(coin.pubkey);
 		$("#newPrivKey").val(coin.wif);
+
+		/* encrypted key code */
+		if((!$("#encryptKey").is(":checked")) || $("#aes256pass").val()==$("#aes256pass_confirm").val()){
+			$("#aes256passStatus").addClass("hidden");
+		} else {
+			$("#aes256passStatus").removeClass("hidden");
+		}
+		$("#newPrivKeyEnc").val(CryptoJS.AES.encrypt(coin.wif, $("#aes256pass").val())+'');
+
 	});
 
 	$("#newBrainwallet").click(function(){
@@ -259,6 +268,14 @@ $(document).ready(function() {
 		}
 	});
 
+	$("#encryptKey").click(function(){
+		if($(this).is(":checked")){
+			$("#ase256wifkey, #aes256passform").removeClass("hidden");
+		} else {
+			$("#ase256wifkey, #aes256passform, #aes256passStatus").addClass("hidden");
+		}
+	});
+
 	/* new -> multisig code */
 
 	$("#newMultiSigAddress").click(function(){