diff options
author | tb <> | 2021-11-26 16:23:27 +0000 |
---|---|---|
committer | tb <> | 2021-11-26 16:23:27 +0000 |
commit | eb64c7bee2160f4a36331f01c39a47cc051d579a (patch) | |
tree | 7bd8cbabf8640714a399e92a9ab554171eba4abd /src/usr.bin/openssl/x509.c | |
parent | c518419c83ad6d7d59312d37b14a4e606d06c667 (diff) | |
download | openbsd-eb64c7bee2160f4a36331f01c39a47cc051d579a.tar.gz openbsd-eb64c7bee2160f4a36331f01c39a47cc051d579a.tar.bz2 openbsd-eb64c7bee2160f4a36331f01c39a47cc051d579a.zip |
openssl(1): drop support for netscape certificates and server gated keys.
ok inoguchi jsing
Diffstat (limited to 'src/usr.bin/openssl/x509.c')
-rw-r--r-- | src/usr.bin/openssl/x509.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/usr.bin/openssl/x509.c b/src/usr.bin/openssl/x509.c index 5ee478b050..978f097efa 100644 --- a/src/usr.bin/openssl/x509.c +++ b/src/usr.bin/openssl/x509.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x509.c,v 1.25 2021/10/23 15:44:39 tb Exp $ */ | 1 | /* $OpenBSD: x509.c,v 1.26 2021/11/26 16:23:27 tb Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -1298,16 +1298,6 @@ x509_main(int argc, char **argv) | |||
1298 | i = PEM_write_bio_X509_AUX(out, x); | 1298 | i = PEM_write_bio_X509_AUX(out, x); |
1299 | else | 1299 | else |
1300 | i = PEM_write_bio_X509(out, x); | 1300 | i = PEM_write_bio_X509(out, x); |
1301 | } else if (x509_config.outformat == FORMAT_NETSCAPE) { | ||
1302 | NETSCAPE_X509 nx; | ||
1303 | ASN1_OCTET_STRING hdr; | ||
1304 | |||
1305 | hdr.data = (unsigned char *) NETSCAPE_CERT_HDR; | ||
1306 | hdr.length = strlen(NETSCAPE_CERT_HDR); | ||
1307 | nx.header = &hdr; | ||
1308 | nx.cert = x; | ||
1309 | |||
1310 | i = ASN1_item_i2d_bio(&NETSCAPE_X509_it, out, &nx); | ||
1311 | } else { | 1301 | } else { |
1312 | BIO_printf(bio_err, | 1302 | BIO_printf(bio_err, |
1313 | "bad output format specified for outfile\n"); | 1303 | "bad output format specified for outfile\n"); |