[she] add remove old pages

dev
MITSUNARI Shigeo 7 years ago
parent 07addb0e37
commit 99dae4167e
  1. 11
      Makefile
  2. 87
      docs/demo/pairing.html
  3. 306
      docs/demo/pairing.js
  4. 2
      ffi/js/export-functions.py
  5. 2
      ffi/js/she-re.txt
  6. 1
      readme.md

@ -207,8 +207,9 @@ test: $(TEST_EXE)
EXPORTED_SHE_JS=docs/demo/exported-she.js EXPORTED_SHE_JS=docs/demo/exported-she.js
SHE_TXT=ffi/js/she.txt SHE_TXT=ffi/js/she.txt
EXPORT_OPT=-re ffi/js/she-re.txt SHE_RE_TXT=ffi/js/she-re.txt
$(SHE_TXT): ./include/mcl/she.h EXPORT_OPT=-re $(SHE_RE_TXT)
$(SHE_TXT): ./include/mcl/she.h $(SHE_RE_TXT)
python ffi/js/export-functions.py $(EXPORT_OPT) $< > $@ python ffi/js/export-functions.py $(EXPORT_OPT) $< > $@
$(EXPORTED_SHE_JS): ./include/mcl/she.h $(EXPORTED_SHE_JS): ./include/mcl/she.h
@ -222,8 +223,12 @@ docs/demo/mclshe.js: src/fp.cpp src/she_c256.cpp $(SHE_TXT) $(EXPORTED_SHE_JS)
demo: demo:
$(MAKE) docs/demo/mclshe.js $(MAKE) docs/demo/mclshe.js
clean_demo:
$(RM) $(EXPORTED_SHE_JS) $(SHE_TXT) docs/demo/mclshe.js docs/demo/mclshe.wasm
clean: clean:
$(RM) $(MCL_LIB) $(MCL_SLIB) $(BN256_LIB) $(BN256_SLIB) $(BN384_LIB) $(BN384_SLIB) $(OBJ_DIR)/*.o $(OBJ_DIR)/*.d $(EXE_DIR)/*.exe $(GEN_EXE) $(ASM_OBJ) $(LIB_OBJ) $(BN256_OBJ) $(BN384_OBJ) $(LLVM_SRC) $(FUNC_LIST) src/*.ll $(EXPORTED_SHE_JS) $(SHE_TXT) docs/demo/mclshe.js docs/demo/mclshe.wasm $(MAKE) clean_demo
$(RM) $(MCL_LIB) $(MCL_SLIB) $(BN256_LIB) $(BN256_SLIB) $(BN384_LIB) $(BN384_SLIB) $(OBJ_DIR)/*.o $(OBJ_DIR)/*.d $(EXE_DIR)/*.exe $(GEN_EXE) $(ASM_OBJ) $(LIB_OBJ) $(BN256_OBJ) $(BN384_OBJ) $(LLVM_SRC) $(FUNC_LIST) src/*.ll
ALL_SRC=$(SRC_SRC) $(TEST_SRC) $(SAMPLE_SRC) ALL_SRC=$(SRC_SRC) $(TEST_SRC) $(SAMPLE_SRC)
DEPEND_FILE=$(addprefix $(OBJ_DIR)/, $(addsuffix .d,$(basename $(ALL_SRC)))) DEPEND_FILE=$(addprefix $(OBJ_DIR)/, $(addsuffix .d,$(basename $(ALL_SRC))))

@ -1,87 +0,0 @@
<!DOCTYPE html>
<html lang="ja">
<head>
<meta charset="UTF-8">
<title>pairing sample</title>
<script type='text/javascript' src="./mclbn.js"></script>
<script type='text/javascript' src="./exported-mcl.js"></script>
<script type='text/javascript' src="./pairing.js"></script>
</script>
</head>
<body>
<h1>
See <a href="https://herumi.github.io/bls/demo/bls.html">BLS signature demo</a>. This page is obsolete.
</h1>
<div>
library status <span name="status">initializing...</span>
</div>
<h2>optimal Ate pairing over 256-bit BN curve</h2>
<button type="text" onclick="TestPairing()">test Pairing</button>
<div>pairing time : <span name="time_pairing">0</span>msec</div>
<div>G1 scalar mul : <span name="time_g1mul">0</span>msec</div>
<div>G2 scalar mul : <span name="time_g2mul">0</span>msec</div>
<hr>
<div>
a = <input type="text" name="a" value="3"><br>
b = <input type="text" name="b" value="4"><br>
ab = <span name="ab">0</span><br>
</div>
<div>
P = hashAndMapToG1(<input type="text" name="hash_P" value="abc">) = <span name="P">0</span><br>
Q = hashAndMapToG2(<input type="text" name="hash_Q" value="def">) = <span name="Q">0</span><br>
aP = <span name="aP">0</span><br>
bQ = <span name="bQ">0</span><br>
</div>
<hr>
<div>
e(P, Q) = <span name="ePQ">0</span><br>
e(aP, bQ) = <span name="eaPbQ">0</span><br>
e(P, Q)^ab = <span name="ePQab">0</span><br>
</div>
<hr>
<div>
e(aP, bQ) == e(P, Q)^ab is <span name="verify_pairing"></span>
</div>
<h2>Fr</h2>
<button type="text" onclick="TestFr()">test Fr</button>
<div>
x = <input type="text" name="x" value="0" size="100">
<button type="text" onclick="rand('x')">rand x</button><br>
y = <input type="text" name="y" value="0" size="100">
<button type="text" onclick="rand('y')">rand y</button>
</div>
<div>
x + y = <span name="ret_add"></span><br>
x - y = <span name="ret_sub"></span><br>
x * y = <span name="ret_mul"></span><br>
x / y = <span name="ret_div"></span><br>
</div>
<div>
hash(<input type="text" name="hash_x" value="">) = <span name="ret_hash_x"></span>
</div>
<h2>G1</h2>
<button type="text" onclick="TestG1()">test G1</button>
<div>
P1 = hashAndMapToG1(<input type="text" name="hash_P1" value="a">) = <span name="P1">0</span><br>
P2 = hashAndMapToG1(<input type="text" name="hash_P2" value="b">) = <span name="P2">0</span><br>
</div>
<hr>
<div>
P1 + P2 = <span name="P1addP2"></span><br>
P1 - P2 = <span name="P1subP2"></span><br>
P1 * x = <span name="P1mulx"></span><br>
</div>
<h2>G2</h2>
<button type="text" onclick="TestG2()">test G2</button>
<div>
Q1 = hashAndMapToG2(<input type="text" name="hash_Q1" value="a">) = <span name="Q1">0</span><br>
Q2 = hashAndMapToG2(<input type="text" name="hash_Q2" value="b">) = <span name="Q2">0</span><br>
</div>
<hr>
<div>
Q1 + Q2 = <span name="Q1addQ2"></span><br>
Q1 - Q2 = <span name="Q1subQ2"></span><br>
Q1 * x = <span name="Q1mulx"></span><br>
</div>
</body>
</html>

@ -1,306 +0,0 @@
function getValue(name) { return document.getElementsByName(name)[0].value }
function setValue(name, val) { document.getElementsByName(name)[0].value = val }
function getText(name) { return document.getElementsByName(name)[0].innerText }
function setText(name, val) { document.getElementsByName(name)[0].innerText = val }
function setupWasm(fileName, nameSpace, setupFct) {
console.log('setupWasm ' + fileName)
var mod = {}
fetch(fileName)
.then(response => response.arrayBuffer())
.then(buffer => new Uint8Array(buffer))
.then(binary => {
mod['wasmBinary'] = binary
mod['onRuntimeInitialized'] = function() {
setupFct(mod, nameSpace)
console.log('setupWasm end')
}
Module(mod)
})
return mod
}
var MCLBN_FP_UNIT_SIZE = 4
var module = setupWasm('mclbn.wasm', null, function(mod, ns) {
define_exported_mcl(mod)
define_extra_functions(mod)
var r = mclBn_init(0)
setText('status', r ? 'err:' + r : 'ok')
})
function define_extra_functions(mod) {
gen_setStr = function(func) {
return function(x, buf, ioMode) {
if (ioMode == null) { ioMode = 0 }
var stack = mod.Runtime.stackSave()
var pos = mod.Runtime.stackAlloc(buf.length)
for (var i = 0; i < buf.length; i++) {
mod.HEAP8[pos + i] = buf.charCodeAt(i)
}
r = func(x, pos, buf.length, ioMode)
mod.Runtime.stackRestore(stack)
if (r) console.log('err gen_setStr ' + r)
}
}
gen_getStr = function(func) {
return function(x, ioMode) {
if (ioMode == null) { ioMode = 0 }
var maxBufSize = 2048
var stack = mod.Runtime.stackSave()
var pos = mod.Runtime.stackAlloc(maxBufSize)
var n = func(pos, maxBufSize, x, ioMode)
if (n < 0) {
console.log('err gen_getStr')
return ''
}
var s = ''
for (var i = 0; i < n; i++) {
s += String.fromCharCode(mod.HEAP8[pos + i])
}
mod.Runtime.stackRestore(stack)
return s
}
}
gen_deserialize = function(func) {
return function(x, buf) {
var stack = mod.Runtime.stackSave()
var pos = mod.Runtime.stackAlloc(buf.length)
if (typeof(buf) == "string") {
for (var i = 0; i < buf.length; i++) {
mod.HEAP8[pos + i] = buf.charCodeAt(i)
}
} else {
for (var i = 0; i < buf.length; i++) {
mod.HEAP8[pos + i] = buf[i]
}
}
r = func(x, pos, buf.length)
mod.Runtime.stackRestore(stack)
if (r) console.log('err gen_deserialize ' + r)
}
}
gen_serialize = function(func) {
return function(x) {
var maxBufSize = 2048
var stack = mod.Runtime.stackSave()
var pos = mod.Runtime.stackAlloc(maxBufSize)
var n = func(pos, maxBufSize, x)
if (n < 0) {
console.log('err gen_serialize')
return ''
}
var a = new Uint8Array(n)
for (var i = 0; i < n; i++) {
a[i] = mod.HEAP8[pos + i]
}
mod.Runtime.stackRestore(stack)
return a
}
}
///////////////////////////////////////////////////////////////
mclBn_init = function(curveType) {
_mclBn_init(curveType, MCLBN_FP_UNIT_SIZE)
}
mclBnFr_malloc = function() {
return mod._malloc(MCLBN_FP_UNIT_SIZE * 8)
}
mclBnFr_free = function(x) {
mod._free(x)
}
mclBnFr_deserialize = gen_deserialize(_mclBnFr_deserialize)
mclBnFr_setLittleEndian = gen_deserialize(_mclBnFr_setLittleEndian)
mclBnFr_setStr = gen_setStr(_mclBnFr_setStr)
mclBnFr_getStr = gen_getStr(_mclBnFr_getStr)
mclBnFr_setHashOf = gen_deserialize(_mclBnFr_setHashOf)
///////////////////////////////////////////////////////////////
mclBnG1_malloc = function() {
return mod._malloc(MCLBN_FP_UNIT_SIZE * 8 * 3)
}
mclBnG1_free = function(x) {
mod._free(x)
}
mclBnG1_setStr = gen_setStr(_mclBnG1_setStr)
mclBnG1_getStr = gen_getStr(_mclBnG1_getStr)
mclBnG1_deserialize = gen_deserialize(_mclBnG1_deserialize)
mclBnG1_serialize = gen_serialize(_mclBnG1_serialize)
mclBnG1_hashAndMapTo = gen_deserialize(_mclBnG1_hashAndMapTo)
///////////////////////////////////////////////////////////////
mclBnG2_malloc = function() {
return mod._malloc(MCLBN_FP_UNIT_SIZE * 8 * 2 * 3)
}
mclBnG2_free = function(x) {
mod._free(x)
}
mclBnG2_setStr = gen_setStr(_mclBnG2_setStr)
mclBnG2_getStr = gen_getStr(_mclBnG2_getStr)
mclBnG2_deserialize = gen_deserialize(_mclBnG2_deserialize)
mclBnG2_serialize = gen_serialize(_mclBnG2_serialize)
mclBnG2_hashAndMapTo = gen_deserialize(_mclBnG2_hashAndMapTo)
///////////////////////////////////////////////////////////////
mclBnGT_malloc = function() {
return mod._malloc(MCLBN_FP_UNIT_SIZE * 8 * 12)
}
mclBnGT_free = function(x) {
mod._free(x)
}
mclBnGT_deserialize = gen_deserialize(_mclBnGT_deserialize)
mclBnGT_serialize = gen_serialize(_mclBnGT_serialize)
mclBnGT_setStr = gen_setStr(_mclBnGT_setStr)
mclBnGT_getStr = gen_getStr(_mclBnGT_getStr)
}
function rand(val) {
var x = mclBnFr_malloc()
mclBnFr_setByCSPRNG(x)
setValue(val, mclBnFr_getStr(x))
mclBnFr_free(x)
}
function TestFr() {
var x = mclBnFr_malloc()
var y = mclBnFr_malloc()
var z = mclBnFr_malloc()
mclBnFr_setStr(x, getValue('x'))
// mclBnFr_setInt(x, getValue('x') | 0)
mclBnFr_setStr(y, getValue('y'))
mclBnFr_add(z, x, y)
setText('ret_add', mclBnFr_getStr(z))
mclBnFr_sub(z, x, y)
setText('ret_sub', mclBnFr_getStr(z))
mclBnFr_mul(z, x, y)
setText('ret_mul', mclBnFr_getStr(z))
if (!mclBnFr_isZero(y)) {
mclBnFr_div(z, x, y)
setText('ret_div', mclBnFr_getStr(z))
} else {
setText('ret_div', 'err : y is zero')
}
mclBnFr_setHashOf(x, getValue('hash_x'))
setText('ret_hash_x', mclBnFr_getStr(x))
mclBnFr_free(x)
mclBnFr_free(y)
mclBnFr_free(z)
}
function TestG1() {
var P1 = mclBnG1_malloc()
var P2 = mclBnG1_malloc()
var P3 = mclBnG1_malloc()
var x = mclBnFr_malloc()
mclBnG1_hashAndMapTo(P1, getValue('hash_P1'))
setText('P1', mclBnG1_getStr(P1))
mclBnG1_hashAndMapTo(P2, getValue('hash_P2'))
setText('P2', mclBnG1_getStr(P2))
mclBnG1_add(P3, P1, P2)
setText('P1addP2', mclBnG1_getStr(P3))
mclBnG1_sub(P3, P1, P2)
setText('P1subP2', mclBnG1_getStr(P3))
mclBnFr_setStr(x, getValue('x'))
mclBnG1_mul(P3, P1, x)
setText('P1mulx', mclBnG1_getStr(P3))
mclBnFr_free(x)
mclBnG1_free(P1)
mclBnG1_free(P2)
mclBnG1_free(P3)
}
function TestG2() {
var Q1 = mclBnG2_malloc()
var Q2 = mclBnG2_malloc()
var Q3 = mclBnG2_malloc()
var x = mclBnFr_malloc()
mclBnG2_hashAndMapTo(Q1, getValue('hash_Q1'))
setText('Q1', mclBnG2_getStr(Q1))
mclBnG2_hashAndMapTo(Q2, getValue('hash_Q2'))
setText('Q2', mclBnG2_getStr(Q2))
mclBnG2_add(Q3, Q1, Q2)
setText('Q1addQ2', mclBnG2_getStr(Q3))
mclBnG2_sub(Q3, Q1, Q2)
setText('Q1subQ2', mclBnG2_getStr(Q3))
mclBnFr_setStr(x, getValue('x'))
mclBnG2_mul(Q3, Q1, x)
setText('Q1mulx', mclBnG2_getStr(Q3))
mclBnFr_free(x)
mclBnG2_free(Q1)
mclBnG2_free(Q2)
mclBnG2_free(Q3)
}
function bench(label, count, func) {
var start = Date.now()
for (var i = 0; i < count; i++) {
func()
}
var end = Date.now()
var t = (end - start) / count
setText(label, t)
}
function TestPairing() {
var a = mclBnFr_malloc()
var b = mclBnFr_malloc()
var ab = mclBnFr_malloc()
var P = mclBnG1_malloc()
var aP = mclBnG1_malloc()
var Q = mclBnG2_malloc()
var bQ = mclBnG2_malloc()
var e1 = mclBnGT_malloc()
var e2 = mclBnGT_malloc()
mclBnFr_setStr(a, getValue('a'))
mclBnFr_setStr(b, getValue('b'))
mclBnFr_mul(ab, a, b)
setText('ab', mclBnFr_getStr(ab))
mclBnG1_hashAndMapTo(P, getValue('hash_P'))
setText('P', mclBnG1_getStr(P))
mclBnG2_hashAndMapTo(Q, getValue('hash_Q'))
setText('Q', mclBnG2_getStr(Q))
mclBnG1_mul(aP, P, a)
setText('aP', mclBnG1_getStr(aP))
mclBnG2_mul(bQ, Q, b)
setText('bQ', mclBnG2_getStr(bQ))
mclBn_pairing(e1, P, Q);
setText('ePQ', mclBnGT_getStr(e1))
mclBn_pairing(e2, aP, bQ);
setText('eaPbQ', mclBnGT_getStr(e2))
mclBnGT_pow(e1, e1, ab)
setText('ePQab', mclBnGT_getStr(e1))
setText('verify_pairing', !!mclBnGT_isEqual(e1, e2))
bench('time_pairing', 50, () => mclBn_pairing(e1, P, Q))
mclBnFr_setByCSPRNG(a)
bench('time_g1mul', 50, () => mclBnG1_mulCT(aP, P, a))
bench('time_g2mul', 50, () => mclBnG2_mulCT(bQ, Q, a))
mclBnGT_free(e2)
mclBnGT_free(e1)
mclBnG2_free(bQ)
mclBnG2_free(Q)
mclBnG1_free(aP)
mclBnG1_free(P)
mclBnFr_free(ab)
mclBnFr_free(b)
mclBnFr_free(a)
}

@ -45,10 +45,8 @@ def main():
reToAddUnderscore = '' reToAddUnderscore = ''
if args.re: if args.re:
reToAddUnderscore = open(args.re).read().strip() reToAddUnderscore = open(args.re).read().strip()
print 'RE', reToAddUnderscore
export_functions(args.js, args.header, reToAddUnderscore) export_functions(args.js, args.header, reToAddUnderscore)
if __name__ == '__main__': if __name__ == '__main__':
main() main()

@ -1 +1 @@
sheInit|erialize|Str sheInit|erialize|Str|sheDec

@ -95,7 +95,6 @@ msbuild mcl.sln /p:Configuration=Release /m
## Build for WASM(WebAssembly) (experimental) ## Build for WASM(WebAssembly) (experimental)
mcl supports emcc (Emscripten) and `test/bn_test.cpp` runs on browers such as Firefox, Chrome and Edge(enable extended JavaScript at about:config). mcl supports emcc (Emscripten) and `test/bn_test.cpp` runs on browers such as Firefox, Chrome and Edge(enable extended JavaScript at about:config).
* [pairing on brower](http://herumi.github.io/mcl/demo/pairing.html)
* [BLS signature on brower](http://herumi.github.io/bls/demo/bls.html) * [BLS signature on brower](http://herumi.github.io/bls/demo/bls.html)

Loading…
Cancel
Save