diff options
author | jsing <> | 2014-11-07 14:16:48 +0000 |
---|---|---|
committer | jsing <> | 2014-11-07 14:16:48 +0000 |
commit | 69b02c2789e54ca6f1a0639f0a408d25d17ecc6f (patch) | |
tree | 10f72da845ae44174872698150dfdfb829c6901a /src/usr.bin/openssl/apps.h | |
parent | e1fc40cecc074746dfa8002682647a512fdf4906 (diff) | |
download | openbsd-69b02c2789e54ca6f1a0639f0a408d25d17ecc6f.tar.gz openbsd-69b02c2789e54ca6f1a0639f0a408d25d17ecc6f.tar.bz2 openbsd-69b02c2789e54ca6f1a0639f0a408d25d17ecc6f.zip |
More OPENSSL_NO_TLSEXT clean up.
Diffstat (limited to 'src/usr.bin/openssl/apps.h')
-rw-r--r-- | src/usr.bin/openssl/apps.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/usr.bin/openssl/apps.h b/src/usr.bin/openssl/apps.h index ea6be60a44..d6b18e2a35 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.7 2014/08/30 15:14:03 jsing Exp $ */ | 1 | /* $OpenBSD: apps.h,v 1.8 2014/11/07 14:16:48 jsing 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 | * |
@@ -245,9 +245,9 @@ int do_X509_REQ_sign(BIO *err, X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md, | |||
245 | int do_X509_CRL_sign(BIO *err, X509_CRL *x, EVP_PKEY *pkey, const EVP_MD *md, | 245 | int do_X509_CRL_sign(BIO *err, X509_CRL *x, EVP_PKEY *pkey, const EVP_MD *md, |
246 | STACK_OF(OPENSSL_STRING) *sigopts); | 246 | STACK_OF(OPENSSL_STRING) *sigopts); |
247 | 247 | ||
248 | #if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG) | 248 | #if !defined(OPENSSL_NO_NEXTPROTONEG) |
249 | unsigned char *next_protos_parse(unsigned short *outlen, const char *in); | 249 | unsigned char *next_protos_parse(unsigned short *outlen, const char *in); |
250 | #endif /* !OPENSSL_NO_TLSEXT && !OPENSSL_NO_NEXTPROTONEG */ | 250 | #endif /* !OPENSSL_NO_NEXTPROTONEG */ |
251 | 251 | ||
252 | #define FORMAT_UNDEF 0 | 252 | #define FORMAT_UNDEF 0 |
253 | #define FORMAT_ASN1 1 | 253 | #define FORMAT_ASN1 1 |