abc/GmSSL
1
0
Fork 0
mirror of https://github.com/guanzhi/GmSSL.git synced 2026-05-07 00:46:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update Kyber

Browse Source
This commit is contained in:
Zhi Guan
2026-01-12 20:41:44 +08:00
parent 1f64cb7389
commit 3afd4a047b
6 changed files with 354 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
include/gmssl/kyber.h
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2014-2025 The GmSSL Project. All Rights Reserved. * Copyright 2014-2026 The GmSSL Project. All Rights Reserved.
* *
* Licensed under the Apache License, Version 2.0 (the License); you may * Licensed under the Apache License, Version 2.0 (the License); you may
* not use this file except in compliance with the License. * not use this file except in compliance with the License.
@@ -73,42 +73,19 @@ CRYSTALS-Kyber Algorithm Specifications and Supporing Documentation (version 3.0
*/ */
typedef int16_t kyber_poly_t[256];
typedef struct {
uint8_t t[KYBER_K][384];
uint8_t rho[32];
} KYBER_CPA_PUBLIC_KEY;
typedef struct {
KYBER_CPA_PUBLIC_KEY public_key;
uint8_t s[KYBER_K][384];
} KYBER_CPA_PRIVATE_KEY;
typedef struct {
uint8_t c1[KYBER_K][KYBER_C1_SIZE];
uint8_t c2[KYBER_C2_SIZE];
} KYBER_CPA_CIPHERTEXT;
int kyber_cpa_public_key_to_bytes(const KYBER_CPA_PUBLIC_KEY *key, uint8_t **out, size_t *outlen);
int kyber_cpa_public_key_from_bytes(KYBER_CPA_PUBLIC_KEY *key, const uint8_t **in, size_t *inlen);
int kyber_cpa_private_key_to_bytes(const KYBER_CPA_PRIVATE_KEY *key, uint8_t **out, size_t *outlen);
int kyber_cpa_private_key_from_bytes(KYBER_CPA_PRIVATE_KEY *key, const uint8_t **in, size_t *inlen);
int kyber_cpa_ciphertext_to_bytes(const KYBER_CPA_CIPHERTEXT *ciphertext, uint8_t **out, size_t *outlen);
int kyber_cpa_ciphertext_from_bytes(KYBER_CPA_CIPHERTEXT *ciphertext, const uint8_t **in, size_t *inlen);
void kyber_h_hash(const uint8_t *in, size_t inlen, uint8_t out[32]); void kyber_h_hash(const uint8_t *in, size_t inlen, uint8_t out[32]);
void kyber_g_hash(const uint8_t *in, size_t inlen, uint8_t out[64]); void kyber_g_hash(const uint8_t *in, size_t inlen, uint8_t out[64]);
typedef int16_t kyber_poly_t[256];
#define KYBER_FMT_POLY 1 #define KYBER_FMT_POLY 1
#define KYBER_FMT_HEX 2 #define KYBER_FMT_HEX 2
int kyber_poly_print(FILE *fp, int fmt, int ind, const char *label, const kyber_poly_t a); int kyber_poly_print(FILE *fp, int fmt, int ind, const char *label, const kyber_poly_t a);
void kyber_poly_set_zero(kyber_poly_t r); void kyber_poly_set_zero(kyber_poly_t r);
int kyber_poly_rand(kyber_poly_t r); int kyber_poly_rand(kyber_poly_t r);
int kyber_poly_uniform_sample(kyber_poly_t r, const uint8_t rho[32], uint8_t j, uint8_t i); int kyber_poly_uniform_sample(kyber_poly_t r, const uint8_t rho[32], uint8_t j, uint8_t i);
int kyber_poly_cbd_sample(kyber_poly_t r, int eta, const uint8_t secret[32], uint8_t n); int kyber_poly_cbd_sample(kyber_poly_t r, int eta, const uint8_t secret[32], uint8_t n);
@@ -123,85 +100,85 @@ void init_zeta(void);
int kyber_poly_ntt(int16_t a[256]); int kyber_poly_ntt(int16_t a[256]);
int kyber_poly_inv_ntt(int16_t a[256]); int kyber_poly_inv_ntt(int16_t a[256]);
int kyber_poly_ntt_mul(kyber_poly_t r, const kyber_poly_t a, const kyber_poly_t b); int kyber_poly_ntt_mul(kyber_poly_t r, const kyber_poly_t a, const kyber_poly_t b);
void kyber_poly_copy(kyber_poly_t r, const kyber_poly_t a); void kyber_poly_copy(kyber_poly_t r, const kyber_poly_t a);
int kyber_poly_mul(kyber_poly_t r, const kyber_poly_t a, const kyber_poly_t b); int kyber_poly_mul(kyber_poly_t r, const kyber_poly_t a, const kyber_poly_t b);
void kyber_poly_ntt_mul_scalar(kyber_poly_t r, int scalar, const kyber_poly_t a); void kyber_poly_ntt_mul_scalar(kyber_poly_t r, int scalar, const kyber_poly_t a);
int kyber_poly_to_signed(const kyber_poly_t a, kyber_poly_t r); int kyber_poly_to_signed(const kyber_poly_t a, kyber_poly_t r);
int kyber_poly_from_signed(kyber_poly_t r, const kyber_poly_t a); int kyber_poly_from_signed(kyber_poly_t r, const kyber_poly_t a);
int kyber_poly_compress(const kyber_poly_t a, int dbits, kyber_poly_t z); int kyber_poly_compress(const kyber_poly_t a, int dbits, kyber_poly_t z);
int kyber_poly_decompress(kyber_poly_t r, int dbits, const kyber_poly_t z); int kyber_poly_decompress(kyber_poly_t r, int dbits, const kyber_poly_t z);
int kyber_poly_encode12(const kyber_poly_t a, uint8_t out[384]); int kyber_poly_encode12(const kyber_poly_t a, uint8_t out[384]);
int kyber_poly_decode12(kyber_poly_t r, const uint8_t in[384]); int kyber_poly_decode12(kyber_poly_t r, const uint8_t in[384]);
int kyber_poly_encode10(const kyber_poly_t a, uint8_t out[320]); int kyber_poly_encode10(const kyber_poly_t a, uint8_t out[320]);
int kyber_poly_decode10(kyber_poly_t r, const uint8_t in[320]); int kyber_poly_decode10(kyber_poly_t r, const uint8_t in[320]);
int kyber_poly_encode4(const kyber_poly_t a, uint8_t out[128]); int kyber_poly_encode4(const kyber_poly_t a, uint8_t out[128]);
void kyber_poly_decode4(kyber_poly_t r, const uint8_t in[128]); void kyber_poly_decode4(kyber_poly_t r, const uint8_t in[128]);
void kyber_poly_decode1(kyber_poly_t r, const uint8_t in[32]); void kyber_poly_decode1(kyber_poly_t r, const uint8_t in[32]);
int kyber_poly_encode1(const kyber_poly_t a, uint8_t out[32]); int kyber_poly_encode1(const kyber_poly_t a, uint8_t out[32]);
typedef struct {
uint8_t t[KYBER_K][384];
uint8_t rho[32];
} KYBER_CPA_PUBLIC_KEY;
int kyber_cpa_keygen(KYBER_CPA_PUBLIC_KEY *pk, KYBER_CPA_PRIVATE_KEY *sk); typedef struct {
int kyber_cpa_ciphertext_print(FILE *fp, int fmt, int ind, const char *label, const KYBER_CPA_CIPHERTEXT *c); KYBER_CPA_PUBLIC_KEY public_key;
int kyber_cpa_ciphertext_print(FILE *fp, int fmt, int ind, const char *label, const KYBER_CPA_CIPHERTEXT *c); uint8_t s[KYBER_K][384];
int kyber_cpa_public_key_print(FILE *fp, int fmt, int ind, const char *label, const KYBER_CPA_PUBLIC_KEY *pk); } KYBER_CPA_KEY;
int kyber_cpa_private_key_print(FILE *fp, int fmt, int ind, const char *label, const KYBER_CPA_PRIVATE_KEY *sk);
int kyber_cpa_encrypt(const KYBER_CPA_PUBLIC_KEY *pk, const uint8_t in[32], int kyber_cpa_key_generate_ex(KYBER_CPA_KEY *key, const uint8_t random[32]);
int kyber_cpa_public_key_to_bytes(const KYBER_CPA_KEY *key, uint8_t **out, size_t *outlen);
int kyber_cpa_public_key_from_bytes(KYBER_CPA_KEY *key, const uint8_t **in, size_t *inlen);
int kyber_cpa_public_key_print(FILE *fp, int fmt, int ind, const char *label, const KYBER_CPA_KEY *pk);
int kyber_cpa_private_key_to_bytes(const KYBER_CPA_KEY *key, uint8_t **out, size_t *outlen);
int kyber_cpa_private_key_from_bytes(KYBER_CPA_KEY *key, const uint8_t **in, size_t *inlen);
int kyber_cpa_private_key_print(FILE *fp, int fmt, int ind, const char *label, const KYBER_CPA_KEY *sk);
void kyber_cpa_key_cleanup(KYBER_CPA_KEY *key);
typedef struct {
uint8_t c1[KYBER_K][KYBER_C1_SIZE];
uint8_t c2[KYBER_C2_SIZE];
} KYBER_CPA_CIPHERTEXT;
int kyber_cpa_encrypt(const KYBER_CPA_KEY *pk, const uint8_t in[32],
const uint8_t rand[32], KYBER_CPA_CIPHERTEXT *out); const uint8_t rand[32], KYBER_CPA_CIPHERTEXT *out);
int kyber_cpa_decrypt(const KYBER_CPA_PRIVATE_KEY *sk, const KYBER_CPA_CIPHERTEXT *in, uint8_t out[32]); int kyber_cpa_decrypt(const KYBER_CPA_KEY *sk, const KYBER_CPA_CIPHERTEXT *in,
uint8_t out[32]);
int kyber_cpa_ciphertext_to_bytes(const KYBER_CPA_CIPHERTEXT *ciphertext, uint8_t **out, size_t *outlen);
int kyber_cpa_ciphertext_from_bytes(KYBER_CPA_CIPHERTEXT *ciphertext, const uint8_t **in, size_t *inlen);
int kyber_cpa_ciphertext_print(FILE *fp, int fmt, int ind, const char *label, const KYBER_CPA_CIPHERTEXT *c);
typedef KYBER_CPA_PUBLIC_KEY KYBER_PUBLIC_KEY; typedef KYBER_CPA_PUBLIC_KEY KYBER_PUBLIC_KEY;
typedef struct { typedef struct {
KYBER_CPA_PUBLIC_KEY pk; KYBER_CPA_KEY cpa_key;
KYBER_CPA_PRIVATE_KEY sk;
uint8_t pk_hash[32]; uint8_t pk_hash[32];
uint8_t z[32]; uint8_t z[32];
} KYBER_PRIVATE_KEY; } KYBER_KEY;
#define KYBER_PUBLIC_KEY_SIZE sizeof(KYBER_PUBLIC_KEY) #define KYBER_PUBLIC_KEY_SIZE sizeof(KYBER_PUBLIC_KEY)
#define KYBER_PRIVATE_KEY_SIZE sizeof(KYBER_PRIVATE_KEY) #define KYBER_PRIVATE_KEY_SIZE sizeof(KYBER_KEY)
int kyber_key_generate_ex(KYBER_KEY *key, const uint8_t random[32]);
int kyber_public_key_to_bytes(const KYBER_KEY *key, uint8_t **out, size_t *outlen);
int kyber_public_key_from_bytes(KYBER_KEY *key, const uint8_t **in, size_t *inlen);
int kyber_public_key_print(FILE *fp, int fmt, int ind, const char *label, const KYBER_KEY *pk);
int kyber_private_key_to_bytes(const KYBER_KEY *key, uint8_t **out, size_t *outlen);
int kyber_private_key_from_bytes(KYBER_KEY *key, const uint8_t **in, size_t *inlen);
int kyber_private_key_print(FILE *fp, int fmt, int ind, const char *label, const KYBER_KEY *sk);
void kyber_key_cleanup(KYBER_KEY *key);
typedef KYBER_CPA_CIPHERTEXT KYBER_CIPHERTEXT; typedef KYBER_CPA_CIPHERTEXT KYBER_CIPHERTEXT;
int kyber_ciphertext_print(FILE *fp, int fmt, int ind, const char *label, const KYBER_CIPHERTEXT *c);
int kyber_ciphertext_to_bytes(const KYBER_CIPHERTEXT *ciphertext, uint8_t **out, size_t *outlen); int kyber_ciphertext_to_bytes(const KYBER_CIPHERTEXT *ciphertext, uint8_t **out, size_t *outlen);
int kyber_ciphertext_from_bytes(KYBER_CIPHERTEXT *ciphertext, const uint8_t **in, size_t *inlen); int kyber_ciphertext_from_bytes(KYBER_CIPHERTEXT *ciphertext, const uint8_t **in, size_t *inlen);
int kyber_ciphertext_print(FILE *fp, int fmt, int ind, const char *label, const KYBER_CIPHERTEXT *c);
void kyber_key_cleanup(KYBER_PRIVATE_KEY *key); int kyber_encap(const KYBER_KEY *pk, KYBER_CIPHERTEXT *c, uint8_t K[32]);
int kyber_decap(const KYBER_KEY *sk, const KYBER_CIPHERTEXT *c, uint8_t K[32]);
int kyber_key_generate(KYBER_PRIVATE_KEY *key);
// generate a single key
int kyber_keygen(KYBER_PUBLIC_KEY *pk, KYBER_PRIVATE_KEY *sk);
int kyber_private_key_print(FILE *fp, int fmt, int ind, const char *label, const KYBER_PRIVATE_KEY *sk);
int kyber_public_key_print(FILE *fp, int fmt, int ind, const char *label, const KYBER_PRIVATE_KEY *pk);
int kyber_encap(const KYBER_PUBLIC_KEY *pk, KYBER_CIPHERTEXT *c, uint8_t K[32]);
int kyber_decap(const KYBER_PRIVATE_KEY *sk, const KYBER_CIPHERTEXT *c, uint8_t K[32]);
int kyber_public_key_to_bytes(const KYBER_PRIVATE_KEY *key, uint8_t **out, size_t *outlen);
int kyber_public_key_from_bytes(KYBER_PRIVATE_KEY *key, const uint8_t **in, size_t *inlen);
int kyber_private_key_to_bytes(const KYBER_PRIVATE_KEY *key, uint8_t **out, size_t *outlen);
int kyber_private_key_from_bytes(KYBER_PRIVATE_KEY *key, const uint8_t **in, size_t *inlen);
#ifdef __cplusplus #ifdef __cplusplus

513
src/kyber.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2014-2024 The GmSSL Project. All Rights Reserved. * Copyright 2014-2026 The GmSSL Project. All Rights Reserved.
* *
* Licensed under the Apache License, Version 2.0 (the License); you may * Licensed under the Apache License, Version 2.0 (the License); you may
* not use this file except in compliance with the License. * not use this file except in compliance with the License.
@@ -20,24 +20,6 @@
#include <gmssl/kyber.h> #include <gmssl/kyber.h>
/*
CRYSTALS-Kyber Algorithm Specifications and Supporing Documentation (version 3.02)
FIPS-202 90s
XOF SHAKE-128 AES256-CTR MGF1-SM3
H SHA3-256 SHA256 SM3
G SHA3-512 SHA512 MGF1-SM3
PRF(s,b) SHAKE-256(s||b) AES256-CTR HKDF-SM3
KDF SHAKE-256 SHA256 HKDF-SM3
*/
void kyber_h_hash(const uint8_t *in, size_t inlen, uint8_t out[32]) void kyber_h_hash(const uint8_t *in, size_t inlen, uint8_t out[32])
{ {
SM3_CTX ctx; SM3_CTX ctx;
@@ -598,102 +580,7 @@ int kyber_poly_encode1(const kyber_poly_t a, uint8_t out[32])
return 1; return 1;
} }
/* int kyber_cpa_key_generate_ex(KYBER_CPA_KEY *key, const uint8_t random[32])
78 typedef struct {
79 uint8_t t[KYBER_K][384];
80 uint8_t rho[32];
81 } KYBER_CPA_PUBLIC_KEY;
82
83 typedef struct {
84 // should add public key
85 uint8_t s[KYBER_K][384];
86 } KYBER_CPA_PRIVATE_KEY;
*/
int kyber_cpa_public_key_to_bytes(const KYBER_CPA_PUBLIC_KEY *key, uint8_t **out, size_t *outlen)
{
if (!key || !outlen) {
error_print();
return -1;
}
if (out && *out) {
memcpy(*out, key->t, sizeof(key->t));
*out += sizeof(key->t);
memcpy(*out, key->rho, sizeof(key->rho));
*out += sizeof(key->rho);
}
*outlen += sizeof(key->t);
*outlen += sizeof(key->rho);
return 1;
}
int kyber_cpa_public_key_from_bytes(KYBER_CPA_PUBLIC_KEY *key, const uint8_t **in, size_t *inlen)
{
if (!key || !in || !(*in) || !inlen) {
error_print();
return -1;
}
if (*inlen < sizeof(key->t) + sizeof(key->rho)) {
error_print();
return -1;
}
memset(key, 0, sizeof(*key));
memcpy(key->t, *in, sizeof(key->t));
*in += sizeof(key->t);
*inlen -= sizeof(key->t);
memcpy(key->rho, *in, sizeof(key->rho));
*in += sizeof(key->rho);
*inlen -= sizeof(key->rho);
return 1;
}
int kyber_cpa_private_key_to_bytes(const KYBER_CPA_PRIVATE_KEY *key, uint8_t **out, size_t *outlen)
{
if (!key || !outlen) {
error_print();
return -1;
}
if (kyber_cpa_public_key_to_bytes(&key->public_key, out, outlen) != 1) {
error_print();
return -1;
}
if (out && *out) {
memcpy(*out, key->s, sizeof(key->s));
}
*outlen += sizeof(key->s);
return 1;
}
int kyber_cpa_private_key_from_bytes(KYBER_CPA_PRIVATE_KEY *key, const uint8_t **in, size_t *inlen)
{
if (!key || !in || !(*in) || !inlen) {
error_print();
return -1;
}
/*
if (*inlen < sizeof(key->s)) {
error_print();
return -1;
}
*/
memset(key, 0, sizeof(*key));
if (kyber_cpa_public_key_from_bytes(&key->public_key, in, inlen) != 1) {
error_print();
return -1;
}
memcpy(key->s, *in, sizeof(key->s));
*in += sizeof(key->s);
*inlen -= sizeof(key->s);
return 1;
}
int kyber_cpa_key_generate(KYBER_CPA_PRIVATE_KEY *key)
{
kyber_cpa_keygen(&key->public_key, key);
return 1;
}
int kyber_cpa_keygen(KYBER_CPA_PUBLIC_KEY *pk, KYBER_CPA_PRIVATE_KEY *sk)
{ {
kyber_poly_t A[KYBER_K][KYBER_K]; kyber_poly_t A[KYBER_K][KYBER_K];
kyber_poly_t s[KYBER_K]; kyber_poly_t s[KYBER_K];
@@ -705,11 +592,14 @@ int kyber_cpa_keygen(KYBER_CPA_PUBLIC_KEY *pk, KYBER_CPA_PRIVATE_KEY *sk)
uint8_t N = 0; uint8_t N = 0;
int i,j; int i,j;
// 应该支持这个函数是由确定的值导出的 if (random) {
memcpy(d, random, 32);
} else {
if (rand_bytes(d, 32) != 1) { if (rand_bytes(d, 32) != 1) {
error_print(); error_print();
return -1; return -1;
} }
}
kyber_g_hash(d, 32, d); kyber_g_hash(d, 32, d);
@@ -757,10 +647,10 @@ int kyber_cpa_keygen(KYBER_CPA_PUBLIC_KEY *pk, KYBER_CPA_PRIVATE_KEY *sk)
// output (pk, sk) // output (pk, sk)
for (i = 0; i < KYBER_K; i++) { for (i = 0; i < KYBER_K; i++) {
kyber_poly_encode12(t[i], pk->t[i]); kyber_poly_encode12(t[i], key->public_key.t[i]);
kyber_poly_encode12(s[i], sk->s[i]); kyber_poly_encode12(s[i], key->s[i]);
} }
memcpy(pk->rho, rho, 32); memcpy(key->public_key.rho, rho, 32);
gmssl_secure_clear(d, sizeof(d)); gmssl_secure_clear(d, sizeof(d));
gmssl_secure_clear(s, sizeof(s)); gmssl_secure_clear(s, sizeof(s));
@@ -769,6 +659,115 @@ int kyber_cpa_keygen(KYBER_CPA_PUBLIC_KEY *pk, KYBER_CPA_PRIVATE_KEY *sk)
return 1; return 1;
} }
void kyber_cpa_key_cleanup(KYBER_CPA_KEY *key)
{
if (key) {
gmssl_secure_clear(key->s, sizeof(key->s));
}
}
int kyber_cpa_public_key_to_bytes(const KYBER_CPA_KEY *key, uint8_t **out, size_t *outlen)
{
if (!key || !outlen) {
error_print();
return -1;
}
if (out && *out) {
memcpy(*out, key->public_key.t, sizeof(key->public_key.t));
*out += sizeof(key->public_key.t);
memcpy(*out, key->public_key.rho, sizeof(key->public_key.rho));
*out += sizeof(key->public_key.rho);
}
*outlen += sizeof(key->public_key.t);
*outlen += sizeof(key->public_key.rho);
return 1;
}
int kyber_cpa_public_key_from_bytes(KYBER_CPA_KEY *key, const uint8_t **in, size_t *inlen)
{
if (!key || !in || !(*in) || !inlen) {
error_print();
return -1;
}
if (*inlen < sizeof(key->public_key.t) + sizeof(key->public_key.rho)) {
error_print();
return -1;
}
memset(key, 0, sizeof(*key));
memcpy(key->public_key.t, *in, sizeof(key->public_key.t));
*in += sizeof(key->public_key.t);
*inlen -= sizeof(key->public_key.t);
memcpy(key->public_key.rho, *in, sizeof(key->public_key.rho));
*in += sizeof(key->public_key.rho);
*inlen -= sizeof(key->public_key.rho);
return 1;
}
int kyber_cpa_private_key_to_bytes(const KYBER_CPA_KEY *key, uint8_t **out, size_t *outlen)
{
if (!key || !outlen) {
error_print();
return -1;
}
if (kyber_cpa_public_key_to_bytes(key, out, outlen) != 1) {
error_print();
return -1;
}
if (out && *out) {
memcpy(*out, key->s, sizeof(key->s));
}
*outlen += sizeof(key->s);
return 1;
}
int kyber_cpa_private_key_from_bytes(KYBER_CPA_KEY *key, const uint8_t **in, size_t *inlen)
{
if (!key || !in || !(*in) || !inlen) {
error_print();
return -1;
}
memset(key, 0, sizeof(*key));
if (kyber_cpa_public_key_from_bytes(key, in, inlen) != 1) {
error_print();
return -1;
}
if (*inlen < sizeof(key->s)) {
error_print();
return -1;
}
memcpy(key->s, *in, sizeof(key->s));
*in += sizeof(key->s);
*inlen -= sizeof(key->s);
return 1;
}
int kyber_cpa_public_key_print(FILE *fp, int fmt, int ind, const char *label, const KYBER_CPA_KEY *key)
{
int i;
format_print(fp, fmt, ind, "%s\n", label);
ind += 4;
for (i = 0; i < KYBER_K; i++) {
format_print(fp, fmt, ind, "ntt(t[%d])", i);
format_bytes(fp, fmt, 0, "", key->public_key.t[i], 384);
}
format_bytes(fp, fmt, ind, "rho", key->public_key.rho, 32);
return 1;
}
int kyber_cpa_private_key_print(FILE *fp, int fmt, int ind, const char *label, const KYBER_CPA_KEY *key)
{
int i;
format_print(fp, fmt, ind, "%s\n", label);
ind += 4;
kyber_cpa_public_key_print(fp, fmt, ind, "public_key", key);
for (i = 0; i < KYBER_K; i++) {
format_print(fp, fmt, ind, "ntt(s[%d])", i);
format_bytes(fp, fmt, 0, "", key->s[i], 384);
}
return 1;
}
/* /*
@@ -789,11 +788,45 @@ int kyber_cpa_keygen(KYBER_CPA_PUBLIC_KEY *pk, KYBER_CPA_PRIVATE_KEY *sk)
*/ */
int kyber_cpa_ciphertext_to_bytes(const KYBER_CPA_CIPHERTEXT *ciphertext, uint8_t **out, size_t *outlen)
{
if (!ciphertext || !outlen) {
error_print();
return -1;
}
if (out && *out) {
memcpy(*out, ciphertext->c1, sizeof(ciphertext->c1));
*out += sizeof(ciphertext->c1);
memcpy(*out, ciphertext->c2, sizeof(ciphertext->c2));
*out += sizeof(ciphertext->c2);
}
*outlen += sizeof(ciphertext->c1);
*outlen += sizeof(ciphertext->c2);
return 1;
}
int kyber_cpa_ciphertext_from_bytes(KYBER_CPA_CIPHERTEXT *ciphertext, const uint8_t **in, size_t *inlen)
{
if (!ciphertext || !in || !(*in) || !inlen) {
error_print();
return -1;
}
if (*inlen < sizeof(ciphertext->c1) + sizeof(ciphertext->c2)) {
error_print();
return -1;
}
memcpy(ciphertext->c1, *in, sizeof(ciphertext->c1));
*in += sizeof(ciphertext->c1);
*inlen -= sizeof(ciphertext->c1);
memcpy(ciphertext->c2, *in, sizeof(ciphertext->c2));
*in += sizeof(ciphertext->c2);
*inlen -= sizeof(ciphertext->c2);
return 1;
}
int kyber_cpa_ciphertext_print(FILE *fp, int fmt, int ind, const char *label, const KYBER_CPA_CIPHERTEXT *c) int kyber_cpa_ciphertext_print(FILE *fp, int fmt, int ind, const char *label, const KYBER_CPA_CIPHERTEXT *c)
{ {
int i; int i;
format_print(fp, fmt, ind, "%s\n", label); format_print(fp, fmt, ind, "%s\n", label);
ind += 4; ind += 4;
for (i = 0; i < KYBER_K; i++) { for (i = 0; i < KYBER_K; i++) {
@@ -804,44 +837,7 @@ int kyber_cpa_ciphertext_print(FILE *fp, int fmt, int ind, const char *label, co
return 1; return 1;
} }
int kyber_ciphertext_print(FILE *fp, int fmt, int ind, const char *label, const KYBER_CIPHERTEXT *c) int kyber_cpa_encrypt(const KYBER_CPA_KEY *key, const uint8_t in[32],
{
return kyber_cpa_ciphertext_print(fp, fmt, ind, label, c);
}
int kyber_cpa_public_key_print(FILE *fp, int fmt, int ind, const char *label, const KYBER_CPA_PUBLIC_KEY *pk)
{
int i;
format_print(fp, fmt, ind, "%s\n", label);
ind += 4;
for (i = 0; i < KYBER_K; i++) {
format_print(fp, fmt, ind, "ntt(t[%d])", i);
format_bytes(fp, fmt, 0, "", pk->t[i], 384);
}
format_bytes(fp, fmt, ind, "rho", pk->rho, 32);
return 1;
}
int kyber_cpa_private_key_print(FILE *fp, int fmt, int ind, const char *label, const KYBER_CPA_PRIVATE_KEY *sk)
{
int i;
format_print(fp, fmt, ind, "%s\n", label);
ind += 4;
kyber_cpa_public_key_print(fp, fmt, ind, "public_key", &sk->public_key);
for (i = 0; i < KYBER_K; i++) {
format_print(fp, fmt, ind, "ntt(s[%d])", i);
format_bytes(fp, fmt, 0, "", sk->s[i], 384);
}
return 1;
}
int kyber_cpa_encrypt(const KYBER_CPA_PUBLIC_KEY *pk, const uint8_t in[32],
const uint8_t rand[32], KYBER_CPA_CIPHERTEXT *out) const uint8_t rand[32], KYBER_CPA_CIPHERTEXT *out)
{ {
kyber_poly_t A[KYBER_K][KYBER_K]; kyber_poly_t A[KYBER_K][KYBER_K];
@@ -857,13 +853,13 @@ int kyber_cpa_encrypt(const KYBER_CPA_PUBLIC_KEY *pk, const uint8_t in[32],
// tHat = Decode12(pk) // tHat = Decode12(pk)
for (i = 0; i < KYBER_K; i++) { for (i = 0; i < KYBER_K; i++) {
kyber_poly_decode12(t[i], pk->t[i]); kyber_poly_decode12(t[i], key->public_key.t[i]);
} }
// AHat^T[i][j] = Parse(XOR(rho, i, j)) // AHat^T[i][j] = Parse(XOR(rho, i, j))
for (i = 0; i < KYBER_K; i++) { for (i = 0; i < KYBER_K; i++) {
for (j = 0; j < KYBER_K; j++) { for (j = 0; j < KYBER_K; j++) {
kyber_poly_uniform_sample(A[i][j], pk->rho, i, j); kyber_poly_uniform_sample(A[i][j], key->public_key.rho, i, j);
} }
} }
@@ -955,7 +951,7 @@ int kyber_cpa_encrypt(const KYBER_CPA_PUBLIC_KEY *pk, const uint8_t in[32],
return 1; return 1;
} }
int kyber_cpa_decrypt(const KYBER_CPA_PRIVATE_KEY *sk, const KYBER_CPA_CIPHERTEXT *in, uint8_t out[32]) int kyber_cpa_decrypt(const KYBER_CPA_KEY *key, const KYBER_CPA_CIPHERTEXT *in, uint8_t out[32])
{ {
kyber_poly_t u[KYBER_K]; kyber_poly_t u[KYBER_K];
kyber_poly_t s[KYBER_K]; kyber_poly_t s[KYBER_K];
@@ -976,10 +972,9 @@ int kyber_cpa_decrypt(const KYBER_CPA_PRIVATE_KEY *sk, const KYBER_CPA_CIPHERTEX
kyber_poly_decompress(v, 4, v); kyber_poly_decompress(v, 4, v);
// s = Decode_12(sk) // s = Decode_12(sk)
for (i = 0; i < KYBER_K; i++) { for (i = 0; i < KYBER_K; i++) {
kyber_poly_decode12(s[i], sk->s[i]); kyber_poly_decode12(s[i], key->s[i]);
} }
// m = Encode_1(Compress(v - NTT^-1(s^T * NTT(u)), 1)) // m = Encode_1(Compress(v - NTT^-1(s^T * NTT(u)), 1))
@@ -1004,53 +999,70 @@ int kyber_cpa_decrypt(const KYBER_CPA_PRIVATE_KEY *sk, const KYBER_CPA_CIPHERTEX
} }
int kyber_key_generate(KYBER_PRIVATE_KEY *sk)
int kyber_key_generate_ex(KYBER_KEY *key, const uint8_t random[32])
{ {
KYBER_PUBLIC_KEY pk; if (!key) {
if (kyber_keygen(&pk, sk) != 1) { error_print();
return -1;
}
if (kyber_cpa_key_generate_ex(&key->cpa_key, random) != 1) {
error_print();
return -1;
}
kyber_h_hash((uint8_t *)key, sizeof(KYBER_CPA_PUBLIC_KEY), key->pk_hash);
if (rand_bytes(key->z, 32) != 1) {
kyber_cpa_key_cleanup(&key->cpa_key);
error_print(); error_print();
return -1; return -1;
} }
return 1; return 1;
} }
void kyber_key_cleanup(KYBER_PRIVATE_KEY *key) void kyber_key_cleanup(KYBER_KEY *key)
{ {
gmssl_secure_clear(key, sizeof(*key)); if (key) {
kyber_cpa_key_cleanup(&key->cpa_key);
gmssl_secure_clear(key->z, sizeof(key->z));
}
} }
int kyber_public_key_to_bytes(const KYBER_KEY *key, uint8_t **out, size_t *outlen)
int kyber_public_key_to_bytes(const KYBER_PRIVATE_KEY *key, uint8_t **out, size_t *outlen)
{
return kyber_cpa_public_key_to_bytes(&key->pk, out, outlen);
}
int kyber_public_key_from_bytes(KYBER_PRIVATE_KEY *key, const uint8_t **in, size_t *inlen)
{
memset(key, 0, sizeof(*key));
return kyber_cpa_public_key_from_bytes(&key->pk, in, inlen);
}
/*
165 typedef struct {
166 KYBER_CPA_PUBLIC_KEY pk;
167 KYBER_CPA_PRIVATE_KEY sk;
168 uint8_t pk_hash[32];
169 uint8_t z[32];
170 } KYBER_PRIVATE_KEY;
*/
int kyber_private_key_to_bytes(const KYBER_PRIVATE_KEY *key, uint8_t **out, size_t *outlen)
{ {
if (!key || !outlen) { if (!key || !outlen) {
error_print(); error_print();
return -1; return -1;
} }
if (kyber_cpa_public_key_to_bytes(&key->pk, out, outlen) != 1) { if (kyber_cpa_public_key_to_bytes(&key->cpa_key, out, outlen) != 1) {
error_print(); error_print();
return -1; return -1;
} }
if (kyber_cpa_private_key_to_bytes(&key->sk, out, outlen) != 1) { return 1;
}
int kyber_public_key_from_bytes(KYBER_KEY *key, const uint8_t **in, size_t *inlen)
{
if (!key || !in || !(*in) || !inlen) {
error_print();
return -1;
}
memset(key, 0, sizeof(*key));
if (kyber_cpa_public_key_from_bytes(&key->cpa_key, in, inlen) != 1) {
error_print();
return -1;
}
return 1;
}
int kyber_private_key_to_bytes(const KYBER_KEY *key, uint8_t **out, size_t *outlen)
{
if (!key || !outlen) {
error_print();
return -1;
}
if (kyber_cpa_private_key_to_bytes(&key->cpa_key, out, outlen) != 1) {
error_print(); error_print();
return -1; return -1;
} }
@@ -1065,21 +1077,19 @@ int kyber_private_key_to_bytes(const KYBER_PRIVATE_KEY *key, uint8_t **out, size
return 1; return 1;
} }
int kyber_private_key_from_bytes(KYBER_PRIVATE_KEY *key, const uint8_t **in, size_t *inlen) int kyber_private_key_from_bytes(KYBER_KEY *key, const uint8_t **in, size_t *inlen)
{ {
if (!key || !in || !(*in) || !inlen) { if (!key || !in || !(*in) || !inlen) {
error_print(); error_print();
return -1; return -1;
} }
if (*inlen < sizeof(*key)) { memset(key, 0, sizeof(*key));
if (kyber_cpa_private_key_from_bytes(&key->cpa_key, in, inlen) != 1) {
error_print(); error_print();
return -1; return -1;
} }
if (kyber_cpa_public_key_from_bytes(&key->pk, in, inlen) != 1) { if (*inlen < sizeof(key->pk_hash) + sizeof(key->z)) {
error_print();
return -1;
}
if (kyber_cpa_private_key_from_bytes(&key->sk, in, inlen) != 1) {
error_print(); error_print();
return -1; return -1;
} }
@@ -1089,49 +1099,24 @@ int kyber_private_key_from_bytes(KYBER_PRIVATE_KEY *key, const uint8_t **in, siz
memcpy(key->z, *in, sizeof(key->z)); memcpy(key->z, *in, sizeof(key->z));
*in += sizeof(key->z); *in += sizeof(key->z);
*inlen -= sizeof(key->z); *inlen -= sizeof(key->z);
return 1; return 1;
} }
int kyber_keygen(KYBER_PUBLIC_KEY *pk, KYBER_PRIVATE_KEY *sk) int kyber_public_key_print(FILE *fp, int fmt, int ind, const char *label, const KYBER_KEY *key)
{ {
if (kyber_cpa_keygen(pk, &sk->sk) != 1) { return kyber_cpa_public_key_print(fp, fmt, ind, label, &key->cpa_key);
error_print();
return -1;
} }
memcpy(&sk->pk, pk, sizeof(KYBER_PUBLIC_KEY)); int kyber_private_key_print(FILE *fp, int fmt, int ind, const char *label, const KYBER_KEY *key)
kyber_h_hash((uint8_t *)pk, sizeof(KYBER_CPA_PUBLIC_KEY), sk->pk_hash);
if (rand_bytes(sk->z, 32) != 1) {
error_print();
return -1;
}
return 1;
}
int kyber_private_key_print(FILE *fp, int fmt, int ind, const char *label, const KYBER_PRIVATE_KEY *sk)
{ {
format_print(fp, fmt, ind, "%s\n", label); kyber_cpa_private_key_print(fp, fmt, ind, label, &key->cpa_key);
ind += 4; ind += 4;
format_bytes(fp, fmt, ind, "publicKeyHash", key->pk_hash, 32);
kyber_cpa_private_key_print(fp, fmt, ind, "privateKey", &sk->sk); format_bytes(fp, fmt, ind, "z", key->z, 32);
kyber_cpa_public_key_print(fp, fmt, ind, "publicKey", &sk->pk);
format_bytes(fp, fmt, ind, "publicKeyHash", sk->pk_hash, 32);
format_bytes(fp, fmt, ind, "z", sk->z, 32);
return 1; return 1;
} }
int kyber_encap(const KYBER_KEY *key, KYBER_CIPHERTEXT *c, uint8_t K[32])
int kyber_public_key_print(FILE *fp, int fmt, int ind, const char *label, const KYBER_PRIVATE_KEY *key)
{
return kyber_cpa_public_key_print(fp, fmt, ind, label, &key->pk);
}
int kyber_encap(const KYBER_PUBLIC_KEY *pk, KYBER_CIPHERTEXT *c, uint8_t K[32])
{ {
uint8_t m_h[64]; uint8_t m_h[64];
uint8_t K_r[64]; uint8_t K_r[64];
@@ -1150,13 +1135,13 @@ int kyber_encap(const KYBER_PUBLIC_KEY *pk, KYBER_CIPHERTEXT *c, uint8_t K[32])
kyber_h_hash(m, 32, m); kyber_h_hash(m, 32, m);
// h = H(pk) // h = H(pk)
kyber_h_hash((const uint8_t *)pk, sizeof(KYBER_PUBLIC_KEY), h); kyber_h_hash((const uint8_t *)key, sizeof(KYBER_PUBLIC_KEY), h);
// (K_, r) = G(m || H(pk)) // (K_, r) = G(m || H(pk))
kyber_g_hash(m_h, 64, K_r); kyber_g_hash(m_h, 64, K_r);
// c = Kyber.CPA.Enc(pk, m, r) // c = Kyber.CPA.Enc(pk, m, r)
if (kyber_cpa_encrypt(pk, m, r, c) != 1) { if (kyber_cpa_encrypt(&key->cpa_key, m, r, c) != 1) {
error_print(); error_print();
return -1; return -1;
} }
@@ -1172,7 +1157,7 @@ int kyber_encap(const KYBER_PUBLIC_KEY *pk, KYBER_CIPHERTEXT *c, uint8_t K[32])
return 1; return 1;
} }
int kyber_decap(const KYBER_PRIVATE_KEY *sk, const KYBER_CIPHERTEXT *c, uint8_t K[32]) int kyber_decap(const KYBER_KEY *key, const KYBER_CIPHERTEXT *c, uint8_t K[32])
{ {
uint8_t m_h[64]; uint8_t m_h[64];
uint8_t K_r[64]; uint8_t K_r[64];
@@ -1185,19 +1170,19 @@ int kyber_decap(const KYBER_PRIVATE_KEY *sk, const KYBER_CIPHERTEXT *c, uint8_t
// m' = Dec(sk, c) // m' = Dec(sk, c)
if (kyber_cpa_decrypt(&sk->sk, c, m) != 1) { if (kyber_cpa_decrypt(&key->cpa_key, c, m) != 1) {
error_print(); error_print();
return -1; return -1;
} }
// h = H(pk) // h = H(pk)
memcpy(h, sk->pk_hash, 32); memcpy(h, key->pk_hash, 32);
// (K_, r) = G(m || h) // (K_, r) = G(m || h)
kyber_g_hash(m_h, 64, K_r); kyber_g_hash(m_h, 64, K_r);
// c_ = CPA.Enc(pk, m, r) // c_ = CPA.Enc(pk, m, r)
if (kyber_cpa_encrypt(&sk->pk, m, r, &c_) != 1) { if (kyber_cpa_encrypt(&key->cpa_key, m, r, &c_) != 1) {
gmssl_secure_clear(m_h, sizeof(m_h)); gmssl_secure_clear(m_h, sizeof(m_h));
gmssl_secure_clear(K_r, sizeof(K_r)); gmssl_secure_clear(K_r, sizeof(K_r));
error_print(); error_print();
@@ -1212,7 +1197,7 @@ int kyber_decap(const KYBER_PRIVATE_KEY *sk, const KYBER_CIPHERTEXT *c, uint8_t
kyber_kdf(K_r, K); kyber_kdf(K_r, K);
} else { } else {
error_print(); error_print();
memcpy(K_r, sk->z, 32); // TODO: const time memcpy(K_r, key->z, 32); // TODO: const time
kyber_kdf(K_r, K); kyber_kdf(K_r, K);
} }
@@ -1221,49 +1206,25 @@ int kyber_decap(const KYBER_PRIVATE_KEY *sk, const KYBER_CIPHERTEXT *c, uint8_t
return 1; return 1;
} }
int kyber_cpa_ciphertext_to_bytes(const KYBER_CPA_CIPHERTEXT *ciphertext, uint8_t **out, size_t *outlen)
{
if (!ciphertext || !outlen) {
error_print();
return -1;
}
if (out && *out) {
memcpy(*out, ciphertext->c1, sizeof(ciphertext->c1));
*out += sizeof(ciphertext->c1);
memcpy(*out, ciphertext->c2, sizeof(ciphertext->c2));
*out += sizeof(ciphertext->c2);
}
*outlen += sizeof(ciphertext->c1);
*outlen += sizeof(ciphertext->c2);
return 1;
}
int kyber_cpa_ciphertext_from_bytes(KYBER_CPA_CIPHERTEXT *ciphertext, const uint8_t **in, size_t *inlen)
{
if (!ciphertext || !in || !(*in) || !inlen) {
error_print();
return -1;
}
if (*inlen < sizeof(ciphertext->c1) + sizeof(ciphertext->c2)) {
error_print();
return -1;
}
memcpy(ciphertext->c1, *in, sizeof(ciphertext->c1));
*in += sizeof(ciphertext->c1);
*inlen -= sizeof(ciphertext->c1);
memcpy(ciphertext->c2, *in, sizeof(ciphertext->c2));
*in += sizeof(ciphertext->c2);
*inlen -= sizeof(ciphertext->c2);
return 1;
}
int kyber_ciphertext_to_bytes(const KYBER_CIPHERTEXT *ciphertext, uint8_t **out, size_t *outlen) int kyber_ciphertext_to_bytes(const KYBER_CIPHERTEXT *ciphertext, uint8_t **out, size_t *outlen)
{ {
return kyber_cpa_ciphertext_to_bytes(ciphertext, out, outlen); if (kyber_cpa_ciphertext_to_bytes(ciphertext, out, outlen) != 1) {
error_print();
return -1;
}
return 1;
} }
int kyber_ciphertext_from_bytes(KYBER_CIPHERTEXT *ciphertext, const uint8_t **in, size_t *inlen) int kyber_ciphertext_from_bytes(KYBER_CIPHERTEXT *ciphertext, const uint8_t **in, size_t *inlen)
{ {
return kyber_cpa_ciphertext_from_bytes(ciphertext, in, inlen); if (kyber_cpa_ciphertext_from_bytes(ciphertext, in, inlen) != 1) {
error_print();
return -1;
}
return 1;
} }
int kyber_ciphertext_print(FILE *fp, int fmt, int ind, const char *label, const KYBER_CIPHERTEXT *c)
{
return kyber_cpa_ciphertext_print(fp, fmt, ind, label, c);
}

63
tests/kybertest.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2014-2025 The GmSSL Project. All Rights Reserved. * Copyright 2014-2026 The GmSSL Project. All Rights Reserved.
* *
* Licensed under the Apache License, Version 2.0 (the License); you may * Licensed under the Apache License, Version 2.0 (the License); you may
* not use this file except in compliance with the License. * not use this file except in compliance with the License.
@@ -16,9 +16,6 @@
#include <gmssl/kyber.h> #include <gmssl/kyber.h>
static int test_kyber_poly_uniform_sample(void) static int test_kyber_poly_uniform_sample(void)
{ {
kyber_poly_t a; kyber_poly_t a;
@@ -30,7 +27,7 @@ static int test_kyber_poly_uniform_sample(void)
kyber_poly_uniform_sample(a, rho, 0, 0); kyber_poly_uniform_sample(a, rho, 0, 0);
kyber_poly_to_signed(a, a); kyber_poly_to_signed(a, a);
//kyber_poly_print(stderr, 0, 0, "a from uniform sampling", a); kyber_poly_print(stderr, 0, 4, "a from uniform sampling", a);
return 1; return 1;
} }
@@ -44,11 +41,11 @@ static int test_kyber_poly_cbd_sample(void)
rand_bytes(seed, sizeof(seed)); rand_bytes(seed, sizeof(seed));
kyber_poly_cbd_sample(a, 2, seed, 0); kyber_poly_cbd_sample(a, 2, seed, 0);
kyber_poly_to_signed(a, a); kyber_poly_to_signed(a, a);
//kyber_poly_print(stderr, 0, 0, "cbd(eta=2)", a); //kyber_poly_print(stderr, 0, 4, "cbd(eta=2)", a);
kyber_poly_cbd_sample(a, 3, seed, 0); kyber_poly_cbd_sample(a, 3, seed, 0);
kyber_poly_to_signed(a, a); kyber_poly_to_signed(a, a);
//kyber_poly_print(stderr, 0, 0, "cbd(eta=3)", a); //kyber_poly_print(stderr, 0, 4, "cbd(eta=3)", a);
return 1; return 1;
} }
@@ -428,8 +425,7 @@ static int test_kyber_poly_encode1(void)
static int test_kyber_cpa(void) static int test_kyber_cpa(void)
{ {
KYBER_CPA_PUBLIC_KEY pk; KYBER_CPA_KEY key;
KYBER_CPA_PRIVATE_KEY sk;
KYBER_CPA_CIPHERTEXT c; KYBER_CPA_CIPHERTEXT c;
uint8_t m[32]; uint8_t m[32];
uint8_t r[32]; uint8_t r[32];
@@ -444,20 +440,20 @@ static int test_kyber_cpa(void)
return -1; return -1;
} }
if (kyber_cpa_keygen(&pk, &sk) != 1) { if (kyber_cpa_key_generate_ex(&key, NULL) != 1) {
error_print(); error_print();
return -1; return -1;
} }
kyber_cpa_public_key_print(stderr, 0, 0, "publicKey", &pk); kyber_cpa_public_key_print(stderr, 0, 0, "publicKey", &key);
kyber_cpa_private_key_print(stderr, 0, 0, "privateKey", &sk); kyber_cpa_private_key_print(stderr, 0, 0, "privateKey", &key);
if (kyber_cpa_encrypt(&pk, m, r, &c) != 1) { if (kyber_cpa_encrypt(&key, m, r, &c) != 1) {
error_print(); error_print();
return -1; return -1;
} }
kyber_cpa_ciphertext_print(stderr, 0, 0, "ciphertext", &c); kyber_cpa_ciphertext_print(stderr, 0, 0, "ciphertext", &c);
if (kyber_cpa_decrypt(&sk, &c, m_) != 1) { if (kyber_cpa_decrypt(&key, &c, m_) != 1) {
error_print(); error_print();
return -1; return -1;
} }
@@ -472,28 +468,27 @@ static int test_kyber_cpa(void)
static int test_kyber_kem(void) static int test_kyber_kem(void)
{ {
KYBER_PRIVATE_KEY sk; KYBER_KEY key;
KYBER_PUBLIC_KEY pk;
KYBER_CIPHERTEXT c; KYBER_CIPHERTEXT c;
uint8_t K[32]; uint8_t K[32];
uint8_t K_[32]; uint8_t K_[32];
if (kyber_keygen(&pk, &sk) != 1) { if (kyber_key_generate_ex(&key, NULL) != 1) {
error_print(); error_print();
return -1; return -1;
} }
kyber_public_key_print(stderr, 0, 0, "pk", &sk); kyber_public_key_print(stderr, 0, 0, "pk", &key);
kyber_private_key_print(stderr, 0, 0, "sk", &sk); kyber_private_key_print(stderr, 0, 0, "sk", &key);
if (kyber_encap(&pk, &c, K) != 1) { if (kyber_encap(&key, &c, K) != 1) {
error_print(); error_print();
return -1; return -1;
} }
kyber_ciphertext_print(stderr, 0, 0, "ciphertext", &c); kyber_ciphertext_print(stderr, 0, 0, "ciphertext", &c);
format_bytes(stderr, 0, 0, "KEM_K", K, 32); format_bytes(stderr, 0, 0, "KEM_K", K, 32);
if (kyber_decap(&sk, &c, K_) != 1) { if (kyber_decap(&key, &c, K_) != 1) {
error_print(); error_print();
return -1; return -1;
} }
@@ -510,30 +505,29 @@ static int test_kyber_kem(void)
static int test_kyber_cpa_key_to_bytes(void) static int test_kyber_cpa_key_to_bytes(void)
{ {
KYBER_CPA_PUBLIC_KEY pk; KYBER_CPA_KEY key;
KYBER_CPA_PRIVATE_KEY sk;
uint8_t buf[30000]; uint8_t buf[30000];
uint8_t *p = buf; uint8_t *p = buf;
const uint8_t *cp = buf; const uint8_t *cp = buf;
size_t len = 0; size_t len = 0;
if (kyber_cpa_keygen(&pk, &sk) != 1) { if (kyber_cpa_key_generate_ex(&key, NULL) != 1) {
error_print(); error_print();
return -1; return -1;
} }
if (kyber_cpa_public_key_to_bytes(&pk, &p, &len) != 1) { if (kyber_cpa_public_key_to_bytes(&key, &p, &len) != 1) {
error_print(); error_print();
return -1; return -1;
} }
if (kyber_cpa_private_key_to_bytes(&sk, &p, &len) != 1) { if (kyber_cpa_private_key_to_bytes(&key, &p, &len) != 1) {
error_print(); error_print();
return -1; return -1;
} }
if (kyber_cpa_public_key_from_bytes(&pk, &cp, &len) != 1) { if (kyber_cpa_public_key_from_bytes(&key, &cp, &len) != 1) {
error_print(); error_print();
return -1; return -1;
} }
if (kyber_cpa_private_key_from_bytes(&sk, &cp, &len) != 1) { if (kyber_cpa_private_key_from_bytes(&key, &cp, &len) != 1) {
error_print(); error_print();
return -1; return -1;
} }
@@ -549,13 +543,13 @@ static int test_kyber_cpa_key_to_bytes(void)
static int test_kyber_key_to_bytes(void) static int test_kyber_key_to_bytes(void)
{ {
KYBER_PRIVATE_KEY key; KYBER_KEY key;
uint8_t buf[sizeof(KYBER_PRIVATE_KEY) + sizeof(KYBER_PRIVATE_KEY)]; uint8_t buf[KYBER_PUBLIC_KEY_SIZE + KYBER_PRIVATE_KEY_SIZE];
uint8_t *p = buf; uint8_t *p = buf;
const uint8_t *cp = buf; const uint8_t *cp = buf;
size_t len = 0; size_t len = 0;
if (kyber_key_generate(&key) != 1) { if (kyber_key_generate_ex(&key, NULL) != 1) {
error_print(); error_print();
return -1; return -1;
} }
@@ -587,8 +581,7 @@ static int test_kyber_key_to_bytes(void)
static int test_kyber_cpa_ciphertext_to_bytes(void) static int test_kyber_cpa_ciphertext_to_bytes(void)
{ {
KYBER_CPA_PUBLIC_KEY pk; KYBER_CPA_KEY key;
KYBER_CPA_PRIVATE_KEY sk;
KYBER_CPA_CIPHERTEXT c; KYBER_CPA_CIPHERTEXT c;
uint8_t m[32]; uint8_t m[32];
uint8_t r[32]; uint8_t r[32];
@@ -610,11 +603,11 @@ static int test_kyber_cpa_ciphertext_to_bytes(void)
return -1; return -1;
} }
if (kyber_cpa_keygen(&pk, &sk) != 1) { if (kyber_cpa_key_generate_ex(&key, NULL) != 1) {
error_print(); error_print();
return -1; return -1;
} }
if (kyber_cpa_encrypt(&pk, m, r, &c) != 1) { if (kyber_cpa_encrypt(&key, m, r, &c) != 1) {
error_print(); error_print();
return -1; return -1;
} }

4
tools/kyberdecap.c
View File

@@ -42,7 +42,7 @@ int kyberdecap_main(int argc, char **argv)
size_t keylen = KYBER_PRIVATE_KEY_SIZE; size_t keylen = KYBER_PRIVATE_KEY_SIZE;
const uint8_t *cp = keybuf; const uint8_t *cp = keybuf;
uint8_t *p = keybuf; uint8_t *p = keybuf;
KYBER_PRIVATE_KEY key; KYBER_KEY key;
uint8_t inbuf[sizeof(KYBER_CIPHERTEXT)]; uint8_t inbuf[sizeof(KYBER_CIPHERTEXT)];
uint8_t outbuf[32]; uint8_t outbuf[32];
@@ -162,7 +162,7 @@ bad:
ret = 0; ret = 0;
end: end:
//kyber_key_cleanup(&key); kyber_key_cleanup(&key);
gmssl_secure_clear(keybuf, sizeof(keybuf)); gmssl_secure_clear(keybuf, sizeof(keybuf));
if (keyfp) fclose(keyfp); if (keyfp) fclose(keyfp);
if (infp && infp != stdin) fclose(infp); if (infp && infp != stdin) fclose(infp);

4
tools/kyberencap.c
View File

@@ -47,7 +47,7 @@ int kyberencap_main(int argc, char **argv)
const uint8_t *cp = pubkeybuf; const uint8_t *cp = pubkeybuf;
uint8_t outbuf[sizeof(KYBER_CIPHERTEXT)]; uint8_t outbuf[sizeof(KYBER_CIPHERTEXT)];
size_t outlen; size_t outlen;
KYBER_PRIVATE_KEY key; KYBER_KEY key;
KYBER_CIPHERTEXT ciphertext; KYBER_CIPHERTEXT ciphertext;
uint8_t outkey[32]; uint8_t outkey[32];
@@ -124,7 +124,7 @@ bad:
} }
if (kyber_encap(&key.pk, &ciphertext, outkey) != 1) { if (kyber_encap(&key, &ciphertext, outkey) != 1) {
error_print(); error_print();
return -1; return -1;
} }

8
tools/kyberkeygen.c
View File

@@ -35,9 +35,9 @@ int kyberkeygen_main(int argc, char **argv)
int verbose = 0; int verbose = 0;
FILE *outfp = NULL; FILE *outfp = NULL;
FILE *puboutfp = stdout; FILE *puboutfp = stdout;
KYBER_PRIVATE_KEY key; KYBER_KEY key;
uint8_t out[sizeof(KYBER_PRIVATE_KEY)]; uint8_t out[KYBER_PRIVATE_KEY_SIZE];
uint8_t pubout[sizeof(KYBER_PUBLIC_KEY)]; uint8_t pubout[KYBER_PUBLIC_KEY_SIZE];
uint8_t *pout = out; uint8_t *pout = out;
uint8_t *ppubout = pubout; uint8_t *ppubout = pubout;
size_t outlen = 0, puboutlen = 0; size_t outlen = 0, puboutlen = 0;
@@ -91,7 +91,7 @@ bad:
goto end; goto end;
} }
if (kyber_key_generate(&key) != 1) { if (kyber_key_generate_ex(&key, NULL) != 1) {
error_print(); error_print();
return -1; return -1;
} }