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/apps.h | |
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/apps.h')
-rw-r--r-- | src/usr.bin/openssl/apps.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/usr.bin/openssl/apps.h b/src/usr.bin/openssl/apps.h index 4fda6420c8..e8116bfe44 100644 --- a/src/usr.bin/openssl/apps.h +++ b/src/usr.bin/openssl/apps.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: apps.h,v 1.29 2021/11/20 15:55:00 tb Exp $ */ | 1 | /* $OpenBSD: apps.h,v 1.30 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 | * |
@@ -255,12 +255,10 @@ unsigned char *next_protos_parse(unsigned short *outlen, const char *in); | |||
255 | #define FORMAT_ASN1 1 | 255 | #define FORMAT_ASN1 1 |
256 | #define FORMAT_TEXT 2 | 256 | #define FORMAT_TEXT 2 |
257 | #define FORMAT_PEM 3 | 257 | #define FORMAT_PEM 3 |
258 | #define FORMAT_NETSCAPE 4 | 258 | |
259 | #define FORMAT_PKCS12 5 | 259 | #define FORMAT_PKCS12 5 |
260 | #define FORMAT_SMIME 6 | 260 | #define FORMAT_SMIME 6 |
261 | 261 | ||
262 | #define FORMAT_IISSGC 8 /* XXX this stupid macro helps us to avoid | ||
263 | * adding yet another param to load_*key() */ | ||
264 | #define FORMAT_PEMRSA 9 /* PEM RSAPublicKey format */ | 262 | #define FORMAT_PEMRSA 9 /* PEM RSAPublicKey format */ |
265 | #define FORMAT_ASN1RSA 10 /* DER RSAPublicKey format */ | 263 | #define FORMAT_ASN1RSA 10 /* DER RSAPublicKey format */ |
266 | #define FORMAT_MSBLOB 11 /* MS Key blob format */ | 264 | #define FORMAT_MSBLOB 11 /* MS Key blob format */ |
@@ -270,8 +268,6 @@ unsigned char *next_protos_parse(unsigned short *outlen, const char *in); | |||
270 | #define EXT_COPY_ADD 1 | 268 | #define EXT_COPY_ADD 1 |
271 | #define EXT_COPY_ALL 2 | 269 | #define EXT_COPY_ALL 2 |
272 | 270 | ||
273 | #define NETSCAPE_CERT_HDR "certificate" | ||
274 | |||
275 | #define APP_PASS_LEN 1024 | 271 | #define APP_PASS_LEN 1024 |
276 | 272 | ||
277 | #define SERIAL_RAND_BITS 64 | 273 | #define SERIAL_RAND_BITS 64 |