mirror of
https://github.com/guanzhi/GmSSL.git
synced 2026-05-06 16:36:16 +08:00
Update Kyber
This commit is contained in:
@@ -42,7 +42,7 @@ int kyberdecap_main(int argc, char **argv)
|
||||
size_t keylen = KYBER_PRIVATE_KEY_SIZE;
|
||||
const uint8_t *cp = keybuf;
|
||||
uint8_t *p = keybuf;
|
||||
KYBER_PRIVATE_KEY key;
|
||||
KYBER_KEY key;
|
||||
|
||||
uint8_t inbuf[sizeof(KYBER_CIPHERTEXT)];
|
||||
uint8_t outbuf[32];
|
||||
@@ -162,7 +162,7 @@ bad:
|
||||
ret = 0;
|
||||
|
||||
end:
|
||||
//kyber_key_cleanup(&key);
|
||||
kyber_key_cleanup(&key);
|
||||
gmssl_secure_clear(keybuf, sizeof(keybuf));
|
||||
if (keyfp) fclose(keyfp);
|
||||
if (infp && infp != stdin) fclose(infp);
|
||||
|
||||
@@ -47,7 +47,7 @@ int kyberencap_main(int argc, char **argv)
|
||||
const uint8_t *cp = pubkeybuf;
|
||||
uint8_t outbuf[sizeof(KYBER_CIPHERTEXT)];
|
||||
size_t outlen;
|
||||
KYBER_PRIVATE_KEY key;
|
||||
KYBER_KEY key;
|
||||
KYBER_CIPHERTEXT ciphertext;
|
||||
|
||||
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();
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -35,9 +35,9 @@ int kyberkeygen_main(int argc, char **argv)
|
||||
int verbose = 0;
|
||||
FILE *outfp = NULL;
|
||||
FILE *puboutfp = stdout;
|
||||
KYBER_PRIVATE_KEY key;
|
||||
uint8_t out[sizeof(KYBER_PRIVATE_KEY)];
|
||||
uint8_t pubout[sizeof(KYBER_PUBLIC_KEY)];
|
||||
KYBER_KEY key;
|
||||
uint8_t out[KYBER_PRIVATE_KEY_SIZE];
|
||||
uint8_t pubout[KYBER_PUBLIC_KEY_SIZE];
|
||||
uint8_t *pout = out;
|
||||
uint8_t *ppubout = pubout;
|
||||
size_t outlen = 0, puboutlen = 0;
|
||||
@@ -91,7 +91,7 @@ bad:
|
||||
goto end;
|
||||
}
|
||||
|
||||
if (kyber_key_generate(&key) != 1) {
|
||||
if (kyber_key_generate_ex(&key, NULL) != 1) {
|
||||
error_print();
|
||||
return -1;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user