From 02662f720df25884f5139d577ddef969cddfe2d9 Mon Sep 17 00:00:00 2001
From: Anthony Hu <anthony@wolfssl.com>
Date: Mon, 1 Nov 2021 19:06:33 -0400
Subject: [PATCH] Stuff caught by dgarske

---
 pq/Makefile                  | 37 +-----------------------------------
 pq/client-pq-tls13.c         |  9 +++++----
 pq/generate_falcon_chains.sh |  4 ++--
 pq/server-pq-tls13.c         |  9 +++++----
 4 files changed, 13 insertions(+), 46 deletions(-)

diff --git a/pq/Makefile b/pq/Makefile
index 926f00e6..ca4907ba 100644
--- a/pq/Makefile
+++ b/pq/Makefile
@@ -1,4 +1,4 @@
-# TLS Examples Makefile
+# PQ Examples Makefile
 CC       = gcc
 LIB_PATH = /usr/local
 CFLAGS   = -Wall -I$(LIB_PATH)/include
@@ -21,41 +21,6 @@ LIBS+=$(DYN_LIB)
 SRC=$(wildcard *.c)
 TARGETS=$(patsubst %.c, %, $(SRC))
 
-# OS / CPU Detection
-OS_DET=UNKNOWN
-CPU_DET=UNKNOWN
-ifeq ($(OS),Windows_NT)
-    OS_DET=WIN32
-    ifeq ($(PROCESSOR_ARCHITEW6432),AMD64)
-        CPU_DET=AMD64
-    else
-        ifeq ($(PROCESSOR_ARCHITECTURE),AMD64)
-            CPU_DET=AMD64
-        endif
-        ifeq ($(PROCESSOR_ARCHITECTURE),x86)
-            CPU_DET=IA32
-        endif
-    endif
-else
-    UNAME_S := $(shell uname -s)
-    ifeq ($(UNAME_S),Linux)
-        OS_DET=LINUX
-    endif
-    ifeq ($(UNAME_S),Darwin)
-        OS_DET=OSX
-    endif
-    UNAME_P := $(shell uname -p)
-    ifeq ($(UNAME_P),x86_64)
-        CPU_DET=AMD64
-    endif
-    ifneq ($(filter %86,$(UNAME_P)),)
-        CPU_DET=IA32
-    endif
-    ifneq ($(filter arm%,$(UNAME_P)),)
-        CPU_DET=ARM
-    endif
-endif
-
 .PHONY: clean all
 
 all: $(TARGETS)
diff --git a/pq/client-pq-tls13.c b/pq/client-pq-tls13.c
index b8cd5775..a5354505 100644
--- a/pq/client-pq-tls13.c
+++ b/pq/client-pq-tls13.c
@@ -1,6 +1,6 @@
-/* client-tls13.c
+/* client-pq-tls13.c
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL. (formerly known as CyaSSL)
  *
@@ -112,7 +112,7 @@ static int Tls13SecretCallback(WOLFSSL* ssl, int id, const unsigned char* secret
 int main(int argc, char** argv)
 {
     int ret = 0;
-#ifdef WOLFSSL_TLS13
+#if defined(WOLFSSL_TLS13) && defined(HAVE_LIBOQS)
     int                sockfd = SOCKET_INVALID;
     struct sockaddr_in servAddr;
     char               buff[256];
@@ -256,7 +256,8 @@ exit:
         wolfSSL_CTX_free(ctx);  /* Free the wolfSSL context object          */
     wolfSSL_Cleanup();          /* Cleanup the wolfSSL environment          */
 #else
-    printf("Example requires TLS v1.3\n");
+    printf("Example requires TLS v1.3 and liboqs.\n");
+    printf("Configure wolfssl like this: ./configure --with-liboqs\n");
 #endif
     (void)argc;
     (void)argv;
diff --git a/pq/generate_falcon_chains.sh b/pq/generate_falcon_chains.sh
index fc361f86..d7843d97 100755
--- a/pq/generate_falcon_chains.sh
+++ b/pq/generate_falcon_chains.sh
@@ -8,8 +8,8 @@
 # Execute this script in the openssl directory after building OQS's fork of
 # OpenSSL. Please see the README.md file for more details.
 
-if [[ ! -v OPENSSL ]]; then
-    OPENSSL=./apps/openssl
+if [ "$OPENSSL" = "" ]; then
+   OPENSSL=./apps/openssl
 fi
 
 # Generate conf files.
diff --git a/pq/server-pq-tls13.c b/pq/server-pq-tls13.c
index 072c7fc9..49d178c8 100644
--- a/pq/server-pq-tls13.c
+++ b/pq/server-pq-tls13.c
@@ -1,6 +1,6 @@
-/* server-tls13.c
+/* server-pq-tls13.c
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL. (formerly known as CyaSSL)
  *
@@ -140,7 +140,7 @@ static void sig_handler(const int sig)
 int main(int argc, char** argv)
 {
     int ret = 0;
-#ifdef WOLFSSL_TLS13
+#if defined(WOLFSSL_TLS13) && defined(HAVE_LIBOQS)
     struct sockaddr_in servAddr;
     struct sockaddr_in clientAddr;
     socklen_t          size = sizeof(clientAddr);
@@ -319,7 +319,8 @@ exit:
     wolfSSL_Cleanup();          /* Cleanup the wolfSSL environment          */
 
 #else
-    printf("Example requires TLS v1.3\n");
+    printf("Example requires TLS v1.3 and liboqs.\n");
+    printf("Configure wolfssl like this: ./configure --with-liboqs\n");
 #endif /* WOLFSSL_TLS13 */
 
     (void)argc;