mirror of https://github.com/arendst/Tasmota.git
Merge pull request #13015 from s-hadinger/ec25519
Berry support for Curve 25519 EC crypto
This commit is contained in:
s-hadinger
GitHub
commit
64ae135043
|
|
@ -12,6 +12,7 @@ All notable changes to this project will be documented in this file.
|
|||
- Support for Hydreon RG-15 Solid State Rain sensor (#12974)
|
||||
- Support for IKEA VINDRIKTNING particle concentration sensor (#12976)
|
||||
- Commands ``SwitchMode 17`` PushHoldMultiDelay and ``SwitchMode 18`` PushHoldMultiDelayInverted adding delayed single press event (#12973)
|
||||
- Berry support for Curve 25519 EC crypto
|
||||
|
||||
### Changed
|
||||
- Shelly EM template needs to use GPIO ADE7953_IRQ_2
|
||||
|
|
|
|||
|
|
@ -1,398 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2017 Thomas Pornin <pornin@bolet.org>
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining
|
||||
* a copy of this software and associated documentation files (the
|
||||
* "Software"), to deal in the Software without restriction, including
|
||||
* without limitation the rights to use, copy, modify, merge, publish,
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be
|
||||
* included in all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
||||
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
||||
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
#include "t_inner.h"
|
||||
|
||||
/*
|
||||
* Parameters for the field:
|
||||
* - field modulus p = 2^255-19
|
||||
* - R^2 mod p (R = 2^(15k) for the smallest k such that R >= p)
|
||||
*/
|
||||
|
||||
static const uint16_t C255_P[] = {
|
||||
0x0110,
|
||||
0x7FED, 0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF,
|
||||
0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF,
|
||||
0x7FFF
|
||||
};
|
||||
|
||||
#define P0I 0x4A1B
|
||||
|
||||
static const uint16_t C255_R2[] = {
|
||||
0x0110,
|
||||
0x0169, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
|
||||
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
|
||||
0x0000
|
||||
};
|
||||
|
||||
/* obsolete
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
static void
|
||||
print_int_mont(const char *name, const uint16_t *x)
|
||||
{
|
||||
uint16_t y[18];
|
||||
unsigned char tmp[32];
|
||||
size_t u;
|
||||
|
||||
printf("%s = ", name);
|
||||
memcpy(y, x, sizeof y);
|
||||
br_i15_from_monty(y, C255_P, P0I);
|
||||
br_i15_encode(tmp, sizeof tmp, y);
|
||||
for (u = 0; u < sizeof tmp; u ++) {
|
||||
printf("%02X", tmp[u]);
|
||||
}
|
||||
printf("\n");
|
||||
}
|
||||
*/
|
||||
|
||||
static const uint16_t C255_A24[] = {
|
||||
0x0110,
|
||||
0x45D3, 0x0046, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
|
||||
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
|
||||
0x0000
|
||||
};
|
||||
|
||||
static const unsigned char GEN[] PROGMEM = {
|
||||
0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
};
|
||||
|
||||
static const unsigned char ORDER[] PROGMEM = {
|
||||
0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
|
||||
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
|
||||
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
|
||||
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
|
||||
};
|
||||
|
||||
static const unsigned char *
|
||||
api_generator(int curve, size_t *len)
|
||||
{
|
||||
(void)curve;
|
||||
*len = 32;
|
||||
return GEN;
|
||||
}
|
||||
|
||||
static const unsigned char *
|
||||
api_order(int curve, size_t *len)
|
||||
{
|
||||
(void)curve;
|
||||
*len = 32;
|
||||
return ORDER;
|
||||
}
|
||||
|
||||
static size_t
|
||||
api_xoff(int curve, size_t *len)
|
||||
{
|
||||
(void)curve;
|
||||
*len = 32;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void
|
||||
cswap(uint16_t *a, uint16_t *b, uint32_t ctl)
|
||||
{
|
||||
int i;
|
||||
|
||||
ctl = -ctl;
|
||||
for (i = 0; i < 18; i ++) {
|
||||
uint32_t aw, bw, tw;
|
||||
|
||||
aw = a[i];
|
||||
bw = b[i];
|
||||
tw = ctl & (aw ^ bw);
|
||||
a[i] = aw ^ tw;
|
||||
b[i] = bw ^ tw;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
c255_add(uint16_t *d, const uint16_t *a, const uint16_t *b)
|
||||
{
|
||||
uint32_t ctl;
|
||||
uint16_t t[18];
|
||||
|
||||
memcpy_P(t, a, sizeof t);
|
||||
ctl = br_i15_add(t, b, 1);
|
||||
ctl |= NOT(br_i15_sub(t, C255_P, 0));
|
||||
br_i15_sub(t, C255_P, ctl);
|
||||
memcpy(d, t, sizeof t);
|
||||
}
|
||||
|
||||
static void
|
||||
c255_sub(uint16_t *d, const uint16_t *a, const uint16_t *b)
|
||||
{
|
||||
uint16_t t[18];
|
||||
|
||||
memcpy_P(t, a, sizeof t);
|
||||
br_i15_add(t, C255_P, br_i15_sub(t, b, 1));
|
||||
memcpy(d, t, sizeof t);
|
||||
}
|
||||
|
||||
static void
|
||||
c255_mul(uint16_t *d, const uint16_t *a, const uint16_t *b)
|
||||
{
|
||||
uint16_t t[18];
|
||||
|
||||
br_i15_montymul(t, a, b, C255_P, P0I);
|
||||
memcpy(d, t, sizeof t);
|
||||
}
|
||||
|
||||
static void
|
||||
byteswap(unsigned char *G)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < 16; i ++) {
|
||||
unsigned char t;
|
||||
|
||||
t = G[i];
|
||||
G[i] = G[31 - i];
|
||||
G[31 - i] = t;
|
||||
}
|
||||
}
|
||||
|
||||
static uint32_t
|
||||
api_mul(unsigned char *G, size_t Glen,
|
||||
const unsigned char *kb, size_t kblen, int curve)
|
||||
{
|
||||
#define ILEN (18 * sizeof(uint16_t))
|
||||
|
||||
/*
|
||||
* The a[] and b[] arrays have an extra word to allow for
|
||||
* decoding without using br_i15_decode_reduce().
|
||||
*/
|
||||
uint16_t x1[18], x2[18], x3[18], z2[18], z3[18];
|
||||
uint16_t a[19], aa[18], b[19], bb[18];
|
||||
uint16_t c[18], d[18], e[18], da[18], cb[18];
|
||||
unsigned char k[32];
|
||||
uint32_t swap;
|
||||
int i;
|
||||
|
||||
(void)curve;
|
||||
|
||||
/*
|
||||
* Points are encoded over exactly 32 bytes. Multipliers must fit
|
||||
* in 32 bytes as well.
|
||||
* RFC 7748 mandates that the high bit of the last point byte must
|
||||
* be ignored/cleared.
|
||||
*/
|
||||
if (Glen != 32 || kblen > 32) {
|
||||
return 0;
|
||||
}
|
||||
G[31] &= 0x7F;
|
||||
|
||||
/*
|
||||
* Byteswap the point encoding, because it uses little-endian, and
|
||||
* the generic decoding routine uses big-endian.
|
||||
*/
|
||||
byteswap(G);
|
||||
|
||||
/*
|
||||
* Decode the point ('u' coordinate). This should be reduced
|
||||
* modulo p, but we prefer to avoid the dependency on
|
||||
* br_i15_decode_reduce(). Instead, we use br_i15_decode_mod()
|
||||
* with a synthetic modulus of value 2^255 (this must work
|
||||
* since G was truncated to 255 bits), then use a conditional
|
||||
* subtraction. We use br_i15_decode_mod() and not
|
||||
* br_i15_decode(), because the ec_prime_i15 implementation uses
|
||||
* the former but not the latter.
|
||||
* br_i15_decode_reduce(a, G, 32, C255_P);
|
||||
*/
|
||||
br_i15_zero(b, 0x111);
|
||||
b[18] = 1;
|
||||
br_i15_decode_mod(a, G, 32, b);
|
||||
a[0] = 0x110;
|
||||
br_i15_sub(a, C255_P, NOT(br_i15_sub(a, C255_P, 0)));
|
||||
|
||||
/*
|
||||
* Initialise variables x1, x2, z2, x3 and z3. We set all of them
|
||||
* into Montgomery representation.
|
||||
*/
|
||||
br_i15_montymul(x1, a, C255_R2, C255_P, P0I);
|
||||
memcpy(x3, x1, ILEN);
|
||||
br_i15_zero(z2, C255_P[0]);
|
||||
memcpy(x2, z2, ILEN);
|
||||
x2[1] = 19;
|
||||
memcpy(z3, x2, ILEN);
|
||||
|
||||
memset(k, 0, (sizeof k) - kblen);
|
||||
memcpy_P(k + (sizeof k) - kblen, kb, kblen);
|
||||
k[31] &= 0xF8;
|
||||
k[0] &= 0x7F;
|
||||
k[0] |= 0x40;
|
||||
|
||||
/* obsolete
|
||||
print_int_mont("x1", x1);
|
||||
*/
|
||||
|
||||
swap = 0;
|
||||
for (i = 254; i >= 0; i --) {
|
||||
uint32_t kt;
|
||||
|
||||
kt = (k[31 - (i >> 3)] >> (i & 7)) & 1;
|
||||
swap ^= kt;
|
||||
cswap(x2, x3, swap);
|
||||
cswap(z2, z3, swap);
|
||||
swap = kt;
|
||||
|
||||
/* obsolete
|
||||
print_int_mont("x2", x2);
|
||||
print_int_mont("z2", z2);
|
||||
print_int_mont("x3", x3);
|
||||
print_int_mont("z3", z3);
|
||||
*/
|
||||
|
||||
c255_add(a, x2, z2);
|
||||
c255_mul(aa, a, a);
|
||||
c255_sub(b, x2, z2);
|
||||
c255_mul(bb, b, b);
|
||||
c255_sub(e, aa, bb);
|
||||
c255_add(c, x3, z3);
|
||||
c255_sub(d, x3, z3);
|
||||
c255_mul(da, d, a);
|
||||
c255_mul(cb, c, b);
|
||||
|
||||
/* obsolete
|
||||
print_int_mont("a ", a);
|
||||
print_int_mont("aa", aa);
|
||||
print_int_mont("b ", b);
|
||||
print_int_mont("bb", bb);
|
||||
print_int_mont("e ", e);
|
||||
print_int_mont("c ", c);
|
||||
print_int_mont("d ", d);
|
||||
print_int_mont("da", da);
|
||||
print_int_mont("cb", cb);
|
||||
*/
|
||||
|
||||
c255_add(x3, da, cb);
|
||||
c255_mul(x3, x3, x3);
|
||||
c255_sub(z3, da, cb);
|
||||
c255_mul(z3, z3, z3);
|
||||
c255_mul(z3, z3, x1);
|
||||
c255_mul(x2, aa, bb);
|
||||
c255_mul(z2, C255_A24, e);
|
||||
c255_add(z2, z2, aa);
|
||||
c255_mul(z2, e, z2);
|
||||
|
||||
/* obsolete
|
||||
print_int_mont("x2", x2);
|
||||
print_int_mont("z2", z2);
|
||||
print_int_mont("x3", x3);
|
||||
print_int_mont("z3", z3);
|
||||
*/
|
||||
}
|
||||
cswap(x2, x3, swap);
|
||||
cswap(z2, z3, swap);
|
||||
|
||||
/*
|
||||
* Inverse z2 with a modular exponentiation. This is a simple
|
||||
* square-and-multiply algorithm; we mutualise most non-squarings
|
||||
* since the exponent contains almost only ones.
|
||||
*/
|
||||
memcpy(a, z2, ILEN);
|
||||
for (i = 0; i < 15; i ++) {
|
||||
c255_mul(a, a, a);
|
||||
c255_mul(a, a, z2);
|
||||
}
|
||||
memcpy(b, a, ILEN);
|
||||
for (i = 0; i < 14; i ++) {
|
||||
int j;
|
||||
|
||||
for (j = 0; j < 16; j ++) {
|
||||
c255_mul(b, b, b);
|
||||
}
|
||||
c255_mul(b, b, a);
|
||||
}
|
||||
for (i = 14; i >= 0; i --) {
|
||||
c255_mul(b, b, b);
|
||||
if ((0xFFEB >> i) & 1) {
|
||||
c255_mul(b, z2, b);
|
||||
}
|
||||
}
|
||||
c255_mul(b, x2, b);
|
||||
|
||||
/*
|
||||
* To avoid a dependency on br_i15_from_monty(), we use a
|
||||
* Montgomery multiplication with 1.
|
||||
* memcpy(x2, b, ILEN);
|
||||
* br_i15_from_monty(x2, C255_P, P0I);
|
||||
*/
|
||||
br_i15_zero(a, C255_P[0]);
|
||||
a[1] = 1;
|
||||
br_i15_montymul(x2, a, b, C255_P, P0I);
|
||||
|
||||
br_i15_encode(G, 32, x2);
|
||||
byteswap(G);
|
||||
return 1;
|
||||
|
||||
#undef ILEN
|
||||
}
|
||||
|
||||
static size_t
|
||||
api_mulgen(unsigned char *R,
|
||||
const unsigned char *x, size_t xlen, int curve)
|
||||
{
|
||||
const unsigned char *G;
|
||||
size_t Glen;
|
||||
|
||||
G = api_generator(curve, &Glen);
|
||||
memcpy(R, G, Glen);
|
||||
api_mul(R, Glen, x, xlen, curve);
|
||||
return Glen;
|
||||
}
|
||||
|
||||
static uint32_t
|
||||
api_muladd(unsigned char *A, const unsigned char *B, size_t len,
|
||||
const unsigned char *x, size_t xlen,
|
||||
const unsigned char *y, size_t ylen, int curve)
|
||||
{
|
||||
/*
|
||||
* We don't implement this method, since it is used for ECDSA
|
||||
* only, and there is no ECDSA over Curve25519 (which instead
|
||||
* uses EdDSA).
|
||||
*/
|
||||
(void)A;
|
||||
(void)B;
|
||||
(void)len;
|
||||
(void)x;
|
||||
(void)xlen;
|
||||
(void)y;
|
||||
(void)ylen;
|
||||
(void)curve;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* see bearssl_ec.h */
|
||||
const br_ec_impl br_ec_c25519_i15 PROGMEM = {
|
||||
(uint32_t)0x20000000,
|
||||
&api_generator,
|
||||
&api_order,
|
||||
&api_xoff,
|
||||
&api_mul,
|
||||
&api_mulgen,
|
||||
&api_muladd
|
||||
};
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -14,23 +14,29 @@ extern int m_aes_gcm_encryt(bvm *vm);
|
|||
extern int m_aes_gcm_decryt(bvm *vm);
|
||||
extern int m_aes_gcm_tag(bvm *vm);
|
||||
|
||||
#if BE_USE_PRECOMPILED_OBJECT
|
||||
#include "../generate/be_fixed_be_class_aes_gcm.h"
|
||||
#endif
|
||||
extern int m_ec_c25519_pubkey(bvm *vm);
|
||||
extern int m_ec_c25519_sharedkey(bvm *vm);
|
||||
|
||||
void be_load_aes_gcm_lib(bvm *vm) {
|
||||
#include "../generate/be_fixed_be_class_aes_gcm.h"
|
||||
#include "../generate/be_fixed_be_class_ec_c25519.h"
|
||||
|
||||
void be_load_crypto_lib(bvm *vm) {
|
||||
// insert the class GCM in module AES
|
||||
be_newmodule(vm);
|
||||
be_setname(vm, -1, "AES");
|
||||
be_setglobal(vm, "AES");
|
||||
be_setname(vm, -1, "crypto");
|
||||
be_setglobal(vm, "crypto");
|
||||
|
||||
be_pushntvclass(vm, &be_class_aes_gcm);
|
||||
be_setmember(vm, -2, "GCM");
|
||||
be_setmember(vm, -2, "AES_GCM");
|
||||
be_pop(vm, 1);
|
||||
|
||||
be_pushntvclass(vm, &be_class_ec_c25519);
|
||||
be_setmember(vm, -2, "EC_C25519");
|
||||
be_pop(vm, 2);
|
||||
}
|
||||
/* @const_object_info_begin
|
||||
|
||||
class be_class_aes_gcm (scope: global, name: GCM) {
|
||||
class be_class_aes_gcm (scope: global, name: AES_GCM) {
|
||||
.p1, var
|
||||
.p2, var
|
||||
|
||||
|
|
@ -39,6 +45,12 @@ class be_class_aes_gcm (scope: global, name: GCM) {
|
|||
decrypt, func(m_aes_gcm_decryt)
|
||||
tag, func(m_aes_gcm_tag)
|
||||
}
|
||||
|
||||
class be_class_ec_c25519 (scope: global, name: EC_C25519) {
|
||||
public_key, func(m_ec_c25519_pubkey)
|
||||
shared_key, func(m_ec_c25519_sharedkey)
|
||||
}
|
||||
|
||||
@const_object_info_end */
|
||||
|
||||
#endif // USE_ALEXA_AVS
|
||||
|
|
@ -109,7 +109,7 @@ extern void be_load_Driver_class(bvm *vm);
|
|||
extern void be_load_Timer_class(bvm *vm);
|
||||
extern void be_load_driver_i2c_lib(bvm *vm);
|
||||
extern void be_load_md5_lib(bvm *vm);
|
||||
extern void be_load_aes_gcm_lib(bvm *vm);
|
||||
extern void be_load_crypto_lib(bvm *vm);
|
||||
|
||||
#ifdef USE_I2S_AUDIO_BERRY
|
||||
extern void be_load_driver_audio_lib(bvm *vm);
|
||||
|
|
@ -142,7 +142,7 @@ BERRY_API void be_load_custom_libs(bvm *vm)
|
|||
be_load_Driver_class(vm);
|
||||
be_load_md5_lib(vm);
|
||||
#ifdef USE_ALEXA_AVS
|
||||
be_load_aes_gcm_lib(vm);
|
||||
be_load_crypto_lib(vm);
|
||||
#endif
|
||||
#ifdef USE_I2C
|
||||
be_load_wirelib(vm);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,30 @@
|
|||
ec = crypto.EC_C25519()
|
||||
|
||||
# Alice
|
||||
sk_A = bytes('77076d0a7318a57d3c16c17251b26645df4c2f87ebc0992ab177fba51db92c2a')
|
||||
pk_A = ec.public_key(sk_A)
|
||||
assert(pk_A == bytes('8520f0098930a754748b7ddcb43ef75a0dbf3a0d26381af4eba4a98eaa9b4e6a'))
|
||||
|
||||
# Bob
|
||||
sk_B = bytes('5dab087e624a8a4b79e17f8b83800ee66f3bb1292618b6fd1c2f8b27ff88e0eb')
|
||||
pk_B = ec.public_key(sk_B)
|
||||
assert(pk_B == bytes('de9edb7d7b7dc1b4d35b61c2ece435373f8343c85b78674dadfc7e146f882b4f'))
|
||||
|
||||
psk = ec.shared_key(sk_A, pk_B)
|
||||
assert(psk == bytes('4a5d9d5ba4ce2de1728e3bf480350f25e07e21c947d19e3376f09b3c1e161742'))
|
||||
psk2 = ec.shared_key(sk_B, pk_A)
|
||||
assert(psk2 == bytes('4a5d9d5ba4ce2de1728e3bf480350f25e07e21c947d19e3376f09b3c1e161742'))
|
||||
|
||||
#- test vectors from RFC77748
|
||||
|
||||
Alice's private key, a:
|
||||
77076d0a7318a57d3c16c17251b26645df4c2f87ebc0992ab177fba51db92c2a
|
||||
Alice's public key, X25519(a, 9):
|
||||
8520f0098930a754748b7ddcb43ef75a0dbf3a0d26381af4eba4a98eaa9b4e6a
|
||||
Bob's private key, b:
|
||||
5dab087e624a8a4b79e17f8b83800ee66f3bb1292618b6fd1c2f8b27ff88e0eb
|
||||
Bob's public key, X25519(b, 9):
|
||||
de9edb7d7b7dc1b4d35b61c2ece435373f8343c85b78674dadfc7e146f882b4f
|
||||
Their shared secret, K:
|
||||
4a5d9d5ba4ce2de1728e3bf480350f25e07e21c947d19e3376f09b3c1e161742
|
||||
-#
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -18,5 +18,5 @@ BE_EXPORT_VARIABLE be_define_const_class(
|
|||
be_class_aes_gcm,
|
||||
2,
|
||||
NULL,
|
||||
GCM
|
||||
AES_GCM
|
||||
);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,18 @@
|
|||
#include "be_constobj.h"
|
||||
|
||||
static be_define_const_map_slots(be_class_ec_c25519_map) {
|
||||
{ be_const_key(public_key, 1), be_const_func(m_ec_c25519_pubkey) },
|
||||
{ be_const_key(shared_key, -1), be_const_func(m_ec_c25519_sharedkey) },
|
||||
};
|
||||
|
||||
static be_define_const_map(
|
||||
be_class_ec_c25519_map,
|
||||
2
|
||||
);
|
||||
|
||||
BE_EXPORT_VARIABLE be_define_const_class(
|
||||
be_class_ec_c25519,
|
||||
0,
|
||||
NULL,
|
||||
EC_C25519
|
||||
);
|
||||
|
|
@ -146,50 +146,73 @@ extern "C" {
|
|||
} while (0);
|
||||
be_raise(vm, kTypeError, nullptr);
|
||||
}
|
||||
}
|
||||
|
||||
// // `Md5.update(content:bytes()) -> nil`
|
||||
// //
|
||||
// // Add raw bytes to the MD5 calculation
|
||||
// int32_t m_md5_update(struct bvm *vm);
|
||||
// int32_t m_md5_update(struct bvm *vm) {
|
||||
// int32_t argc = be_top(vm); // Get the number of arguments
|
||||
// if (argc >= 2 && be_isinstance(vm, 2)) {
|
||||
// do {
|
||||
// be_getglobal(vm, "bytes"); /* get the bytes class */ /* TODO eventually replace with be_getbuiltin */
|
||||
// if (!be_isderived(vm, 2)) break;
|
||||
// size_t length = 0;
|
||||
// const void * bytes = be_tobytes(vm, 2, &length);
|
||||
// if (!bytes) break;
|
||||
/*********************************************************************************************\
|
||||
* EC C25519 class
|
||||
*
|
||||
\*********************************************************************************************/
|
||||
#define BR_EC25519_IMPL br_ec_c25519_m15 // BearSSL implementation for Curve 25519
|
||||
|
||||
// be_getmember(vm, 1, ".p");
|
||||
// struct MD5Context * ctx;
|
||||
// ctx = (struct MD5Context *) be_tocomptr(vm, -1);
|
||||
// if (!ctx) break;
|
||||
extern "C" {
|
||||
// crypto.EC_C25519().public_key(private_key:bytes(32)) -> bytes(32)
|
||||
// Computes the public key from a completely random private key of 32 bytes
|
||||
int32_t m_ec_c25519_pubkey(bvm *vm);
|
||||
int32_t m_ec_c25519_pubkey(bvm *vm) {
|
||||
int32_t argc = be_top(vm); // Get the number of arguments
|
||||
if (argc >= 2 && be_isbytes(vm, 2)) {
|
||||
size_t buf_len = 0;
|
||||
const uint8_t * buf = (const uint8_t*) be_tobytes(vm, 2, &buf_len);
|
||||
if (buf_len == 32) {
|
||||
/* create the private key structure */
|
||||
uint8_t sk[32];
|
||||
for (int32_t i=0; i<32; i++) {
|
||||
sk[i] = buf[31-i];
|
||||
}
|
||||
br_ec_private_key br_sk = { BR_EC_curve25519, sk, 32 };
|
||||
|
||||
// if (length > 0) {
|
||||
// MD5Update(ctx, (const uint8_t*) bytes, length);
|
||||
// }
|
||||
// be_return_nil(vm);
|
||||
// // success
|
||||
// } while (0);
|
||||
// }
|
||||
// be_raise(vm, kTypeError, nullptr);
|
||||
// }
|
||||
uint8_t pk_buf[32]; /* EC 25519 is 32 bytes */
|
||||
size_t ret = br_ec_compute_pub(&BR_EC25519_IMPL, nullptr, pk_buf, &br_sk);
|
||||
if (ret == 32) {
|
||||
be_pushbytes(vm, pk_buf, ret);
|
||||
be_return(vm);
|
||||
}
|
||||
}
|
||||
be_raise(vm, "value_error", "invalid input");
|
||||
}
|
||||
be_raise(vm, kTypeError, nullptr);
|
||||
}
|
||||
|
||||
// // `Md5.update(content:bytes()) -> nil`
|
||||
// //
|
||||
// // Add raw bytes to the MD5 calculation
|
||||
// int32_t m_md5_finish(struct bvm *vm);
|
||||
// int32_t m_md5_finish(struct bvm *vm) {
|
||||
// be_getmember(vm, 1, ".p");
|
||||
// struct MD5Context * ctx;
|
||||
// ctx = (struct MD5Context *) be_tocomptr(vm, -1);
|
||||
// crypto.EC_C25519().shared_key(my_private_key:bytes(32), their_public_key:bytes(32)) -> bytes(32)
|
||||
// Computes the shared pre-key. Normally this shared pre-key is hashed with another algorithm.
|
||||
int32_t m_ec_c25519_sharedkey(bvm *vm);
|
||||
int32_t m_ec_c25519_sharedkey(bvm *vm) {
|
||||
int32_t argc = be_top(vm); // Get the number of arguments
|
||||
if (argc >= 3 && be_isbytes(vm, 2) && be_isbytes(vm, 3)) {
|
||||
size_t sk_len = 0;
|
||||
const uint8_t * sk_buf = (const uint8_t*) be_tobytes(vm, 2, &sk_len);
|
||||
uint8_t sk[32];
|
||||
for (int32_t i=0; i<32; i++) {
|
||||
sk[i] = sk_buf[31-i];
|
||||
}
|
||||
size_t pk_len = 0;
|
||||
const uint8_t * pk_const = (const uint8_t*) be_tobytes(vm, 3, &pk_len);
|
||||
uint8_t pk[32];
|
||||
memmove(pk, pk_const, sizeof(pk)); /* copy to a non-const variable to receive the result */
|
||||
|
||||
// uint8_t output[16];
|
||||
// MD5Final(output, ctx);
|
||||
// be_pushbytes(vm, output, sizeof(output));
|
||||
// be_return(vm);
|
||||
// }
|
||||
if (sk_len == 32 && pk_len == 32) {
|
||||
if (BR_EC25519_IMPL.mul(pk, pk_len, sk, sk_len, BR_EC_curve25519)) {
|
||||
/* return value (xoff is zero so no offset) */
|
||||
be_pushbytes(vm, pk, pk_len);
|
||||
be_return(vm);
|
||||
} else {
|
||||
be_raise(vm, "internal_error", "internal bearssl error in 519_m15.mul()");
|
||||
}
|
||||
}
|
||||
be_raise(vm, "value_error", "invalid input");
|
||||
}
|
||||
be_raise(vm, kTypeError, nullptr);
|
||||
}
|
||||
}
|
||||
|
||||
#endif // USE_ALEXA_AVS
|
||||
Loading…
Reference in New Issue