Skip to content

Commit aa40a4f

Browse files
committed
fixup! Partially revert openssl#18070 (Add support for Windows CA certificate store)
1 parent 47b06fd commit aa40a4f

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

CHANGES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ OpenSSL 3.2
235235
arguments. This store is built by default and can be disabled using the new
236236
compile-time option `no-winstore`. This store is not currently used by
237237
default and must be loaded explicitly using the above store URI. It is
238-
expected to be loaded by default in the next minor release of OpenSSL.
238+
expected to be loaded by default in the future.
239239

240240
*Hugo Landau*
241241

doc/man3/X509_get_default_cert_file.pod

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ variable can also be a store URI (but see BUGS below).
4949

5050
By default (for example, when L<X509_STORE_set_default_paths(3)> is used), the
5151
environment variable name returned by X509_get_default_cert_dir_env() is
52-
interpreted both as a delimiter-separated list of paths, and as a store URI by
53-
default. This is ambiguous. For example, specifying a value of
54-
B<"file:///etc/certs"> would cause instantiation of the "file" store provided as
55-
part of the default provider, but would also cause an L<X509_LOOKUP_hash_dir(3)>
56-
instance to look for certificates in the directory B<"file"> (relative to the
57-
current working directory) and the directory B<"///etc/certs">. This can be
58-
avoided by avoiding use of the environment variable mechanism and using other
59-
methods to construct X509_LOOKUP instances.
52+
interpreted both as a delimiter-separated list of paths, and as a store URI.
53+
This is ambiguous. For example, specifying a value of B<"file:///etc/certs">
54+
would cause instantiation of the "file" store provided as part of the default
55+
provider, but would also cause an L<X509_LOOKUP_hash_dir(3)> instance to look
56+
for certificates in the directory B<"file"> (relative to the current working
57+
directory) and the directory B<"///etc/certs">. This can be avoided by avoiding
58+
use of the environment variable mechanism and using other methods to construct
59+
X509_LOOKUP instances.
6060

6161
=head1 RETURN VALUES
6262

@@ -76,7 +76,7 @@ L<SSL_CTX_load_verify_locations(3)>
7676

7777
=head1 COPYRIGHT
7878

79-
Copyright 2023 The OpenSSL Project Authors. All Rights Reserved.
79+
Copyright 2022-2023 The OpenSSL Project Authors. All Rights Reserved.
8080

8181
Licensed under the Apache License 2.0 (the "License"). You may not use
8282
this file except in compliance with the License. You can obtain a copy

0 commit comments

Comments
 (0)