mirror of
https://github.com/freebsd/freebsd-src
synced 2024-07-21 10:19:04 +00:00
b077aed33b
Migrate to OpenSSL 3.0 in advance of FreeBSD 14.0. OpenSSL 1.1.1 (the version we were previously using) will be EOL as of 2023-09-11. Most of the base system has already been updated for a seamless switch to OpenSSL 3.0. For many components we've added `-DOPENSSL_API_COMPAT=0x10100000L` to CFLAGS to specify the API version, which avoids deprecation warnings from OpenSSL 3.0. Changes have also been made to avoid OpenSSL APIs that were already deprecated in OpenSSL 1.1.1. The process of updating to contemporary APIs can continue after this merge. Additional changes are still required for libarchive and Kerberos- related libraries or tools; workarounds will immediately follow this commit. Fixes are in progress in the upstream projects and will be incorporated when those are next updated. There are some performance regressions in benchmarks (certain tests in `openssl speed`) and in some OpenSSL consumers in ports (e.g. haproxy). Investigation will continue for these. Netflix's testing showed no functional regression and a rather small, albeit statistically significant, increase in CPU consumption with OpenSSL 3.0. Thanks to ngie@ and des@ for updating base system components, to antoine@ and bofh@ for ports exp-runs and port fixes/workarounds, and to Netflix and everyone who tested prior to commit or contributed to this update in other ways. PR: 271615 PR: 271656 [exp-run] Relnotes: Yes Sponsored by: The FreeBSD Foundation
131 lines
3.3 KiB
C
131 lines
3.3 KiB
C
/*
|
|
* Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
* in the file LICENSE in the source distribution or at
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include "apps.h"
|
|
#include "progs.h"
|
|
#include <openssl/pem.h>
|
|
#include <openssl/err.h>
|
|
|
|
typedef enum OPTION_choice {
|
|
OPT_COMMON,
|
|
OPT_TOSEQ, OPT_IN, OPT_OUT,
|
|
OPT_PROV_ENUM
|
|
} OPTION_CHOICE;
|
|
|
|
const OPTIONS nseq_options[] = {
|
|
OPT_SECTION("General"),
|
|
{"help", OPT_HELP, '-', "Display this summary"},
|
|
|
|
OPT_SECTION("Input"),
|
|
{"in", OPT_IN, '<', "Input file"},
|
|
|
|
OPT_SECTION("Output"),
|
|
{"toseq", OPT_TOSEQ, '-', "Output NS Sequence file"},
|
|
{"out", OPT_OUT, '>', "Output file"},
|
|
|
|
OPT_PROV_OPTIONS,
|
|
{NULL}
|
|
};
|
|
|
|
int nseq_main(int argc, char **argv)
|
|
{
|
|
BIO *in = NULL, *out = NULL;
|
|
X509 *x509 = NULL;
|
|
NETSCAPE_CERT_SEQUENCE *seq = NULL;
|
|
OPTION_CHOICE o;
|
|
int toseq = 0, ret = 1, i;
|
|
char *infile = NULL, *outfile = NULL, *prog;
|
|
|
|
prog = opt_init(argc, argv, nseq_options);
|
|
while ((o = opt_next()) != OPT_EOF) {
|
|
switch (o) {
|
|
case OPT_EOF:
|
|
case OPT_ERR:
|
|
opthelp:
|
|
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
|
|
goto end;
|
|
case OPT_HELP:
|
|
ret = 0;
|
|
opt_help(nseq_options);
|
|
goto end;
|
|
case OPT_TOSEQ:
|
|
toseq = 1;
|
|
break;
|
|
case OPT_IN:
|
|
infile = opt_arg();
|
|
break;
|
|
case OPT_OUT:
|
|
outfile = opt_arg();
|
|
break;
|
|
case OPT_PROV_CASES:
|
|
if (!opt_provider(o))
|
|
goto end;
|
|
break;
|
|
}
|
|
}
|
|
|
|
/* No extra arguments. */
|
|
argc = opt_num_rest();
|
|
if (argc != 0)
|
|
goto opthelp;
|
|
|
|
in = bio_open_default(infile, 'r', FORMAT_PEM);
|
|
if (in == NULL)
|
|
goto end;
|
|
out = bio_open_default(outfile, 'w', FORMAT_PEM);
|
|
if (out == NULL)
|
|
goto end;
|
|
|
|
if (toseq) {
|
|
seq = NETSCAPE_CERT_SEQUENCE_new();
|
|
if (seq == NULL)
|
|
goto end;
|
|
seq->certs = sk_X509_new_null();
|
|
if (seq->certs == NULL)
|
|
goto end;
|
|
while ((x509 = PEM_read_bio_X509(in, NULL, NULL, NULL))) {
|
|
if (!sk_X509_push(seq->certs, x509))
|
|
goto end;
|
|
}
|
|
|
|
if (!sk_X509_num(seq->certs)) {
|
|
BIO_printf(bio_err, "%s: Error reading certs file %s\n",
|
|
prog, infile);
|
|
ERR_print_errors(bio_err);
|
|
goto end;
|
|
}
|
|
PEM_write_bio_NETSCAPE_CERT_SEQUENCE(out, seq);
|
|
ret = 0;
|
|
goto end;
|
|
}
|
|
|
|
seq = PEM_read_bio_NETSCAPE_CERT_SEQUENCE(in, NULL, NULL, NULL);
|
|
if (seq == NULL) {
|
|
BIO_printf(bio_err, "%s: Error reading sequence file %s\n",
|
|
prog, infile);
|
|
ERR_print_errors(bio_err);
|
|
goto end;
|
|
}
|
|
|
|
for (i = 0; i < sk_X509_num(seq->certs); i++) {
|
|
x509 = sk_X509_value(seq->certs, i);
|
|
dump_cert_text(out, x509);
|
|
PEM_write_bio_X509(out, x509);
|
|
}
|
|
ret = 0;
|
|
end:
|
|
BIO_free(in);
|
|
BIO_free_all(out);
|
|
NETSCAPE_CERT_SEQUENCE_free(seq);
|
|
|
|
return ret;
|
|
}
|