sharpetronics/liboqs
1
0
Fork 0
mirror of https://github.com/open-quantum-safe/liboqs.git synced 2025-11-22 00:09:23 -05:00
Code Issues Projects Releases Wiki Activity

Fixes for scan-build and make. (#69)

Browse Source
This commit is contained in:
Alex Parent 2016-12-13 11:19:28 -05:00 committed by Douglas Stebila
parent 55f0be9a61
commit 35e53b038f
3 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -151,7 +151,7 @@ check: links tests
./test_aes
clean:
rm -rf docs objs include
rm -rf docs/doxygen objs include
rm -f test_rand test_kex test_aes liboqs.a
find . -name .DS_Store -type f -delete

3
docs/Algorithm data sheets/kex_rlwe_bcns15.md
View File

@ -60,7 +60,8 @@ Implementation
- Correctness: covered by test harness `test_kex`
- Statistics of shared secrets: covered by test harness `test_kex`
- statistical distance from uniform over 100 iterations: 0.0561185025
- Static analysis: none
- Static analysis:
- `scan_build`
**Runtime:**

41
src/kex_rlwe_bcns15/kex_rlwe_bcns15.c
View File

@ -14,6 +14,7 @@
#include <oqs/kex.h>
#include <oqs/rand.h>
#include <oqs/common.h>
#include "kex_rlwe_bcns15.h"
#include "local.h"
@ -54,13 +55,14 @@ OQS_KEX *OQS_KEX_rlwe_bcns15_new(OQS_RAND *rand) {
int OQS_KEX_rlwe_bcns15_alice_0(OQS_KEX *k, void **alice_priv, uint8_t **alice_msg, size_t *alice_msg_len) {
int ret;
uint32_t *alice_msg_32 = NULL;
*alice_priv = NULL;
*alice_msg = NULL;
/* allocate public/private key pair */
*alice_msg = malloc(1024 * sizeof(uint32_t));
if (*alice_msg == NULL) {
alice_msg_32 = malloc(1024 * sizeof(uint32_t));
if (alice_msg_32 == NULL) {
goto err;
}
*alice_priv = malloc(1024 * sizeof(uint32_t));
@ -69,7 +71,8 @@ int OQS_KEX_rlwe_bcns15_alice_0(OQS_KEX *k, void **alice_priv, uint8_t **alice_m
}
/* generate public/private key pair */
oqs_kex_rlwe_bcns15_generate_keypair(oqs_kex_rlwe_bcns15_a, (uint32_t *) *alice_priv, (uint32_t *) *alice_msg, k->ctx, k->rand);
oqs_kex_rlwe_bcns15_generate_keypair(oqs_kex_rlwe_bcns15_a, (uint32_t *) *alice_priv, alice_msg_32, k->ctx, k->rand);
*alice_msg = (uint8_t *) alice_msg_32;
*alice_msg_len = 1024 * sizeof(uint32_t);
ret = 1;
@ -77,8 +80,8 @@ int OQS_KEX_rlwe_bcns15_alice_0(OQS_KEX *k, void **alice_priv, uint8_t **alice_m
err:
ret = 0;
free(*alice_msg);
free(*alice_priv);
free(alice_msg_32);
OQS_MEM_secure_free(*alice_priv, 1024 * sizeof(uint32_t));
cleanup:
return ret;
@ -89,7 +92,9 @@ int OQS_KEX_rlwe_bcns15_bob(OQS_KEX *k, const uint8_t *alice_msg, const size_t a
int ret;
uint8_t *bob_priv = NULL;
uint32_t *bob_priv = NULL;
uint64_t *key_64 = NULL;
*bob_msg = NULL;
*key = NULL;
@ -106,18 +111,19 @@ int OQS_KEX_rlwe_bcns15_bob(OQS_KEX *k, const uint8_t *alice_msg, const size_t a
if (*bob_msg == NULL) {
goto err;
}
*key = malloc(16 * sizeof(uint64_t));
if (*key == NULL) {
key_64 = malloc(16 * sizeof(uint64_t));
if (key_64 == NULL) {
goto err;
}
/* generate public/private key pair */
oqs_kex_rlwe_bcns15_generate_keypair(oqs_kex_rlwe_bcns15_a, (uint32_t *) bob_priv, (uint32_t *) *bob_msg, k->ctx, k->rand);
oqs_kex_rlwe_bcns15_generate_keypair(oqs_kex_rlwe_bcns15_a, bob_priv, (uint32_t *) *bob_msg, k->ctx, k->rand);
/* generate Bob's response */
uint8_t *bob_rec = *bob_msg + 1024 * sizeof(uint32_t);
oqs_kex_rlwe_bcns15_compute_key_bob((uint32_t *) alice_msg, (uint32_t *) bob_priv, (uint64_t *) bob_rec, (uint64_t *) *key, k->ctx, k->rand);
oqs_kex_rlwe_bcns15_compute_key_bob((uint32_t *) alice_msg, bob_priv, (uint64_t *) bob_rec, key_64, k->ctx, k->rand);
*bob_msg_len = 1024 * sizeof(uint32_t) + 16 * sizeof(uint64_t);
*key = (uint8_t *) key_64;
*key_len = 16 * sizeof(uint64_t);
ret = 1;
@ -126,10 +132,10 @@ int OQS_KEX_rlwe_bcns15_bob(OQS_KEX *k, const uint8_t *alice_msg, const size_t a
err:
ret = 0;
free(*bob_msg);
free(*key);
OQS_MEM_secure_free(key_64, 16 * sizeof(uint64_t));
cleanup:
free(bob_priv);
OQS_MEM_secure_free(bob_priv, 1024 * sizeof(uint32_t));
return ret;
@ -139,6 +145,8 @@ int OQS_KEX_rlwe_bcns15_alice_1(OQS_KEX *k, const void *alice_priv, const uint8_
int ret;
uint64_t *key_64 = NULL;
*key = NULL;
if (bob_msg_len != 1024 * sizeof(uint32_t) + 16 * sizeof(uint64_t)) {
@ -146,14 +154,15 @@ int OQS_KEX_rlwe_bcns15_alice_1(OQS_KEX *k, const void *alice_priv, const uint8_
}
/* allocate session key */
*key = malloc(16 * sizeof(uint64_t));
if (*key == NULL) {
key_64 = malloc(16 * sizeof(uint64_t));
if (key_64 == NULL) {
goto err;
}
/* generate Alice's session key */
const uint8_t *bob_rec = bob_msg + 1024 * sizeof(uint32_t);
oqs_kex_rlwe_bcns15_compute_key_alice((uint32_t *)bob_msg, (uint32_t *)alice_priv, (uint64_t *) bob_rec, (uint64_t *) *key, k->ctx);
oqs_kex_rlwe_bcns15_compute_key_alice((uint32_t *)bob_msg, (uint32_t *)alice_priv, (uint64_t *) bob_rec, key_64, k->ctx);
*key = (uint8_t *) key_64;
*key_len = 16 * sizeof(uint64_t);
ret = 1;
@ -161,7 +170,7 @@ int OQS_KEX_rlwe_bcns15_alice_1(OQS_KEX *k, const void *alice_priv, const uint8_
err:
ret = 0;
free(*key);
OQS_MEM_secure_free(key_64, 16 * sizeof(uint64_t));
cleanup: