um_callerid: Only people can have common channels

[solanum.git] / librb / src / mbedtls.c

diff --git a/librb/src/mbedtls.c b/librb/src/mbedtls.c
index 25bbb0fb8a52a36d6a3e5b0362fd6d04fd4dac66..b65cc66ab8a847051ae0e0d8efa1d9421bacf2bd 100644 (file)
--- a/librb/src/mbedtls.c
+++ b/librb/src/mbedtls.c
@@ -4,7 +4,7 @@
  *
  *  Copyright (C) 2007-2008 ircd-ratbox development team
  *  Copyright (C) 2007-2008 Aaron Sethman <androsyn@ratbox.org>
- *  Copyright (C) 2015 William Pitcock <nenolod@dereferenced.org>
+ *  Copyright (C) 2015 Ariadne Conill <ariadne@dereferenced.org>
  *  Copyright (C) 2016 Aaron Jones <aaronmdjones@gmail.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -233,8 +233,8 @@ rb_mbedtls_cfg_new(void)
        mbedtls_ssl_conf_authmode(&cfg->server_cfg, MBEDTLS_SSL_VERIFY_OPTIONAL);
        mbedtls_ssl_conf_authmode(&cfg->client_cfg, MBEDTLS_SSL_VERIFY_NONE);
 
-       mbedtls_ssl_conf_min_version(&cfg->server_cfg, MBEDTLS_SSL_MAJOR_VERSION_3, MBEDTLS_SSL_MINOR_VERSION_2);
-       mbedtls_ssl_conf_min_version(&cfg->client_cfg, MBEDTLS_SSL_MAJOR_VERSION_3, MBEDTLS_SSL_MINOR_VERSION_2);
+       mbedtls_ssl_conf_min_version(&cfg->server_cfg, MBEDTLS_SSL_MAJOR_VERSION_3, MBEDTLS_SSL_MINOR_VERSION_1);
+       mbedtls_ssl_conf_min_version(&cfg->client_cfg, MBEDTLS_SSL_MAJOR_VERSION_3, MBEDTLS_SSL_MINOR_VERSION_1);
 
        #ifdef MBEDTLS_SSL_LEGACY_BREAK_HANDSHAKE
        mbedtls_ssl_conf_legacy_renegotiation(&cfg->client_cfg, MBEDTLS_SSL_LEGACY_BREAK_HANDSHAKE);
@@ -370,13 +370,13 @@ rb_make_certfp(const mbedtls_x509_crt *const peer_cert, uint8_t certfp[const RB_
        int ret;
        void* data = peer_cert->raw.p;
        size_t datalen = peer_cert->raw.len;
+       unsigned char der_pubkey[8192];
 
        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];
                if((ret = mbedtls_pk_write_pubkey_der((mbedtls_pk_context *)&peer_cert->pk,
                                                       der_pubkey, sizeof der_pubkey)) < 0)
                {