Merge pull request pokowaka#7 from DanFTRX/master

Update for OpenSSL 1.1.0

Author: pokowaka

src/CMakeLists.txt

@@ -20,7 +20,7 @@ IF(UNIX)
     TARGET_LINK_LIBRARIES (jwt jansson ${OPENSSL_LIBRARIES})
     SET_PROPERTY(TARGET jwt PROPERTY CXX_STANDARD 11)
 ELSEIF(MSVC)
-    TARGET_LINK_LIBRARIES (jwt jansson libeay32 ssleay32)
+    TARGET_LINK_LIBRARIES (jwt jansson libcrypto libssl)
 ENDIF(UNIX)
 
 IF(UNIX AND ENABLE_GPERF_TOOLS MATCHES "ON")

src/validators/hmacvalidator.cpp

@@ -28,7 +28,7 @@
 
 HMACValidator::HMACValidator(const char *algorithm,
     const EVP_MD *md, const std::string &key) :
-  md_(md), algorithm_(algorithm), key_size_(md->md_size), key_(key) {
+  md_(md), algorithm_(algorithm), key_size_(EVP_MD_size(md)), key_(key) {
 }
 
 HMACValidator::~HMACValidator() {
@@ -64,13 +64,11 @@ bool HMACValidator::Sign(const uint8_t *header, size_t num_header,
       *num_signature = key_size_;
       return false;
   }
-
-  HMAC_CTX ctx;
-  HMAC_CTX_init(&ctx);
-  HMAC_Init_ex(&ctx, key_.c_str(), key_.size(), md_, NULL);
-  bool sign = HMAC_Update(&ctx, header, num_header) &&
-    HMAC_Final(&ctx, signature, (unsigned int*) num_signature);
-  HMAC_CTX_cleanup(&ctx);
+  HMAC_CTX* ctx = HMAC_CTX_new();
+  HMAC_Init_ex(ctx, key_.c_str(), key_.size(), md_, NULL);
+  bool sign = HMAC_Update(ctx, header, num_header) &&
+    HMAC_Final(ctx, signature, (unsigned int*) num_signature);
+  HMAC_CTX_free(ctx);
   return sign;
 }
 

src/validators/rsavalidator.cpp

@@ -44,12 +44,12 @@ RSAValidator::~RSAValidator() {
 
 bool RSAValidator::Verify(json_t *jsonHeader, const uint8_t *header, size_t num_header,
                           const uint8_t *signature, size_t num_signature) {
-  EVP_MD_CTX evp_md_ctx;
-  EVP_MD_CTX_init(&evp_md_ctx);
-  EVP_VerifyInit_ex(&evp_md_ctx, md_, NULL);
-  bool valid = EVP_VerifyUpdate(&evp_md_ctx, header, num_header) == 1 &&
-    EVP_VerifyFinal(&evp_md_ctx, signature, num_signature, public_key_) == 1;
-  EVP_MD_CTX_cleanup(&evp_md_ctx);
+  EVP_MD_CTX *evp_md_ctx = EVP_MD_CTX_new();
+  EVP_MD_CTX_init(evp_md_ctx);
+  EVP_VerifyInit_ex(evp_md_ctx, md_, NULL);
+  bool valid = EVP_VerifyUpdate(evp_md_ctx, header, num_header) == 1 &&
+    EVP_VerifyFinal(evp_md_ctx, signature, num_signature, public_key_) == 1;
+  EVP_MD_CTX_free(evp_md_ctx);
   return valid;
 }
 
@@ -58,15 +58,15 @@ bool RSAValidator::Sign(const uint8_t *header, size_t num_header,
   size_t needed = 0;
   bool success = false;
 
-  EVP_MD_CTX evp_md_ctx;
-  EVP_MD_CTX_init(&evp_md_ctx);
-  EVP_DigestSignInit(&evp_md_ctx, NULL, md_, NULL, private_key_);
-  if (EVP_DigestSignUpdate(&evp_md_ctx, header, num_header) != 1) {
+  EVP_MD_CTX *evp_md_ctx = EVP_MD_CTX_new();
+  EVP_MD_CTX_init(evp_md_ctx);
+  EVP_DigestSignInit(evp_md_ctx, NULL, md_, NULL, private_key_);
+  if (EVP_DigestSignUpdate(evp_md_ctx, header, num_header) != 1) {
     goto Error;
   }
 
   // Figure out how many bytes we need
-  if (EVP_DigestSignFinal(&evp_md_ctx, NULL, &needed) != 1) {
+  if (EVP_DigestSignFinal(evp_md_ctx, NULL, &needed) != 1) {
     goto Error;
   }
 
@@ -76,9 +76,9 @@ bool RSAValidator::Sign(const uint8_t *header, size_t num_header,
     goto Error;
   }
 
-  success = EVP_DigestSignFinal(&evp_md_ctx, signature, num_signature) == 1;
+  success = EVP_DigestSignFinal(evp_md_ctx, signature, num_signature) == 1;
 Error:
-  EVP_MD_CTX_cleanup(&evp_md_ctx);
+  EVP_MD_CTX_free(evp_md_ctx);
   return success;
 }