From 0884647e5439afec731bad4cdabdcf601d5440ff Mon Sep 17 00:00:00 2001
From: Brian Bockelman <bbockelm@cse.unl.edu>
Date: Thu, 20 Jun 2019 08:38:42 -0500
Subject: [PATCH 1/3] Add support for OpenSSL 1.1.

Mostly just avoiding direct access of internal structures.
---
 CMakeLists.txt             | 8 ++++++--
 src/scitokens_internal.cpp | 4 ++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b370b05..4fed367 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,14 +31,18 @@ elseif( UNIX )
 
 include (FindPkgConfig)
 pkg_check_modules(LIBCRYPTO REQUIRED libcrypto)
+pkg_check_modules(OPENSSL REQUIRED openssl)
 pkg_check_modules(SQLITE REQUIRED sqlite3)
 
+# pkg_check_modules fails to return an absolute path on RHEL7.  Set the
+# link directories accordingly.
+link_directories(${OPENSSL_LIBRARY_DIRS} ${LIBCRYPTO_LIBRARY_DIRS})
 endif()
 
-include_directories( "${PROJECT_SOURCE_DIR}" ${JWT_CPP_INCLUDES} ${CURL_INCLUDES} ${LIBCRYPTO_INCLUDE_DIRS} ${SQLITE_INCLUDE_DIRS}  ${UUID_INCLUDE_DIRS} )
+include_directories( "${PROJECT_SOURCE_DIR}" ${JWT_CPP_INCLUDES} ${CURL_INCLUDES} ${OPENSSL_INCLUDE_DIRS} ${LIBCRYPTO_INCLUDE_DIRS} ${SQLITE_INCLUDE_DIRS}  ${UUID_INCLUDE_DIRS} )
 
 add_library(SciTokens SHARED src/scitokens.cpp src/scitokens_internal.cpp src/scitokens_cache.cpp)
-target_link_libraries(SciTokens ${LIBCRYPTO_LIBRARIES} ${CURL_LIBRARIES} ${SQLITE_LIBRARIES} ${UUID_LIBRARIES})
+target_link_libraries(SciTokens ${OPENSSL_LIBRARIES} ${LIBCRYPTO_LIBRARIES} ${CURL_LIBRARIES} ${SQLITE_LIBRARIES} ${UUID_LIBRARIES})
 
 if ( NOT APPLE AND UNIX )
 set_target_properties(SciTokens PROPERTIES LINK_FLAGS "-Wl,--version-script=${PROJECT_SOURCE_DIR}/configs/export-symbols")
diff --git a/src/scitokens_internal.cpp b/src/scitokens_internal.cpp
index 5670aa9..c6647de 100644
--- a/src/scitokens_internal.cpp
+++ b/src/scitokens_internal.cpp
@@ -238,9 +238,13 @@ rs256_from_coords(const std::string &e_str, const std::string &n_str) {
     std::unique_ptr<BIGNUM, decltype(&BN_free)> n_bignum(BN_bin2bn(reinterpret_cast<const unsigned char *>(n_decode.c_str()), n_decode.size(), nullptr), BN_free);
 
     std::unique_ptr<RSA, decltype(&RSA_free)> rsa(RSA_new(), RSA_free);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
     rsa->e = e_bignum.get();
     rsa->n = n_bignum.get();
     rsa->d = nullptr;
+#else
+    RSA_set0_key(rsa.get(), n_bignum.get(), e_bignum.get(), nullptr);
+#endif
     e_bignum.release();
     n_bignum.release();
 

From c58da33eb01c267828d5d456e03ec6cddbfea437 Mon Sep 17 00:00:00 2001
From: Brian Bockelman <bbockelm@cse.unl.edu>
Date: Thu, 20 Jun 2019 08:39:43 -0500
Subject: [PATCH 2/3] Remove unused static function.

---
 src/scitokens_internal.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/scitokens_internal.cpp b/src/scitokens_internal.cpp
index c6647de..44ffab9 100644
--- a/src/scitokens_internal.cpp
+++ b/src/scitokens_internal.cpp
@@ -304,11 +304,6 @@ normalize_absolute_path(const std::string &path) {
 }
 
 
-int empty_validator(const char *, char **) {
-    return 0;
-}
-
-
 }
 
 

From 300121226980bd88d93326e932d402abeffe0b1a Mon Sep 17 00:00:00 2001
From: Brian Bockelman <bbockelm@cse.unl.edu>
Date: Thu, 20 Jun 2019 08:40:07 -0500
Subject: [PATCH 3/3] Do not pass polymorphic exceptions by value.

---
 src/scitokens.cpp        | 2 +-
 src/scitokens_internal.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/scitokens.cpp b/src/scitokens.cpp
index ca6c1ae..67881ef 100644
--- a/src/scitokens.cpp
+++ b/src/scitokens.cpp
@@ -216,7 +216,7 @@ int validator_validate(Validator validator, SciToken scitoken, char **err_msg) {
 
     try {
         real_validator->verify(*real_scitoken);
-    } catch (std::exception exc) {
+    } catch (std::exception &exc) {
         if (err_msg) {*err_msg = strdup(exc.what());}
         return -1;
     }
diff --git a/src/scitokens_internal.h b/src/scitokens_internal.h
index 4840c9a..8a5cab4 100644
--- a/src/scitokens_internal.h
+++ b/src/scitokens_internal.h
@@ -384,7 +384,7 @@ class Enforcer {
         try {
             m_validator.verify(scitoken);
             return true;
-        } catch (std::runtime_error) {
+        } catch (std::runtime_error &) {
             return false;
         }
     }