Macro guards and quickstart in README.md

pq/README.md

@@ -12,9 +12,19 @@ This directory contains:
 # Prerequisites
 
 Please see wolfssl/INSTALL for instructions on how to build and install the
-Open Quantum Safe project's liboqs. Once you have built that, you will then
-need to build the Open Quantum Safe project's OpenSSL. Instructions for
-downloading and building their OpenSSL fork can be found here:
+Open Quantum Safe project's liboqs. For a quick start, you can go into wolfssl
+and do the following:
+
+```
+$ ./autogen.sh
+$ ./configure --with-liboqs
+$ make all check
+# sudo make install
+```
+
+Once you have built that, you will then need to build the Open Quantum Safe
+project's OpenSSL. Instructions for downloading and building their OpenSSL fork
+can be found here:
 
 https://github.com/open-quantum-safe/openssl/releases/tag/OQS-OpenSSL_1_1_1-stable-snapshot-2021-08
 

pq/client-pq-tls13.c

@@ -40,7 +40,8 @@
 
 #define CERT_FILE "../certs/falcon_level5_root_cert.pem"
 
-#if defined(WOLFSSL_TLS13) && defined(HAVE_SECRET_CALLBACK)
+#if defined(HAVE_SECRET_CALLBACK) && defined(WOLFSSL_TLS13) && \
+    defined(HAVE_LIBOQS)
 
 #ifndef WOLFSSL_SSLKEYLOGFILE_OUTPUT
     #define WOLFSSL_SSLKEYLOGFILE_OUTPUT "sslkeylog.log"

pq/server-pq-tls13.c

@@ -47,7 +47,8 @@
 #define KEY_FILE  "../certs/falcon_level5_entity_key.pem"
 
 
-#if defined(WOLFSSL_TLS13) && defined(HAVE_SECRET_CALLBACK)
+#if defined(HAVE_SECRET_CALLBACK) && defined(WOLFSSL_TLS13) && \
+    defined(HAVE_LIBOQS)
 
 #ifndef WOLFSSL_SSLKEYLOGFILE_OUTPUT
     #define WOLFSSL_SSLKEYLOGFILE_OUTPUT "sslkeylog.log"
@@ -116,6 +117,7 @@ static int Tls13SecretCallback(WOLFSSL* ssl, int id, const unsigned char* secret
 }
 #endif /* WOLFSSL_TLS13 && HAVE_SECRET_CALLBACK */
 
+#if defined(WOLFSSL_TLS13) && defined(HAVE_LIBOQS)
 static int mSockfd = SOCKET_INVALID;
 static int mConnd = SOCKET_INVALID;
 static int mShutdown = 0;
@@ -136,6 +138,7 @@ static void sig_handler(const int sig)
     }
 }
 #endif
+#endif
 
 int main(int argc, char** argv)
 {