summaryrefslogtreecommitdiff
path: root/src/usr.bin/openssl/apps.h
diff options
context:
space:
mode:
authorjsing <>2014-12-14 14:42:06 +0000
committerjsing <>2014-12-14 14:42:06 +0000
commit45a57065d1148899826db257e083825843357376 (patch)
treec2cdaf5dee151708abd8cdd369d67e62c581de59 /src/usr.bin/openssl/apps.h
parentb303e332970ffd772a791a3a52b851697dd671bc (diff)
downloadopenbsd-45a57065d1148899826db257e083825843357376.tar.gz
openbsd-45a57065d1148899826db257e083825843357376.tar.bz2
openbsd-45a57065d1148899826db257e083825843357376.zip
unifdef OPENSSL_NO_NEXTPROTONEG
Diffstat (limited to 'src/usr.bin/openssl/apps.h')
-rw-r--r--src/usr.bin/openssl/apps.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/usr.bin/openssl/apps.h b/src/usr.bin/openssl/apps.h
index d6b18e2a35..b2b7e85107 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.8 2014/11/07 14:16:48 jsing Exp $ */ 1/* $OpenBSD: apps.h,v 1.9 2014/12/14 14:42:06 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,7 @@ int do_X509_REQ_sign(BIO *err, X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md,
245int do_X509_CRL_sign(BIO *err, X509_CRL *x, EVP_PKEY *pkey, const EVP_MD *md, 245int 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_NEXTPROTONEG)
249unsigned char *next_protos_parse(unsigned short *outlen, const char *in); 248unsigned char *next_protos_parse(unsigned short *outlen, const char *in);
250#endif /* !OPENSSL_NO_NEXTPROTONEG */
251 249
252#define FORMAT_UNDEF 0 250#define FORMAT_UNDEF 0
253#define FORMAT_ASN1 1 251#define FORMAT_ASN1 1