Skip to content

build with mbedtls 3.x #198

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

Open
gstrauss wants to merge 1 commit into
base: master
Choose a base branch
from
Open

build with mbedtls 3.x #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 9 additions & 6 deletions src/cups.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@
#include "mbedtls/sha512.h"
#include "mbedtls/bignum.h"

#ifndef MBEDTLS_PRIVATE
#define MBEDTLS_PRIVATE(x) x
#endif

#define FAIL_CNT_THRES 6
#define SIGCRC_LEN 4
Expand Down Expand Up @@ -72,12 +75,12 @@ static int cups_verifySig (cups_sig_t* sig) {
mbedtls_ecdsa_context ecdsa;
mbedtls_ecdsa_init(&ecdsa);
int ret;
if ((ret = mbedtls_ecp_group_load (&k.grp, MBEDTLS_ECP_DP_SECP256R1) ) ||
(ret = mbedtls_mpi_read_binary (&k.Q.X, (u1_t*)key.buf, 32) ) ||
(ret = mbedtls_mpi_read_binary (&k.Q.Y, (u1_t*)key.buf+32, 32) ) ||
(ret = mbedtls_mpi_lset (&k.Q.Z, 1) ) ||
(ret = mbedtls_ecp_check_pubkey (&k.grp, &k.Q) ) ||
(ret = mbedtls_ecdsa_from_keypair (&ecdsa, &k) ) ||
if ((ret = mbedtls_ecp_group_load (&k.MBEDTLS_PRIVATE(grp), MBEDTLS_ECP_DP_SECP256R1) ) ||
(ret = mbedtls_mpi_read_binary (&k.MBEDTLS_PRIVATE(Q).MBEDTLS_PRIVATE(X), (u1_t*)key.buf, 32) ) ||
(ret = mbedtls_mpi_read_binary (&k.MBEDTLS_PRIVATE(Q).MBEDTLS_PRIVATE(Y), (u1_t*)key.buf+32, 32) ) ||
(ret = mbedtls_mpi_lset (&k.MBEDTLS_PRIVATE(Q).MBEDTLS_PRIVATE(Z), 1) ) ||
(ret = mbedtls_ecp_check_pubkey (&k.MBEDTLS_PRIVATE(grp), &k.MBEDTLS_PRIVATE(Q)) ) ||
(ret = mbedtls_ecdsa_from_keypair (&ecdsa, &k) ) ||
(ret = mbedtls_ecdsa_read_signature (&ecdsa, sig->hash, sizeof(sig->hash), sig->signature, sig->len ))
) {
verified = 0;
Expand Down
8 changes: 6 additions & 2 deletions src/tls.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@

#include "mbedtls/net_sockets.h"
#include "mbedtls/ssl.h"
#include "mbedtls/certs.h"
#include "mbedtls/entropy.h"
#include "mbedtls/ctr_drbg.h"
#include "mbedtls/error.h"
Expand Down Expand Up @@ -230,7 +229,12 @@ int tls_setMyCert (tlsconf_t* conf, const char* cert, int certlen, const char* k
keyb = (u1_t*)dbuf.buf;
keyl = dbuf.bufsize+1;
}
if( (ret = mbedtls_pk_parse_key(mykey, keyb, keyl, (const u1_t*)pwd, pwd?strlen(pwd):0)) != 0 ) {
ret = mbedtls_pk_parse_key(mykey, keyb, keyl, (const u1_t*)pwd, pwd?strlen(pwd):0
#if MBEDTLS_VERSION_NUMBER >= 0x03000000 /* mbedtls 3.0.0 */
, mbedtls_ctr_drbg_random, assertDBRG()
#endif
);
if( ret != 0 ) {
log_mbedError(ERROR, ret, "Parsing key");
goto errexit;
}
Expand Down
6 changes: 5 additions & 1 deletion src/tls.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@
#define _tls_h_

#include "mbedtls/ssl.h"
#include "mbedtls/net.h"
#if MBEDTLS_VERSION_NUMBER < 0x02040000L
#include <mbedtls/net.h>
#else
#include "mbedtls/net_sockets.h"
#endif

typedef struct tlsconf tlsconf_t;
typedef struct mbedtls_ssl_context* tlsctx_p;
Expand Down