From 1bec90d155e788cd77d19ec2bdaefe53b5cb39b4 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Wed, 28 Mar 2018 09:07:37 -0700
Subject: [PATCH] [openssl] Update to 1.0.2o

---
 ports/openssl/CONTROL                  |  2 +-
 ports/openssl/RemoveNonASCIIChar.patch | 13 -------------
 ports/openssl/portfile.cmake           |  9 ++++-----
 3 files changed, 5 insertions(+), 19 deletions(-)
 delete mode 100644 ports/openssl/RemoveNonASCIIChar.patch

diff --git a/ports/openssl/CONTROL b/ports/openssl/CONTROL
index 43a6eb6608..9266dd10d3 100644
--- a/ports/openssl/CONTROL
+++ b/ports/openssl/CONTROL
@@ -1,3 +1,3 @@
 Source: openssl
-Version: 1.0.2n-3
+Version: 1.0.2o
 Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.
diff --git a/ports/openssl/RemoveNonASCIIChar.patch b/ports/openssl/RemoveNonASCIIChar.patch
deleted file mode 100644
index 5c4553b0a0..0000000000
--- a/ports/openssl/RemoveNonASCIIChar.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/ssl/bad_dtls_test.c b/ssl/bad_dtls_test.c
-index 34af37d..ff754e1 100644
---- a/ssl/bad_dtls_test.c
-+++ b/ssl/bad_dtls_test.c
-@@ -19,7 +19,7 @@
-  * Note that unlike other SSL tests, we don't test against our own SSL
-  * server method. Firstly because we don't have one; we *only* support
-  * DTLS1_BAD_VER as a client. And secondly because even if that were
-- * fixed up it's the wrong thing to test against — because if changes
-+ * fixed up it's the wrong thing to test against - because if changes
-  * are made in generic DTLS code which don't take DTLS1_BAD_VER into
-  * account, there's plenty of scope for making those changes such that
-  * they break *both* the client and the server in the same way.
diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake
index 023b3e233b..458aa07b67 100644
--- a/ports/openssl/portfile.cmake
+++ b/ports/openssl/portfile.cmake
@@ -4,7 +4,7 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
 endif()
 
 include(vcpkg_common_functions)
-set(OPENSSL_VERSION 1.0.2n)
+set(OPENSSL_VERSION 1.0.2o)
 set(MASTER_COPY_SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-${OPENSSL_VERSION})
 
 vcpkg_find_acquire_program(PERL)
@@ -15,7 +15,7 @@ set(ENV{PATH} "$ENV{PATH};${PERL_EXE_PATH}")
 vcpkg_download_distfile(OPENSSL_SOURCE_ARCHIVE
     URLS "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" "https://www.openssl.org/source/old/1.0.2/openssl-${OPENSSL_VERSION}.tar.gz"
     FILENAME "openssl-${OPENSSL_VERSION}.tar.gz"
-    SHA512 144bf0d6aa27b4af01df0b7b734c39962649e1711554247d42e05e14d8945742b18745aefdba162e2dfc762b941fd7d3b2d5dc6a781ae4ba10a6f5a3cadb0687
+    SHA512 8a2c93657c85143e76785bb32ee836908c31a6f5f8db993fa9777acba6079e630cdddd03edbad65d1587199fc13a1507789eacf038b56eb99139c2091d9df7fd
 )
 
 vcpkg_extract_source_archive(${OPENSSL_SOURCE_ARCHIVE})
@@ -24,7 +24,6 @@ vcpkg_apply_patches(
     PATCHES ${CMAKE_CURRENT_LIST_DIR}/ConfigureIncludeQuotesFix.patch
             ${CMAKE_CURRENT_LIST_DIR}/STRINGIFYPatch.patch
             ${CMAKE_CURRENT_LIST_DIR}/EmbedSymbolsInStaticLibsZ7.patch
-            ${CMAKE_CURRENT_LIST_DIR}/RemoveNonASCIIChar.patch
 )
 
 if(VCPKG_CMAKE_SYSTEM_NAME)
@@ -92,7 +91,7 @@ execute_process(
     ERROR_FILE ${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-rel-0-err.log
 )
 vcpkg_execute_required_process(
-    COMMAND ${JOM} -j 1 -f ${OPENSSL_MAKEFILE} install
+    COMMAND nmake -f ${OPENSSL_MAKEFILE} install
     WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
     LOGNAME build-${TARGET_TRIPLET}-rel-1)
 
@@ -125,7 +124,7 @@ execute_process(
     ERROR_FILE ${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-dbg-0-err.log
 )
 vcpkg_execute_required_process(
-    COMMAND ${JOM} -j 1 -f ${OPENSSL_MAKEFILE} install
+    COMMAND nmake -f ${OPENSSL_MAKEFILE} install
     WORKING_DIRECTORY ${SOURCE_PATH_DEBUG}
     LOGNAME build-${TARGET_TRIPLET}-dbg-1)