Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cloudflare-specific hybrid kyber768 support #78

Merged
merged 2 commits into from
Oct 20, 2022
Merged

cloudflare-specific hybrid kyber768 support #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66121e0
cloudflare-specific hybrid kyber768 support
baentsch Oct 19, 2022
a5084f0
restrict cloudflare secbit setting to x-hybrid
baentsch Oct 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion oqsprov/oqs_prov.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@

/* Internal OQS functions for other submodules: not for application use */

/* Set this define to create support for x25519_kyber768 as done by cloudflare */
// #define CLOUDFLARE

#ifndef OQSX_H
# define OQSX_H

Expand Down Expand Up @@ -70,9 +73,16 @@
(secbits == 128 ? "p256_" #oqsname "" : \
secbits == 192 ? "p384_" #oqsname "" : \
"p521_" #oqsname "")

#ifdef CLOUDFLARE
#define ECX_NAME(secbits, oqsname) \
(secbits == 128 ? "x25519_" #oqsname "" : \
(((secbits == 128) || (!strcmp("kyber768", ""#oqsname""))) ? "x25519_" #oqsname "" : \
"x448_" #oqsname "")
#else
#define ECX_NAME(secbits, oqsname) \
((secbits == 128) ? "x25519_" #oqsname "" : \
"x448_" #oqsname "")
#endif

typedef struct prov_oqs_ctx_st {
const OSSL_CORE_HANDLE *handle;
Expand Down
8 changes: 1 addition & 7 deletions oqsprov/oqsprov_capabilities.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,7 @@
// internal, but useful OSSL define:
# define OSSL_NELEM(x) (sizeof(x)/sizeof((x)[0]))

#define ECP_NAME(secbits, oqsname) \
(secbits == 128 ? "p256_" #oqsname "" : \
secbits == 192 ? "p384_" #oqsname "" : \
"p521_" #oqsname "")
#define ECX_NAME(secbits, oqsname) \
(secbits == 128 ? "x25519_" #oqsname "" : \
"x448_" #oqsname "")
#include "oqs_prov.h"

typedef struct oqs_group_constants_st {
unsigned int group_id; /* Group ID */
Expand Down
4 changes: 4 additions & 0 deletions oqsprov/oqsprov_keys.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,11 @@ OQSX_KEY *oqsx_key_new(OSSL_LIB_CTX *libctx, char* oqs_name, char* tls_name, int
ON_ERR_GOTO(!evp_ctx, err);

ret2 = (init_kex_fun[primitive - KEY_TYPE_ECP_HYB_KEM])
#ifdef CLOUDFLARE
(((!strcmp("Kyber768", oqs_name)&&(primitive==KEY_TYPE_ECX_HYB_KEM)))?128:bit_security, evp_ctx);
#else
(bit_security, evp_ctx);
#endif
ON_ERR_GOTO(ret2 <= 0 || !evp_ctx->keyParam || !evp_ctx->ctx, err);

ret->numkeys = 2;
Expand Down