Commit 90a2c48f authored by Stephane Glondu's avatar Stephane Glondu
Browse files

Use SHA256 everywhere and remove references to SHA1

parent bf9aff4b
......@@ -12,7 +12,6 @@ importScripts("js/jscrypto/jsbn.js",
"js/jscrypto/bigint.js",
"js/jscrypto/random.js",
"js/jscrypto/elgamal.js",
"js/jscrypto/sha1.js",
"js/jscrypto/sha2.js",
"js/jscrypto/helios.js");
......
......@@ -460,7 +460,7 @@ ElGamal.disjunctive_challenge_generator = function(id) { return function(commitm
// console.log(strings_to_hash);
// STRINGS = strings_to_hash;
return new BigInt(hex_sha1("prove|" + id + "|" + strings_to_hash.join(",")), 16);
return new BigInt(hex_sha256("prove|" + id + "|" + strings_to_hash.join(",")), 16);
}};
// same structure as above, adapted for (alpha, beta) pairs of
......
......@@ -70,7 +70,7 @@ HELIOS.EncryptedVote.prototype.doSignature = function(cred) {
var w = Random.getRandomInteger(pk.q);
var commitment = pk.g.modPow(w, pk.p);
var prefix = "sig|" + commitment.toJSONObject() + "|";
var challenge = (new BigInt(hex_sha1(prefix + _(this.encrypted_answers).map(function(ea) {
var challenge = (new BigInt(hex_sha256(prefix + _(this.encrypted_answers).map(function(ea) {
return ElGamal.stringify_choices(ea.choices);
}).join(",")), 16)).mod(pk.q);
// we do (q-x*challenge)+w instead of directly w-x*challenge,
......
/*
* A JavaScript implementation of the Secure Hash Algorithm, SHA-1, as defined
* in FIPS PUB 180-1
* Version 2.1a Copyright Paul Johnston 2000 - 2002.
* Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
* Distributed under the BSD License
* See http://pajhome.org.uk/crypt/md5 for details.
*/
/*
* Configurable variables. You may need to tweak these to be compatible with
* the server-side, but the defaults work in most cases.
*/
var hexcase = 0; /* hex output format. 0 - lowercase; 1 - uppercase */
var b64pad = ""; /* base-64 pad character. "=" for strict RFC compliance */
var chrsz = 8; /* bits per input character. 8 - ASCII; 16 - Unicode */
/*
* These are the functions you'll usually want to call
* They take string arguments and return either hex or base-64 encoded strings
*/
function hex_sha1(s){return binb2hex(core_sha1(str2binb(s),s.length * chrsz));}
function b64_sha1(s){return binb2b64(core_sha1(str2binb(s),s.length * chrsz));}
function str_sha1(s){return binb2str(core_sha1(str2binb(s),s.length * chrsz));}
function hex_hmac_sha1(key, data){ return binb2hex(core_hmac_sha1(key, data));}
function b64_hmac_sha1(key, data){ return binb2b64(core_hmac_sha1(key, data));}
function str_hmac_sha1(key, data){ return binb2str(core_hmac_sha1(key, data));}
/*
* Perform a simple self-test to see if the VM is working
*/
function sha1_vm_test()
{
return hex_sha1("abc") == "a9993e364706816aba3e25717850c26c9cd0d89d";
}
/*
* Calculate the SHA-1 of an array of big-endian words, and a bit length
*/
function core_sha1(x, len)
{
/* append padding */
x[len >> 5] |= 0x80 << (24 - len % 32);
x[((len + 64 >> 9) << 4) + 15] = len;
var w = Array(80);
var a = 1732584193;
var b = -271733879;
var c = -1732584194;
var d = 271733878;
var e = -1009589776;
for(var i = 0; i < x.length; i += 16)
{
var olda = a;
var oldb = b;
var oldc = c;
var oldd = d;
var olde = e;
for(var j = 0; j < 80; j++)
{
if(j < 16) w[j] = x[i + j];
else w[j] = rol(w[j-3] ^ w[j-8] ^ w[j-14] ^ w[j-16], 1);
var t = safe_add(safe_add(rol(a, 5), sha1_ft(j, b, c, d)),
safe_add(safe_add(e, w[j]), sha1_kt(j)));
e = d;
d = c;
c = rol(b, 30);
b = a;
a = t;
}
a = safe_add(a, olda);
b = safe_add(b, oldb);
c = safe_add(c, oldc);
d = safe_add(d, oldd);
e = safe_add(e, olde);
}
return Array(a, b, c, d, e);
}
/*
* Perform the appropriate triplet combination function for the current
* iteration
*/
function sha1_ft(t, b, c, d)
{
if(t < 20) return (b & c) | ((~b) & d);
if(t < 40) return b ^ c ^ d;
if(t < 60) return (b & c) | (b & d) | (c & d);
return b ^ c ^ d;
}
/*
* Determine the appropriate additive constant for the current iteration
*/
function sha1_kt(t)
{
return (t < 20) ? 1518500249 : (t < 40) ? 1859775393 :
(t < 60) ? -1894007588 : -899497514;
}
/*
* Calculate the HMAC-SHA1 of a key and some data
*/
function core_hmac_sha1(key, data)
{
var bkey = str2binb(key);
if(bkey.length > 16) bkey = core_sha1(bkey, key.length * chrsz);
var ipad = Array(16), opad = Array(16);
for(var i = 0; i < 16; i++)
{
ipad[i] = bkey[i] ^ 0x36363636;
opad[i] = bkey[i] ^ 0x5C5C5C5C;
}
var hash = core_sha1(ipad.concat(str2binb(data)), 512 + data.length * chrsz);
return core_sha1(opad.concat(hash), 512 + 160);
}
/*
* Add integers, wrapping at 2^32. This uses 16-bit operations internally
* to work around bugs in some JS interpreters.
*/
function safe_add(x, y)
{
var lsw = (x & 0xFFFF) + (y & 0xFFFF);
var msw = (x >> 16) + (y >> 16) + (lsw >> 16);
return (msw << 16) | (lsw & 0xFFFF);
}
/*
* Bitwise rotate a 32-bit number to the left.
*/
function rol(num, cnt)
{
return (num << cnt) | (num >>> (32 - cnt));
}
/*
* Convert an 8-bit or 16-bit string to an array of big-endian words
* In 8-bit function, characters >255 have their hi-byte silently ignored.
*/
function str2binb(str)
{
var bin = Array();
var mask = (1 << chrsz) - 1;
for(var i = 0; i < str.length * chrsz; i += chrsz)
bin[i>>5] |= (str.charCodeAt(i / chrsz) & mask) << (32 - chrsz - i%32);
return bin;
}
/*
* Convert an array of big-endian words to a string
*/
function binb2str(bin)
{
var str = "";
var mask = (1 << chrsz) - 1;
for(var i = 0; i < bin.length * 32; i += chrsz)
str += String.fromCharCode((bin[i>>5] >>> (32 - chrsz - i%32)) & mask);
return str;
}
/*
* Convert an array of big-endian words to a hex string.
*/
function binb2hex(binarray)
{
var hex_tab = hexcase ? "0123456789ABCDEF" : "0123456789abcdef";
var str = "";
for(var i = 0; i < binarray.length * 4; i++)
{
str += hex_tab.charAt((binarray[i>>2] >> ((3 - i%4)*8+4)) & 0xF) +
hex_tab.charAt((binarray[i>>2] >> ((3 - i%4)*8 )) & 0xF);
}
return str;
}
/*
* Convert an array of big-endian words to a base-64 string
*/
function binb2b64(binarray)
{
var tab = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
var str = "";
for(var i = 0; i < binarray.length * 4; i += 3)
{
var triplet = (((binarray[i >> 2] >> 8 * (3 - i %4)) & 0xFF) << 16)
| (((binarray[i+1 >> 2] >> 8 * (3 - (i+1)%4)) & 0xFF) << 8 )
| ((binarray[i+2 >> 2] >> 8 * (3 - (i+2)%4)) & 0xFF);
for(var j = 0; j < 4; j++)
{
if(i * 8 + j * 6 > binarray.length * 32) str += b64pad;
else str += tab.charAt((triplet >> 6*(3-j)) & 0x3F);
}
}
return str;
}
\ No newline at end of file
......@@ -5,6 +5,7 @@
*/
var chrsz = 8; /* bits per input character. 8 - ASCII; 16 - Unicode */
var hexcase = 0;/* hex output format. 0 - lowercase; 1 - uppercase */
var b64pad = ""; /* base-64 pad character. "=" for strict RFC compliance */
function safe_add (x, y) {
var lsw = (x & 0xFFFF) + (y & 0xFFFF);
......
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8" />
<title>Helios Voting System</title>
<link rel="stylesheet" type="text/css" href="css/booth.css" />
<link rel="stylesheet" type="text/css" href="css/forms.css" />
<script language="javascript" src="js/jscrypto/jsbn.js"></script>
<script language="javascript" src="js/jscrypto/jsbn2.js"></script>
<script language="javascript" src="js/jscrypto/sjcl.js"></script>
<script language="javascript" src="js/underscore-min.js"></script>
<script language="javascript" src="js/jquery-1.2.2.min.js"></script>
<script language="javascript" src="js/jquery-jtemplates.js"></script>
<script language="javascript" src="js/jquery.json.min.js"></script>
<script language="javascript" src="js/jquery.query-2.1.5.js"></script>
<script language="javascript">
// required for jscrypto library
var JSCRYPTO_HOME = document.location.pathname.replace("single-ballot-verify.html", "js/jscrypto");
</script>
<script language="javascript" src="js/jscrypto/class.js"></script>
<script language="javascript" src="js/jscrypto/bigint.js"></script>
<script language="javascript" src="js/jscrypto/random.js"></script>
<script language="javascript" src="js/jscrypto/elgamal.js"></script>
<script language="javascript" src="js/jscrypto/sha1.js"></script>
<script language="javascript" src="js/jscrypto/sha2.js"></script>
<script language="javascript" src="js/jscrypto/helios.js"></script>
<script language="javascript" src="verifier.js"></script>
</head>
<body>
<script language="javascript">
$(document).ready(function() {
BigInt.setup(function() {
$('#verifier_loading').hide();
if (BigInt.is_dummy) {
$('#dummy_bigint').show();
return;
}
$('#verifier').show();
var election_url = $.query.get('election_url');
$('#election_url').val(election_url);
}, function() {
$('#dummy_bigint').show();
});
});
function result_append(str) {
$('#results').append(str).append("<br />");
}
function verify_single_ballot(election_url, audit_trail) {
var encrypted_vote_json = jQuery.secureEvalJSON(audit_trail);
result_append("loading election...");
// quick and dirty detection of cast ballot
if (encrypted_vote_json['cast_at']) {
result_append("\n\nIt looks like you are trying to verify a cast ballot. That can't be done, only audited ballots can be verified.");
return;
}
$('#loading').show();
var after_computation = function(overall_result) {
result_append("<br />");
$('#loading').hide();
if (overall_result) {
result_append('SUCCESSFUL VERIFICATION, DONE!');
} else {
result_append('PROBLEM - THIS BALLOT DOES NOT VERIFY.');
}
};
// the hash will be computed within the setup function call now
$.ajax({url: election_url, success: function(raw_json) {
if (window.Worker) {
var verifier_worker = new window.Worker("verifierworker.js");
verifier_worker.onmessage = function(event) {
if (event.data.type == 'log')
return console.log(event.data.msg);
if (event.data.type == 'status')
return result_append(event.data.msg);
if (event.data.type == 'result')
return after_computation(event.data.result);
};
verifier_worker.postMessage({'type':'verify', 'election':raw_json, 'vote':encrypted_vote_json});
} else {
var overall_result = verify_ballot(raw_json, encrypted_vote_json, result_append);
after_computation(overall_result);
}
}, error: function() {
result_append('PROBLEM LOADING election. Are you sure you have the right election URL?<br />');
$('#loading').hide();
result_append('PROBLEM - THIS BALLOT DOES NOT VERIFY.');
}
});
}
</script>
</head>
<body>
<div id="wrapper">
<div id="banner">
Helios Single-Ballot Verifier
</div>
<div id="content">
<div id="verifier_loading">
Loading verifier...
</div>
<div id="dummy_bigint" style="display:none;">
Your browser does not have the Java plugin installed.<br /><br />
At this time, the Java plugin is required for browser-based ballot auditing, although it is not required for ballot preparation.
</div>
<div id="verifier" style="display:none;">
<p style="font-size: 16pt;">
This single-ballot verifier lets you enter an audited ballot<br />and verify that it was prepared correctly.
</p>
<form onsubmit="try {verify_single_ballot(this.election_url.value, this.audit_trail.value);} catch (e) {E = e;} return false;">
Enter the Election URL:
<input type="text" size="50" name="election_url" id="election_url" /><br />
<p>
Your Ballot:
</p>
<textarea name="audit_trail" cols="80" rows="7">
</textarea><br /><br />
<input type="submit" class="pretty" value="Verify" />
</form>
<br /><br />
<div id="results">
</div>
<img id="loading" src="loading.gif" style="display:none;" />
</div>
</div>
</div>
<div id="applet_div">
</div>
</body>
</html>
/*
* JavaScript HTML 5 Worker for BOOTH
*/
// import needed resources
importScripts("js/underscore-min.js");
importScripts("js/jscrypto/jsbn.js",
"js/jscrypto/jsbn2.js",
"js/jscrypto/sjcl.js",
"js/jscrypto/class.js",
"js/jscrypto/bigint.js",
"js/jscrypto/random.js",
"js/jscrypto/elgamal.js",
"js/jscrypto/sha1.js",
"js/jscrypto/sha2.js",
"js/jscrypto/helios.js",
"verifier.js");
var console = {
'log' : function(msg) {
self.postMessage({'type':'log','msg':msg});
}
};
var status_update = function(msg) {
self.postMessage({'type' : 'status', 'msg' : msg});
};
var ELECTION = null;
var VOTE = null;
function do_verify(message) {
console.log("verifying!");
// json string
ELECTION = message.election;
// json object
VOTE = message.vote;
var result = verify_ballot(ELECTION, VOTE, status_update);
// send the result back
self.postMessage({
'type': 'result',
'result': result});
}
// receive either
// a) an election and an integer position of the question
// that this worker will be used to encrypt
// {'type': 'setup', 'question_num' : 2, 'election' : election_json}
//
// b) an answer that needs encrypting
// {'type': 'encrypt', 'answer' : answer_json}
//
self.onmessage = function(event) {
// dispatch to method
self['do_' + event.data.type](event.data);
}
......@@ -27,7 +27,6 @@
<script language="javascript" src="js/jscrypto/bigint.dummy.js"></script>-->
<script language="javascript" src="js/jscrypto/random.js"></script>
<script language="javascript" src="js/jscrypto/elgamal.js?d=20111004"></script>
<script language="javascript" src="js/jscrypto/sha1.js"></script>
<script language="javascript" src="js/jscrypto/sha2.js"></script>
<script language="javascript" src="js/jscrypto/helios.js?d=20111004"></script>
<script language="javascript" src="js/jscrypto/heliosc-booth.js?d=20130201"></script>
......
......@@ -6,12 +6,6 @@ open Signatures
let check_modulo p x = Z.(geq x zero && lt x p)
let hashZ x = Cryptokit.(x |>
hash_string (Hash.sha1 ()) |>
transform_string (Hexa.encode ()) |>
Z.of_string_base 16
)
let map_and_concat_with_commas f xs =
let n = Array.length xs in
let res = Buffer.create (n * 1024) in
......@@ -45,7 +39,9 @@ let finite_field ~p ~q ~g =
let check x = check_modulo p x && x **~ q =~ one
let to_string = Z.to_string
let hash prefix xs =
hashZ (prefix ^ (map_and_concat_with_commas Z.to_string xs))
let x = prefix ^ (map_and_concat_with_commas Z.to_string xs) in
let z = Z.of_string_base 16 (sha256_hex x) in
Z.(z mod q)
let compare = Z.compare
end in (module G : GROUP with type t = Z.t)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment