Don't compile heartbeat test code on Windows (for now).

[openssl.git] / apps / apps.h

diff --git a/apps/apps.h b/apps/apps.h
index 0ed516232d54714742ffe8febfe1653e68970e11..b4a9b49ce7f794d8ebc83a1e86264e2812c719ad 100644 (file)
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -337,9 +337,9 @@ void jpake_client_auth(BIO *out, BIO *conn, const char *secret);
 void jpake_server_auth(BIO *out, BIO *conn, const char *secret);
 #endif
 
-#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG)
+#ifndef OPENSSL_NO_TLSEXT
 unsigned char *next_protos_parse(unsigned short *outlen, const char *in);
-#endif  /* !OPENSSL_NO_TLSEXT && !OPENSSL_NO_NEXTPROTONEG */
+#endif  /* ndef OPENSSL_NO_TLSEXT */
 
 void print_cert_checks(BIO *bio, X509 *x,
                                const unsigned char *checkhost,
@@ -363,6 +363,7 @@ void store_setup_crl_download(X509_STORE *st);
 #define FORMAT_MSBLOB  11      /* MS Key blob format */
 #define FORMAT_PVK     12      /* MS PVK file format */
 #define FORMAT_HTTP    13      /* Download using HTTP */
+#define FORMAT_NSS     14      /* NSS keylog format */
 
 #define EXT_COPY_NONE  0
 #define EXT_COPY_ADD   1