9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mbedtls.c: minor fixups

Browse source 
- Add (void) casts for unused function parameters
- Rearrange member in `struct rb_mbedtls_cfg_context' for data alignment
- Document a `clang-4.0 -Weverything' (-Wcast-qual) diagnostic
- Avoid pointless conversions between positive/negative error codes
- Use capital hexadecimals in error codes and properly cast to
  (unsigned int) for %x/%X
This commit is contained in:
Aaron Jones 2017-07-03 00:12:47 +00:00 committed by Simon Arlott
parent 3fb264ef49
commit 515467e527
No known key found for this signature in database
GPG key ID: C8975F2043CA5D24
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
librb/src/mbedtls.c
View file

@ -50,8 +50,8 @@ typedef struct
mbedtls_dhm_context dhp; mbedtls_dhm_context dhp;
mbedtls_ssl_config server_cfg; mbedtls_ssl_config server_cfg;
mbedtls_ssl_config client_cfg; mbedtls_ssl_config client_cfg;
int suites[RB_MAX_CIPHERSUITES + 1];
size_t refcount; size_t refcount;
int suites[RB_MAX_CIPHERSUITES + 1];
} rb_mbedtls_cfg_context; } rb_mbedtls_cfg_context;
typedef struct typedef struct
@ -255,6 +255,8 @@ rb_ssl_accept_common(rb_fde_t *const F, void *const data)
lrb_assert(F->accept->callback != NULL); lrb_assert(F->accept->callback != NULL);
lrb_assert(F->ssl != NULL); lrb_assert(F->ssl != NULL);
(void) data;
const int ret = mbedtls_ssl_handshake(SSL_P(F)); const int ret = mbedtls_ssl_handshake(SSL_P(F));
switch(ret) switch(ret)
@ -314,16 +316,19 @@ rb_ssl_connect_common(rb_fde_t *const F, void *const data)
} }
static const char * static const char *
rb_ssl_strerror(const int err) rb_ssl_strerror(int err)
{ {
static char errbuf[512]; static char errbuf[512];
if (err < 0)
err = -err;
#ifdef MBEDTLS_ERROR_C #ifdef MBEDTLS_ERROR_C
char mbed_errbuf[512]; char mbed_errbuf[512];
mbedtls_strerror(err, mbed_errbuf, sizeof mbed_errbuf); mbedtls_strerror(err, mbed_errbuf, sizeof mbed_errbuf);
(void) snprintf(errbuf, sizeof errbuf, "-0x%x: %s", -err, mbed_errbuf); (void) snprintf(errbuf, sizeof errbuf, "-0x%X: %s", (unsigned int) err, mbed_errbuf);
#else #else
(void) snprintf(errbuf, sizeof errbuf, "-0x%x", -err); (void) snprintf(errbuf, sizeof errbuf, "-0x%X", (unsigned int) err);
#endif #endif
return errbuf; return errbuf;
@ -368,6 +373,9 @@ rb_make_certfp(const mbedtls_x509_crt *const peer_cert, uint8_t certfp[const RB_
if(spki) if(spki)
{ {
// Compiler may complain about dropping const qualifier on the cast below
// See <https://github.com/ARMmbed/mbedtls/issues/396> -- this is okay
unsigned char der_pubkey[8192]; unsigned char der_pubkey[8192];
if((ret = mbedtls_pk_write_pubkey_der((mbedtls_pk_context *)&peer_cert->pk, if((ret = mbedtls_pk_write_pubkey_der((mbedtls_pk_context *)&peer_cert->pk,
der_pubkey, sizeof der_pubkey)) < 0) der_pubkey, sizeof der_pubkey)) < 0)
@ -592,6 +600,9 @@ rb_setup_ssl_server(const char *const certfile, const char *keyfile,
int int
rb_init_prng(const char *const path, prng_seed_t seed_type) rb_init_prng(const char *const path, prng_seed_t seed_type)
{ {
(void) path;
(void) seed_type;
rb_lib_log("%s: Skipping PRNG initialisation; not required by MbedTLS backend", __func__); rb_lib_log("%s: Skipping PRNG initialisation; not required by MbedTLS backend", __func__);
return 1; return 1;
} }
@ -614,7 +625,7 @@ const char *
rb_get_ssl_strerror(rb_fde_t *const F) rb_get_ssl_strerror(rb_fde_t *const F)
{ {
const int err = (int) F->ssl_errno; const int err = (int) F->ssl_errno;
return rb_ssl_strerror(-err); return rb_ssl_strerror(err);
} }
int int
@ -747,6 +758,8 @@ rb_ssl_connect_realcb(rb_fde_t *const F, const int status, struct ssl_connect *c
static void static void
rb_ssl_timeout_cb(rb_fde_t *const F, void *const data) rb_ssl_timeout_cb(rb_fde_t *const F, void *const data)
{ {
(void) data;
lrb_assert(F->accept != NULL); lrb_assert(F->accept != NULL);
lrb_assert(F->accept->callback != NULL); lrb_assert(F->accept->callback != NULL);