From 71927d7dd981f6e0a9705dd2ddf5bc60abfbaeab Mon Sep 17 00:00:00 2001 From: deraadt <> Date: Tue, 10 Mar 2026 05:26:04 +0000 Subject: use O_CLOEXEC; ok tb --- src/lib/libcrypto/rand/randfile.c | 4 ++-- src/lib/libtls/tls_config.c | 4 ++-- src/lib/libtls/tls_util.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/lib/libcrypto/rand/randfile.c b/src/lib/libcrypto/rand/randfile.c index 5fdfcb8dd3..8b56585ee1 100644 --- a/src/lib/libcrypto/rand/randfile.c +++ b/src/lib/libcrypto/rand/randfile.c @@ -1,4 +1,4 @@ -/* $OpenBSD: randfile.c,v 1.45 2024/04/10 14:53:01 beck Exp $ */ +/* $OpenBSD: randfile.c,v 1.46 2026/03/10 05:26:04 deraadt Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -105,7 +105,7 @@ RAND_write_file(const char *file) return (1); } - fd = open(file, O_WRONLY|O_CREAT, 0600); + fd = open(file, O_WRONLY|O_CREAT|O_CLOEXEC, 0600); if (fd == -1) return (1); out = fdopen(fd, "wb"); diff --git a/src/lib/libtls/tls_config.c b/src/lib/libtls/tls_config.c index 22fa8455a1..848117a91a 100644 --- a/src/lib/libtls/tls_config.c +++ b/src/lib/libtls/tls_config.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tls_config.c,v 1.71 2024/08/02 15:00:01 tb Exp $ */ +/* $OpenBSD: tls_config.c,v 1.72 2026/03/10 05:26:04 deraadt Exp $ */ /* * Copyright (c) 2014 Joel Sing * @@ -49,7 +49,7 @@ tls_config_load_file(struct tls_error *error, const char *filetype, *buf = NULL; *len = 0; - if ((fd = open(filename, O_RDONLY)) == -1) { + if ((fd = open(filename, O_RDONLY|O_CLOEXEC)) == -1) { tls_error_set(error, TLS_ERROR_UNKNOWN, "failed to open %s file '%s'", filetype, filename); diff --git a/src/lib/libtls/tls_util.c b/src/lib/libtls/tls_util.c index b276d2cfa7..d93efb830d 100644 --- a/src/lib/libtls/tls_util.c +++ b/src/lib/libtls/tls_util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tls_util.c,v 1.16 2023/05/14 07:26:25 op Exp $ */ +/* $OpenBSD: tls_util.c,v 1.17 2026/03/10 05:26:04 deraadt Exp $ */ /* * Copyright (c) 2014 Joel Sing * Copyright (c) 2014 Ted Unangst @@ -162,7 +162,7 @@ tls_load_file(const char *name, size_t *len, char *password) *len = 0; - if ((fd = open(name, O_RDONLY)) == -1) + if ((fd = open(name, O_RDONLY|O_CLOEXEC)) == -1) return (NULL); /* Just load the file into memory without decryption */ -- cgit v1.2.3-55-g6feb