rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ENHANCED: Eliminate the OpenSSL dependency of library(crypto).

Browse Source 
This is achieved by using the newly available crrl crate by @pornin
to implement crypto_curve_scalar_mult/4 for secp256k1. Many thanks!
This commit is contained in:
Markus Triska
2022-09-03 13:30:57 +02:00
committed by Mark Thom
parent 1109e05e06
commit 9c1de8e00b
5 changed files with 130 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/lib/crypto.pl
View File

@@ -763,10 +763,14 @@ crypto_curve_scalar_mult(Curve, Scalar, point(X,Y), point(RX, RY)) :-
curve_field_length(Curve, L0),
L #= 2*L0, % for hex encoding
phrase(format_("04~|~`0t~16r~*+~`0t~16r~*+", [X,L,Y,L]), Hex),
hex_bytes(Hex, Bytes),
'$crypto_curve_scalar_mult'(Name, Scalar, Bytes, SX, SY),
number_chars(RX, SX),
number_chars(RY, SY).
hex_bytes(Hex, PointBytes),
once(bytes_integer(ScalarBytes, Scalar)),
'$crypto_curve_scalar_mult'(Name, ScalarBytes, PointBytes, [_|Us]),
maplist(char_code, Us, Bs),
length(BXs0, 32),
append(BXs0, BYs0, Bs),
maplist(reverse, [BXs0,BYs0], Rs),
maplist(bytes_integer, Rs, [RX,RY]).
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
?- crypto_name_curve(secp256k1, Curve),
@@ -818,16 +822,6 @@ fitting_exponent(N, E0, E) :-
fitting_exponent(N, E1, E)
).
crypto_name_curve(secp112r1,
curve(secp112r1,
0x00db7c2abf62e35e668076bead208b,
0x00db7c2abf62e35e668076bead2088,
0x659ef8ba043916eede8911702b22,
point(0x09487239995a5ee76b55f9c2f098,
0xa89ce5af8724c0a23e0e0ff77500),
0x00db7c2abf62e35e7628dfac6561c5,
14,
1)).
crypto_name_curve(secp256k1,
curve(secp256k1,
0x00fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f,

70
src/machine/system_calls.rs
View File

@@ -69,9 +69,7 @@ use ring::{
use ripemd160::{Digest, Ripemd160};
use sha3::{Sha3_224, Sha3_256, Sha3_384, Sha3_512};
use openssl::bn::{BigNum, BigNumContext};
use openssl::ec::{EcGroup, EcPoint};
use openssl::nid::Nid;
use crrl::secp256k1;
use sodiumoxide::crypto::scalarmult::curve25519::*;
@@ -6348,60 +6346,26 @@ impl Machine {
#[inline(always)]
pub(crate) fn crypto_curve_scalar_mult(&mut self) {
let curve = cell_as_atom!(self.machine_st.registers[1]);
let curve_id = match curve {
atom!("secp112r1") => Nid::SECP112R1,
atom!("secp256k1") => Nid::SECP256K1,
_ => {
unreachable!()
let stub_gen = || functor_stub(atom!("crypto_curve_scalar_mult"), 4);
let scalar_bytes = self.machine_st.integers_to_bytevec(self.machine_st.registers[2], stub_gen);
let point_bytes = self.machine_st.integers_to_bytevec(self.machine_st.registers[3], stub_gen);
let mut point = secp256k1::Point::decode(&point_bytes).unwrap();
let scalar = secp256k1::Scalar::decode_reduce(&scalar_bytes);
point *= scalar;
let uncompressed = {
let buffer = String::from_iter(point.encode_uncompressed().iter().map(|b| *b as char));
if buffer.len() == 0 {
empty_list_as_cell!()
} else {
atom_as_cstr_cell!(self.machine_st.atom_tbl.build_with(&buffer))
}
};
let scalar = self.machine_st.store(self.machine_st.deref(self.machine_st.registers[2]));
let scalar = match Number::try_from(scalar) {
Ok(Number::Fixnum(n)) => Integer::from(n.get_num()),
Ok(Number::Integer(n)) => Integer::from(&*n),
_ => {
unreachable!()
}
};
let stub_gen = || functor_stub(atom!("crypto_curve_scalar_mult"), 5);
let qbytes = self.machine_st.integers_to_bytevec(self.machine_st.registers[3], stub_gen);
let mut bnctx = BigNumContext::new().unwrap();
let group = EcGroup::from_curve_name(curve_id).unwrap();
let mut point = EcPoint::from_bytes(&group, &qbytes, &mut bnctx).unwrap();
let scalar_bn = BigNum::from_dec_str(&scalar.to_string()).unwrap();
let mut result = EcPoint::new(&group).unwrap();
result.mul(&group, &mut point, &scalar_bn, &mut bnctx).ok();
let mut rx = BigNum::new().unwrap();
let mut ry = BigNum::new().unwrap();
result
.affine_coordinates_gfp(&group, &mut rx, &mut ry, &mut bnctx)
.ok();
let sx = rx.to_dec_str().unwrap();
let sx = if sx.len() == 0 {
empty_list_as_cell!()
} else {
atom_as_cstr_cell!(self.machine_st.atom_tbl.build_with(&sx))
};
let sy = ry.to_dec_str().unwrap();
let sy = if sy.len() == 0 {
empty_list_as_cell!()
} else {
atom_as_cstr_cell!(self.machine_st.atom_tbl.build_with(&sy))
};
unify!(self.machine_st, self.machine_st.registers[4], sx);
unify!(self.machine_st, self.machine_st.registers[5], sy);
unify!(self.machine_st, self.machine_st.registers[4], uncompressed);
}
#[inline(always)]