diff options
author | Andrew | 2018-10-01 13:52:20 -0500 |
---|---|---|
committer | Andrew | 2018-10-01 13:52:20 -0500 |
commit | 2e9486dbe5d072dbd33e3dacb56228bb4a173222 (patch) | |
tree | 5e11ff9511d62e67185b0306eb660f51afc9d99d | |
parent | cc8862f7ea996d7823a0b58b15cc2e9dea093aa8 (diff) | |
download | aur-2e9486dbe5d072dbd33e3dacb56228bb4a173222.tar.gz |
Updated patch for 2.0 alpha 4
-rw-r--r-- | .SRCINFO | 2 | ||||
-rw-r--r-- | PKGBUILD | 2 | ||||
-rw-r--r-- | multichain-boost-openssl.patch | 48 |
3 files changed, 2 insertions, 50 deletions
@@ -12,7 +12,7 @@ pkgbase = multichain-alpha source = https://github.com/MultiChain/multichain/archive/2.0-release.tar.gz source = multichain-boost-openssl.patch md5sums = 1c7f36172ffc0a48cf4c4f8740c2efa9 - md5sums = f3030d087c08bc5b60083faad3284012 + md5sums = f3655179f4b1778afb367801aca87ae0 pkgname = multichain-alpha @@ -9,7 +9,7 @@ license=('GPLv3') depends=('db4.8' 'boost' 'openssl') provides=('multichain-alpha') source=("https://github.com/MultiChain/multichain/archive/${pkgver}-release.tar.gz" "multichain-boost-openssl.patch") -md5sums=('1c7f36172ffc0a48cf4c4f8740c2efa9' 'f3030d087c08bc5b60083faad3284012') +md5sums=('1c7f36172ffc0a48cf4c4f8740c2efa9' 'f3655179f4b1778afb367801aca87ae0') prepare() { cd "${srcdir}/multichain-${pkgver}-release" diff --git a/multichain-boost-openssl.patch b/multichain-boost-openssl.patch index 6de705af4999..9f2caab449ad 100644 --- a/multichain-boost-openssl.patch +++ b/multichain-boost-openssl.patch @@ -71,51 +71,3 @@ } std::vector<ip::tcp::endpoint> vEndpoints; ---- a/src/wallet/crypter.cpp -+++ b/src/wallet/crypter.cpp -@@ -59,15 +59,16 @@ bool CCrypter::Encrypt(const CKeyingMaterial& vchPlaintext, std::vector<unsigned - int nCLen = nLen + AES_BLOCK_SIZE, nFLen = 0; - vchCiphertext = std::vector<unsigned char> (nCLen); - -- EVP_CIPHER_CTX ctx; -+ EVP_CIPHER_CTX *ctx=EVP_CIPHER_CTX_new();; - - bool fOk = true; - -- EVP_CIPHER_CTX_init(&ctx); -- if (fOk) fOk = EVP_EncryptInit_ex(&ctx, EVP_aes_256_cbc(), NULL, chKey, chIV) != 0; -- if (fOk) fOk = EVP_EncryptUpdate(&ctx, &vchCiphertext[0], &nCLen, &vchPlaintext[0], nLen) != 0; -- if (fOk) fOk = EVP_EncryptFinal_ex(&ctx, (&vchCiphertext[0]) + nCLen, &nFLen) != 0; -- EVP_CIPHER_CTX_cleanup(&ctx); -+ EVP_CIPHER_CTX_init(ctx); -+ if (fOk) fOk = EVP_EncryptInit_ex(ctx, EVP_aes_256_cbc(), NULL, chKey, chIV) != 0; -+ if (fOk) fOk = EVP_EncryptUpdate(ctx, &vchCiphertext[0], &nCLen, &vchPlaintext[0], nLen) != 0; -+ if (fOk) fOk = EVP_EncryptFinal_ex(ctx, (&vchCiphertext[0]) + nCLen, &nFLen) != 0; -+ EVP_CIPHER_CTX_cleanup(ctx); -+ EVP_CIPHER_CTX_free(ctx); - - if (!fOk) return false; - -@@ -86,15 +87,16 @@ bool CCrypter::Decrypt(const std::vector<unsigned char>& vchCiphertext, CKeyingM - - vchPlaintext = CKeyingMaterial(nPLen); - -- EVP_CIPHER_CTX ctx; -+ EVP_CIPHER_CTX *ctx=EVP_CIPHER_CTX_new();; - - bool fOk = true; - -- EVP_CIPHER_CTX_init(&ctx); -- if (fOk) fOk = EVP_DecryptInit_ex(&ctx, EVP_aes_256_cbc(), NULL, chKey, chIV) != 0; -- if (fOk) fOk = EVP_DecryptUpdate(&ctx, &vchPlaintext[0], &nPLen, &vchCiphertext[0], nLen) != 0; -- if (fOk) fOk = EVP_DecryptFinal_ex(&ctx, (&vchPlaintext[0]) + nPLen, &nFLen) != 0; -- EVP_CIPHER_CTX_cleanup(&ctx); -+ EVP_CIPHER_CTX_init(ctx); -+ if (fOk) fOk = EVP_DecryptInit_ex(ctx, EVP_aes_256_cbc(), NULL, chKey, chIV) != 0; -+ if (fOk) fOk = EVP_DecryptUpdate(ctx, &vchPlaintext[0], &nPLen, &vchCiphertext[0], nLen) != 0; -+ if (fOk) fOk = EVP_DecryptFinal_ex(ctx, (&vchPlaintext[0]) + nPLen, &nFLen) != 0; -+ EVP_CIPHER_CTX_cleanup(ctx); -+ EVP_CIPHER_CTX_free(ctx); - - if (!fOk) return false; - |