From patchwork Tue Nov 21 10:10:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Lichtenheld X-Patchwork-Id: 3462 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:53c1:b0:f2:62eb:61c1 with SMTP id u1csp258286dye; Tue, 21 Nov 2023 02:12:03 -0800 (PST) X-Google-Smtp-Source: AGHT+IGVj/Wk1rqXFLTbon5mQfY5BoDlcjYljdcDtxc68BfvVkUv1ewi8aNX/fPCVnlmy+iOZg2B X-Received: by 2002:a05:6808:2013:b0:3b2:9c2f:50e0 with SMTP id q19-20020a056808201300b003b29c2f50e0mr11462955oiw.5.1700561523184; Tue, 21 Nov 2023 02:12:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700561523; cv=none; d=google.com; s=arc-20160816; b=ANpXY1kzA1DCZGpY0oHrEkp9GncRlw1qk8IepT0k/KoG0Ec5j1RESnMVRH+Eb6aChA bIJikGsX/s3oflh5oU8xX43FOY8Tyc7+X2/UDuol/NS+c1ZGR02CP62itI2ON+Y8FRKy QJB2Pzb6oWB+nut/f4wdEDNFgWcghJkrtlUsYea2XEvOxNH3N99d33+XQKdCEZ+zEDT2 QNlNLSDOUy/KtftN6VVD8NBaGeEG+Zmrp/cCeFCcJ/YyNyjb6vqmRRiyoxYiZe0EcMSh X0Pt47wpD79AaxIio0/kuuHUQKyc8Bz7VnSvn+bxLsgPgJ6VOiKf9ttxBRWRWFaKWlJy PDtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:content-transfer-encoding:cc:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:dkim-signature:dkim-signature; bh=6FYSly3kBEdTjtG8Zhqy/Go5vf2ORUf/wLtV0EYN0Ns=; fh=CfxSpwd5kfiMJoL3kcov7PTxVKT7pGe/79idnx9XlBs=; b=izdZcD9cApMu8OzftO4jA/LgCb7By7EDKDoCsz5NPnbLGBOqNonKlLtWHbQWHgBg1c uPK4P3kw5jLTW5YrPxr7kFprLkAZNTUHUJVQY48O1caKbP5mbALSCjGOxumOFQ6x5+bo q8TVJoMEv1U2N0ZWGUbqvsyqIrABNXg3IVCqji6nZKLRfkkR5UX0ssddNMUqHuwUGFsD Mh4eWA0TvjT1Z35Zt5uzPaTsqefQz31Bg7AQgEQOe7Hdcr/wkMFOM8o6ngjTHU7bUaVg ZeY1izQZ2/Wih7ZHHX4s6O/9U0TGVmh2d0G+RMAxO2/oQfQ3RjAFD10ryKOLDcX5J6u/ x9kg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=W1rafvI1; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=JHPSqFui; dkim=neutral (body hash did not verify) header.i=@lichtenheld.com header.s=MBO0001 header.b=de9vY5Bh; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id l189-20020a6388c6000000b0059ccb99a2eesi10574087pgd.173.2023.11.21.02.12.02 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Nov 2023 02:12:03 -0800 (PST) Received-SPF: pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) client-ip=216.105.38.7; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=W1rafvI1; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=JHPSqFui; dkim=neutral (body hash did not verify) header.i=@lichtenheld.com header.s=MBO0001 header.b=de9vY5Bh; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1r5Nid-00034u-JC; Tue, 21 Nov 2023 10:10:59 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1r5Nib-00034m-US for openvpn-devel@lists.sourceforge.net; Tue, 21 Nov 2023 10:10:58 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=9jDUAsGQ6sr921O5PKetvt5wAh3Xb5FpNlbZcpMse6k=; b=W1rafvI1MY9gZ3c4Y0eXfJYsME ump6TjbCGit6Noctp+k+7OpCut1yWe91J4Zp0WbBgzfPDvDDjr9UX6MODI+25FKDWLciPnch8v0+j SxAX+yaJObDKPQzpzP3s/irD+ckUnGj6QQ5WRk2KT95ou4CybCGRoukdzqIV+oh3NhRo=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=9jDUAsGQ6sr921O5PKetvt5wAh3Xb5FpNlbZcpMse6k=; b=JHPSqFuijcMbtYC+17YZPBs1d0 KdLFIEtUcxMyfFYpRgloqS1tMsAN26yyioxO7Bn2SV5ZDu5z11X65RjNepzeGJkV9BoQ/b2xjKnBp vG57mde0MIcF2lmP3SQbLghGcDruDHJ1t2nOTFpyh0MNALQIw09YdxOlAbLWRlv4Y5+0=; Received: from mout-p-201.mailbox.org ([80.241.56.171]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1r5NiY-0000ib-0d for openvpn-devel@lists.sourceforge.net; Tue, 21 Nov 2023 10:10:58 +0000 Received: from smtp1.mailbox.org (smtp1.mailbox.org [10.196.197.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4SZKrf1VLmz9sZg; Tue, 21 Nov 2023 11:10:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lichtenheld.com; s=MBO0001; t=1700561442; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9jDUAsGQ6sr921O5PKetvt5wAh3Xb5FpNlbZcpMse6k=; b=de9vY5Bh3k3BIGn8Om54DiKD/ILdHqENDpUo5IOE2YiA8OW/VO9YOJ3h2/l/k+xWs9lyU2 LMOSfEY9CLQRl12Fp5FR1nWxuYn7fiMdXz7WnwobtnL35cKUo+XzH+iXFqvLHoeUKg3sE3 aR3UlSP74oRbYZELLyStlIQrxOzKUpoYjmcM9YJJclEjXYwyYnotdMtbFqMXVVYh/wquhL 5IwA5yjuKvveE18k43uXEYtBMg4OChHml6tu4FgXQBQLMoiGtt5CcJLwnuVZo1KpgwMi4W bGu5XApOlDLtEAYcoGqtrrhe/hGSZezw/J+O27q9JHJeSo7hOzhjS55FIPPINQ== From: Frank Lichtenheld To: openvpn-devel@lists.sourceforge.net Date: Tue, 21 Nov 2023 11:10:40 +0100 Message-Id: <20231121101040.13528-1-frank@lichtenheld.com> In-Reply-To: References: MIME-Version: 1.0 X-Spam-Score: -0.9 (/) X-Spam-Report: Spam detection software, running on the system "util-spamd-2.v13.lw.sourceforge.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: These are all fixes I considered "safe". They either - Have sufficient checks/shifts for a cast to be safe - Fix the type of a variable without requiring code changes - Are in non-critical unittest code Content analysis details: (-0.9 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [80.241.56.171 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Headers-End: 1r5NiY-0000ib-0d Subject: [Openvpn-devel] [PATCH v5] Various fixes for -Wconversion errors X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arne Schwabe Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1783167999477090371?= X-GMAIL-MSGID: =?utf-8?q?1783167999477090371?= These are all fixes I considered "safe". They either - Have sufficient checks/shifts for a cast to be safe - Fix the type of a variable without requiring code changes - Are in non-critical unittest code v2: - add min_size instead of abusing min_int Change-Id: I6818b153bdeb1eed65870af99b0531e95807fe0f Signed-off-by: Frank Lichtenheld Acked-by: Arne Schwabe --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/267 This mail reflects revision 5 of this Change. Acked-by according to Gerrit (reflected above): Arne Schwabe diff --git a/src/openvpn/buffer.c b/src/openvpn/buffer.c index 24f1ef2..a32e7d2 100644 --- a/src/openvpn/buffer.c +++ b/src/openvpn/buffer.c @@ -352,7 +352,7 @@ return false; } - const int size = write(fd, BPTR(buf), BLEN(buf)); + const ssize_t size = write(fd, BPTR(buf), BLEN(buf)); if (size != BLEN(buf)) { msg(M_ERRNO, "Write error on file '%s'", filename); @@ -889,7 +889,7 @@ { break; } - line[n++] = c; + line[n++] = (char)c; } while (c); diff --git a/src/openvpn/crypto.c b/src/openvpn/crypto.c index e4452d7..7768b9e 100644 --- a/src/openvpn/crypto.c +++ b/src/openvpn/crypto.c @@ -26,6 +26,8 @@ #include "config.h" #endif +#include + #include "syshead.h" #include "crypto.h" @@ -1263,8 +1265,8 @@ hex_byte[hb_index++] = c; if (hb_index == 2) { - unsigned int u; - ASSERT(sscanf((const char *)hex_byte, "%x", &u) == 1); + uint8_t u; + ASSERT(sscanf((const char *)hex_byte, "%" SCNx8, &u) == 1); *out++ = u; hb_index = 0; if (++count == keylen) @@ -1526,13 +1528,13 @@ ASSERT(cipher_kt_key_size(kt->cipher) <= MAX_CIPHER_KEY_LENGTH && md_kt_size(kt->digest) <= MAX_HMAC_KEY_LENGTH); - const uint8_t cipher_length = cipher_kt_key_size(kt->cipher); + const uint8_t cipher_length = (uint8_t)cipher_kt_key_size(kt->cipher); if (!buf_write(buf, &cipher_length, 1)) { return false; } - uint8_t hmac_length = md_kt_size(kt->digest); + uint8_t hmac_length = (uint8_t)md_kt_size(kt->digest); if (!buf_write(buf, &hmac_length, 1)) { diff --git a/src/openvpn/integer.h b/src/openvpn/integer.h index a012524..a0e421d 100644 --- a/src/openvpn/integer.h +++ b/src/openvpn/integer.h @@ -28,12 +28,12 @@ #ifndef htonll #define htonll(x) ((1==htonl(1)) ? (x) : \ - ((uint64_t)htonl((x) & 0xFFFFFFFF) << 32) | htonl((x) >> 32)) + ((uint64_t)htonl((uint32_t)((x) & 0xFFFFFFFF)) << 32) | htonl((uint32_t)((x) >> 32))) #endif #ifndef ntohll #define ntohll(x) ((1==ntohl(1)) ? (x) : \ - ((uint64_t)ntohl((x) & 0xFFFFFFFF) << 32) | ntohl((x) >> 32)) + ((uint64_t)ntohl((uint32_t)((x) & 0xFFFFFFFF)) << 32) | ntohl((uint32_t)((x) >> 32))) #endif static inline int @@ -72,6 +72,19 @@ } } +static inline size_t +min_size(size_t x, size_t y) +{ + if (x < y) + { + return x; + } + else + { + return y; + } +} + static inline int max_int(int x, int y) { diff --git a/src/openvpn/mss.c b/src/openvpn/mss.c index 1566c64..108b370 100644 --- a/src/openvpn/mss.c +++ b/src/openvpn/mss.c @@ -165,7 +165,7 @@ return; } - for (olen = hlen - sizeof(struct openvpn_tcphdr), + for (olen = hlen - (int) sizeof(struct openvpn_tcphdr), opt = (uint8_t *)(tc + 1); olen > 1; olen -= optlen, opt += optlen) diff --git a/src/openvpn/otime.c b/src/openvpn/otime.c index b28a90f..e751246 100644 --- a/src/openvpn/otime.c +++ b/src/openvpn/otime.c @@ -105,7 +105,7 @@ /* format a time_t as ascii, or use current time if 0 */ const char * -time_string(time_t t, int usec, bool show_usec, struct gc_arena *gc) +time_string(time_t t, long usec, bool show_usec, struct gc_arena *gc) { struct buffer out = alloc_buf_gc(64, gc); struct timeval tv; diff --git a/src/openvpn/otime.h b/src/openvpn/otime.h index c27be89..d795c3c 100644 --- a/src/openvpn/otime.h +++ b/src/openvpn/otime.h @@ -43,7 +43,7 @@ bool frequency_limit_event_allowed(struct frequency_limit *f); /* format a time_t as ascii, or use current time if 0 */ -const char *time_string(time_t t, int usec, bool show_usec, struct gc_arena *gc); +const char *time_string(time_t t, long usec, bool show_usec, struct gc_arena *gc); /* struct timeval functions */ diff --git a/src/openvpn/packet_id.c b/src/openvpn/packet_id.c index ef83248..3d6f3ee 100644 --- a/src/openvpn/packet_id.c +++ b/src/openvpn/packet_id.c @@ -588,14 +588,14 @@ } else { - diff = (int) prev_now - v; + diff = (int)(prev_now - v); if (diff < 0) { c = 'N'; } else if (diff < 10) { - c = '0' + diff; + c = (char)('0' + diff); } else { diff --git a/src/openvpn/reliable.c b/src/openvpn/reliable.c index e7d4d5f..0e26f98 100644 --- a/src/openvpn/reliable.c +++ b/src/openvpn/reliable.c @@ -257,8 +257,7 @@ struct buffer *buf, const struct session_id *sid, int max, bool prepend) { - int i, j; - uint8_t n; + int i, j, n; struct buffer sub; n = ack->len; @@ -270,9 +269,9 @@ copy_acks_to_mru(ack, ack_mru, n); /* Number of acks we can resend that still fit into the packet */ - uint8_t total_acks = min_int(max, ack_mru->len); + uint8_t total_acks = (uint8_t)min_int(max, ack_mru->len); - sub = buf_sub(buf, ACK_SIZE(total_acks), prepend); + sub = buf_sub(buf, (int)ACK_SIZE(total_acks), prepend); if (!BDEF(&sub)) { goto error; diff --git a/src/openvpn/socket.h b/src/openvpn/socket.h index bfc1253..a4acc5d 100644 --- a/src/openvpn/socket.h +++ b/src/openvpn/socket.h @@ -1181,7 +1181,7 @@ } /* write a TCP or UDP packet to link */ -static inline int +static inline size_t link_socket_write(struct link_socket *sock, struct buffer *buf, struct link_socket_actual *to) @@ -1198,7 +1198,7 @@ else { ASSERT(0); - return -1; /* NOTREACHED */ + return 0; /* NOTREACHED */ } } diff --git a/src/openvpn/tls_crypt.c b/src/openvpn/tls_crypt.c index 975d31f..f0946cb 100644 --- a/src/openvpn/tls_crypt.c +++ b/src/openvpn/tls_crypt.c @@ -634,7 +634,7 @@ memcpy(&net_len, BEND(&wrapped_client_key) - sizeof(net_len), sizeof(net_len)); - size_t wkc_len = ntohs(net_len); + uint16_t wkc_len = ntohs(net_len); if (!buf_advance(&wrapped_client_key, BLEN(&wrapped_client_key) - wkc_len)) { msg(D_TLS_ERRORS, "Can not locate tls-crypt-v2 client key"); diff --git a/src/openvpn/xkey_helper.c b/src/openvpn/xkey_helper.c index 40839f2..fcf8c2e 100644 --- a/src/openvpn/xkey_helper.c +++ b/src/openvpn/xkey_helper.c @@ -292,7 +292,7 @@ * @return false on error, true on success * * On return enc_len is set to actual size of the result. - * enc is NULL or enc_len is not enough to store the result, it is set + * If enc is NULL or enc_len is not enough to store the result, it is set * to the required size and false is returned. */ bool @@ -337,8 +337,8 @@ MAKE_DI(sha512), MAKE_DI(sha224), MAKE_DI(sha512_224), MAKE_DI(sha512_256), {0, NULL, 0}}; - int out_len = 0; - int ret = 0; + size_t out_len = 0; + bool ret = false; int nid = OBJ_sn2nid(mdname); if (nid == NID_undef) @@ -354,7 +354,7 @@ if (tbslen != EVP_MD_size(EVP_get_digestbyname(mdname))) { - msg(M_WARN, "Error: encode_pkcs11: invalid input length <%d>", (int)tbslen); + msg(M_WARN, "Error: encode_pkcs11: invalid input length <%zu>", tbslen); goto done; } @@ -383,13 +383,13 @@ out_len = tbslen + di->sz; - if (enc && (out_len <= (int) *enc_len)) + if (enc && (out_len <= *enc_len)) { /* combine header and digest */ memcpy(enc, di->header, di->sz); memcpy(enc + di->sz, tbs, tbslen); - dmsg(D_XKEY, "encode_pkcs1: digest length = %d encoded length = %d", - (int) tbslen, (int) out_len); + dmsg(D_XKEY, "encode_pkcs1: digest length = %zu encoded length = %zu", + tbslen, out_len); ret = true; } diff --git a/tests/unit_tests/openvpn/mock_get_random.c b/tests/unit_tests/openvpn/mock_get_random.c index 787b5e3..dfc7287 100644 --- a/tests/unit_tests/openvpn/mock_get_random.c +++ b/tests/unit_tests/openvpn/mock_get_random.c @@ -41,6 +41,6 @@ { for (int i = 0; i < len; i++) { - output[i] = rand(); + output[i] = (uint8_t)rand(); } } diff --git a/tests/unit_tests/openvpn/test_crypto.c b/tests/unit_tests/openvpn/test_crypto.c index 5564524..9cfa9dc 100644 --- a/tests/unit_tests/openvpn/test_crypto.c +++ b/tests/unit_tests/openvpn/test_crypto.c @@ -97,8 +97,8 @@ for (int i = 0; i < strlen(ciphername); i++) { - upper[i] = toupper(ciphername[i]); - lower[i] = tolower(ciphername[i]); + upper[i] = (char)toupper((unsigned char)ciphername[i]); + lower[i] = (char)tolower((unsigned char)ciphername[i]); if (rand() & 0x1) { random_case[i] = upper[i]; @@ -160,7 +160,7 @@ uint8_t out[32]; - ssl_tls1_PRF(seed, seed_len, secret, secret_len, out, sizeof(out)); + ssl_tls1_PRF(seed, (int)seed_len, secret, (int)secret_len, out, sizeof(out)); assert_memory_equal(good_prf, out, sizeof(out)); } diff --git a/tests/unit_tests/openvpn/test_packet_id.c b/tests/unit_tests/openvpn/test_packet_id.c index 90c67ac..c351858 100644 --- a/tests/unit_tests/openvpn/test_packet_id.c +++ b/tests/unit_tests/openvpn/test_packet_id.c @@ -94,7 +94,7 @@ assert(data->pis.id == 1); assert(data->pis.time == now); assert_true(data->test_buf_data.buf_id == htonl(1)); - assert_true(data->test_buf_data.buf_time == htonl(now)); + assert_true(data->test_buf_data.buf_time == htonl((uint32_t)now)); } static void @@ -121,7 +121,7 @@ assert(data->pis.id == 1); assert(data->pis.time == now); assert_true(data->test_buf_data.buf_id == htonl(1)); - assert_true(data->test_buf_data.buf_time == htonl(now)); + assert_true(data->test_buf_data.buf_time == htonl((uint32_t)now)); } static void @@ -152,7 +152,7 @@ assert(data->pis.id == 1); assert(data->pis.time == now); assert_true(data->test_buf_data.buf_id == htonl(1)); - assert_true(data->test_buf_data.buf_time == htonl(now)); + assert_true(data->test_buf_data.buf_time == htonl((uint32_t)now)); } static void diff --git a/tests/unit_tests/openvpn/test_provider.c b/tests/unit_tests/openvpn/test_provider.c index 335fca2..5e57f33 100644 --- a/tests/unit_tests/openvpn/test_provider.c +++ b/tests/unit_tests/openvpn/test_provider.c @@ -365,7 +365,7 @@ } /* return a predefined string as sig */ - memcpy(sig, good_sig, min_int(sizeof(good_sig), *siglen)); + memcpy(sig, good_sig, min_size(sizeof(good_sig), *siglen)); return 1; } diff --git a/tests/unit_tests/openvpn/test_tls_crypt.c b/tests/unit_tests/openvpn/test_tls_crypt.c index ed7c794..3b885ab 100644 --- a/tests/unit_tests/openvpn/test_tls_crypt.c +++ b/tests/unit_tests/openvpn/test_tls_crypt.c @@ -138,7 +138,7 @@ { for (int i = 0; i < len; i++) { - output[i] = i; + output[i] = (uint8_t)i; } return true; }