[patch] Patch needed for >=openssl-1.1.0

yacas-1.6.1-openssl.patch (text/plain), 1.58 KB, created by Helmut Jarausch on 2019-04-01 13:30:54 UTC

--- a/cyacas/yacas-kernel/include/hmac_sha256.hpp.ORIG	2016-11-07 16:17:09.000000000 +0100
+++ b/cyacas/yacas-kernel/include/hmac_sha256.hpp	2019-04-01 09:47:50.688031638 +0200
@@ -40,7 +40,7 @@
     std::string hexdigest();
 
 private:
-    HMAC_CTX _ctx;
+    HMAC_CTX *_ctxp;
 };
 
 #endif
--- a/cyacas/yacas-kernel/src/hmac_sha256.cpp.ORIG	2016-11-07 16:17:09.000000000 +0100
+++ b/cyacas/yacas-kernel/src/hmac_sha256.cpp	2019-04-01 09:50:02.913024352 +0200
@@ -32,9 +32,8 @@
 }
 
 HMAC_SHA256::HMAC_SHA256(const std::string& key)
-{
-    HMAC_CTX_init(&_ctx);
-    HMAC_Init_ex(&_ctx, key.c_str(), key.size(), EVP_sha256(), nullptr);
+{   _ctxp= HMAC_CTX_new();
+    HMAC_Init_ex(_ctxp, key.c_str(), key.size(), EVP_sha256(), nullptr);
 }
 
 HMAC_SHA256::HMAC_SHA256(const std::string& key, const std::string& msg):
@@ -45,18 +45,18 @@
 
 HMAC_SHA256::HMAC_SHA256(const HMAC_SHA256& other)
 {
-    HMAC_CTX_copy(&_ctx, const_cast<HMAC_CTX*>(&other._ctx));
+    HMAC_CTX_copy(_ctxp, const_cast<HMAC_CTX*>(other._ctxp));
 }
 
 HMAC_SHA256::~HMAC_SHA256()
 {
-    HMAC_CTX_cleanup(&_ctx);
+    HMAC_CTX_free(_ctxp);
 }
 
 
 void HMAC_SHA256::update(const std::string& msg)
 {
-    HMAC_Update(&_ctx, (const unsigned char*)(msg.c_str()), msg.size());
+    HMAC_Update(_ctxp, (const unsigned char*)(msg.c_str()), msg.size());
 }
 
 std::string HMAC_SHA256::hexdigest()
@@ -65,7 +65,7 @@
     
     unsigned char result[n];
     unsigned result_len = n;
-    HMAC_Final(&_ctx, result, &result_len);
+    HMAC_Final(_ctxp, result, &result_len);
 
     std::string s(2 * n, 0);
     for (unsigned i = 0; i < n; ++i) {