SecBSD/src
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sync with OpenBSD -current

Browse Source
This commit is contained in:
purplerain 2024-09-08 16:32:10 +00:00
parent c6ae013d06
commit af487c914f
Signed by: purplerain
GPG Key ID: F42C07F07E2E35B7
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
regress/lib/libssl/api/apitest.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: apitest.c,v 1.2 2023/04/14 12:38:30 tb Exp $ */
/* $OpenBSD: apitest.c,v 1.3 2024/09/07 16:39:29 tb Exp $ */
/*
* Copyright (c) 2020, 2021 Joel Sing <jsing@openbsd.org>
*
@ -284,7 +284,7 @@ ssl_get_peer_cert_chain_test(uint16_t tls_version)
/*
* Due to the wonders of API inconsistency, SSL_get_peer_cert_chain()
* includes the peer's leaf certificate when called by the client,
* however it does not when called by the server. Futhermore, the
* however it does not when called by the server. Furthermore, the
* certificate returned by SSL_get_peer_certificate() has already
* had its reference count incremented and must be freed, where as
* the certificates returned from SSL_get_peer_cert_chain() must

6
sys/net/pfvar_priv.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: pfvar_priv.h,v 1.37 2024/06/21 12:51:29 sashan Exp $ */
/* $OpenBSD: pfvar_priv.h,v 1.38 2024/09/07 22:41:55 aisha Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@ -72,7 +72,7 @@ struct pf_state_key {
sa_family_t af;
u_int8_t proto;
RB_ENTRY(pf_state_key) sk_entry;
RBT_ENTRY(pf_state_key) sk_entry;
struct pf_statelisthead sk_states;
struct pf_state_key *sk_reverse;
struct inpcb *sk_inp; /* [L] */
@ -109,7 +109,7 @@ struct pf_state {
struct pfsync_deferral *sync_defer; /* [S] */
TAILQ_ENTRY(pf_state) entry_list; /* [L] */
SLIST_ENTRY(pf_state) gc_list; /* [g] */
RB_ENTRY(pf_state) entry_id; /* [P] */
RBT_ENTRY(pf_state) entry_id; /* [P] */
struct pf_state_peer src;
struct pf_state_peer dst;
struct pf_rule_slist match_rules; /* [I] */

8
usr.sbin/rpki-client/http.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: http.c,v 1.86 2024/08/20 13:31:49 claudio Exp $ */
/* $OpenBSD: http.c,v 1.87 2024/09/08 07:23:36 tb Exp $ */
/*
* Copyright (c) 2020 Nils Fisher <nils_fisher@hotmail.com>
* Copyright (c) 2020 Claudio Jeker <claudio@openbsd.org>
@ -709,7 +709,7 @@ http_inflate_new(struct http_connection *conn)
return 0;
fail:
warnx("%s: decompression initalisation failed", conn_info(conn));
warnx("%s: decompression initialisation failed", conn_info(conn));
if (zctx != NULL)
free(zctx->zbuf);
free(zctx);
@ -823,7 +823,7 @@ http_inflate_advance(struct http_connection *conn)
/*
* Create a new HTTP connection which will be used for the HTTP request req.
* On errors a req faulure is issued and both connection and request are freed.
* On errors a req failure is issued and both connection and request are freed.
*/
static void
http_new(struct http_request *req)
@ -1070,7 +1070,7 @@ http_connect(struct http_connection *conn)
}
/*
* Called once an asynchronus connect request finished.
* Called once an asynchronous connect request finished.
*/
static enum res
http_finish_connect(struct http_connection *conn)

4
usr.sbin/rpki-client/mft.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: mft.c,v 1.117 2024/06/11 10:38:40 tb Exp $ */
/* $OpenBSD: mft.c,v 1.118 2024/09/08 07:23:36 tb Exp $ */
/*
* Copyright (c) 2022 Theo Buehler <tb@openbsd.org>
* Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
@ -90,7 +90,7 @@ IMPLEMENT_ASN1_FUNCTIONS(Manifest);
/*
* Determine rtype corresponding to file extension. Returns RTYPE_INVALID
* on error or unkown extension.
* on error or unknown extension.
*/
enum rtype
rtype_from_file_extension(const char *fn)