Date: Sunday, July 30, 2017 @ 10:10:20 Author: jlichtblau Revision: 246966
upgpkg: encfs 1.9.2-1 - new upstream release Modified: encfs/trunk/PKGBUILD Deleted: encfs/trunk/encfs-openssl-1.1.patch -------------------------+ PKGBUILD | 34 +--- encfs-openssl-1.1.patch | 350 ---------------------------------------------- 2 files changed, 13 insertions(+), 371 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-07-30 10:09:58 UTC (rev 246965) +++ PKGBUILD 2017-07-30 10:10:20 UTC (rev 246966) @@ -6,8 +6,8 @@ # Contributor: Daniel J Griffiths <[email protected]> pkgname=encfs -pkgver=1.9.1 -pkgrel=5 +pkgver=1.9.2 +pkgrel=1 pkgdesc='Encrypted filesystem in user-space' arch=('i686' 'x86_64') url='https://vgough.github.io/encfs/' @@ -14,18 +14,12 @@ license=('LGPL') depends=('openssl' 'fuse2' 'tinyxml2') makedepends=('cmake') -source=(https://github.com/vgough/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz{,.asc} encfs-openssl-1.1.patch) -validpgpkeys=('E583187B2E26D6EF8BF4556333C65E29813C14DF') # Valient Gough -sha256sums=('67203aeff7a06ce7be83df4948db296be89a00cffe1108a0a41c96d7481106a4' - 'SKIP' - '2ffc0bbde3aed0c86b5d64865108b0538503ec0ccc9a7a3c1a0156cec4ebc937') +source=(https://github.com/vgough/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz{,.asc}) +# validpgpkeys=('E583187B2E26D6EF8BF4556333C65E29813C14DF') # Valient Gough +validpgpkeys=('FFF3E01444FED7C316A3545A895F5BC123A02740') # Jakob Unterwurzacher <[email protected]> +sha256sums=('cd9e972cd9565cdc26473c86d2c77c98de31fc6f604fa7d149dd5d6e35d46eaa' + 'SKIP') -prepare() { - cd $pkgname-$pkgver - # fix build with openssl 1.1 (Debian) - patch -p1 -i ../encfs-openssl-1.1.patch -} - build() { cd "${srcdir}" @@ -40,17 +34,15 @@ make } -check() { - cd "${srcdir}"/build +# https://github.com/vgough/encfs/issues/358 +# check() { +# cd "${srcdir}"/build +# +# make test +# } - make test -} - package() { cd "${srcdir}"/build make DESTDIR="${pkgdir}" install - -# FS#51802 - chmod +x "${pkgdir}"/usr/bin/encfssh } Deleted: encfs-openssl-1.1.patch =================================================================== --- encfs-openssl-1.1.patch 2017-07-30 10:09:58 UTC (rev 246965) +++ encfs-openssl-1.1.patch 2017-07-30 10:10:20 UTC (rev 246966) @@ -1,350 +0,0 @@ -diff --git a/encfs/SSL_Cipher.cpp b/encfs/SSL_Cipher.cpp -index e9ba424..4d14755 100644 ---- a/encfs/SSL_Cipher.cpp -+++ b/encfs/SSL_Cipher.cpp -@@ -36,6 +36,7 @@ - #include "Interface.h" - #include "Mutex.h" - #include "Range.h" -+#include "SSL_Compat.h" - #include "SSL_Cipher.h" - #include "intl/gettext.h" - -@@ -74,19 +75,19 @@ int BytesToKey(int keyLen, int ivLen, const EVP_MD *md, - int nkey = key ? keyLen : 0; - int niv = iv ? ivLen : 0; - -- EVP_MD_CTX cx; -- EVP_MD_CTX_init(&cx); -+ EVP_MD_CTX *cx = EVP_MD_CTX_new(); -+ EVP_MD_CTX_init(cx); - - for (;;) { -- EVP_DigestInit_ex(&cx, md, NULL); -- if (addmd++) EVP_DigestUpdate(&cx, mdBuf, mds); -- EVP_DigestUpdate(&cx, data, dataLen); -- EVP_DigestFinal_ex(&cx, mdBuf, &mds); -+ EVP_DigestInit_ex(cx, md, NULL); -+ if (addmd++) EVP_DigestUpdate(cx, mdBuf, mds); -+ EVP_DigestUpdate(cx, data, dataLen); -+ EVP_DigestFinal_ex(cx, mdBuf, &mds); - - for (unsigned int i = 1; i < rounds; ++i) { -- EVP_DigestInit_ex(&cx, md, NULL); -- EVP_DigestUpdate(&cx, mdBuf, mds); -- EVP_DigestFinal_ex(&cx, mdBuf, &mds); -+ EVP_DigestInit_ex(cx, md, NULL); -+ EVP_DigestUpdate(cx, mdBuf, mds); -+ EVP_DigestFinal_ex(cx, mdBuf, &mds); - } - - int offset = 0; -@@ -106,7 +107,7 @@ int BytesToKey(int keyLen, int ivLen, const EVP_MD *md, - } - if ((nkey == 0) && (niv == 0)) break; - } -- EVP_MD_CTX_cleanup(&cx); -+ EVP_MD_CTX_free(cx); - OPENSSL_cleanse(mdBuf, sizeof(mdBuf)); - - return keyLen; -@@ -229,12 +230,12 @@ class SSLKey : public AbstractCipherKey { - // followed by iv of _ivLength bytes, - unsigned char *buffer; - -- EVP_CIPHER_CTX block_enc; -- EVP_CIPHER_CTX block_dec; -- EVP_CIPHER_CTX stream_enc; -- EVP_CIPHER_CTX stream_dec; -+ EVP_CIPHER_CTX *block_enc; -+ EVP_CIPHER_CTX *block_dec; -+ EVP_CIPHER_CTX *stream_enc; -+ EVP_CIPHER_CTX *stream_dec; - -- HMAC_CTX mac_ctx; -+ HMAC_CTX *mac_ctx; - - SSLKey(int keySize, int ivLength); - ~SSLKey(); -@@ -251,11 +252,16 @@ SSLKey::SSLKey(int keySize_, int ivLength_) { - // kernel patch is applied.. - mlock(buffer, keySize + ivLength); - -- EVP_CIPHER_CTX_init(&block_enc); -- EVP_CIPHER_CTX_init(&block_dec); -- EVP_CIPHER_CTX_init(&stream_enc); -- EVP_CIPHER_CTX_init(&stream_dec); -- HMAC_CTX_init(&mac_ctx); -+ block_enc = EVP_CIPHER_CTX_new(); -+ EVP_CIPHER_CTX_init(block_enc); -+ block_dec = EVP_CIPHER_CTX_new(); -+ EVP_CIPHER_CTX_init(block_dec); -+ stream_enc = EVP_CIPHER_CTX_new(); -+ EVP_CIPHER_CTX_init(stream_enc); -+ stream_dec = EVP_CIPHER_CTX_new(); -+ EVP_CIPHER_CTX_init(stream_dec); -+ mac_ctx = HMAC_CTX_new(); -+ HMAC_CTX_reset(mac_ctx); - } - - SSLKey::~SSLKey() { -@@ -268,12 +274,11 @@ SSLKey::~SSLKey() { - ivLength = 0; - buffer = 0; - -- EVP_CIPHER_CTX_cleanup(&block_enc); -- EVP_CIPHER_CTX_cleanup(&block_dec); -- EVP_CIPHER_CTX_cleanup(&stream_enc); -- EVP_CIPHER_CTX_cleanup(&stream_dec); -- -- HMAC_CTX_cleanup(&mac_ctx); -+ EVP_CIPHER_CTX_free(block_enc); -+ EVP_CIPHER_CTX_free(block_dec); -+ EVP_CIPHER_CTX_free(stream_enc); -+ EVP_CIPHER_CTX_free(stream_dec); -+ HMAC_CTX_free(mac_ctx); - - pthread_mutex_destroy(&mutex); - } -@@ -290,27 +295,27 @@ void initKey(const std::shared_ptr<SSLKey> &key, const EVP_CIPHER *_blockCipher, - Lock lock(key->mutex); - // initialize the cipher context once so that we don't have to do it for - // every block.. -- EVP_EncryptInit_ex(&key->block_enc, _blockCipher, NULL, NULL, NULL); -- EVP_DecryptInit_ex(&key->block_dec, _blockCipher, NULL, NULL, NULL); -- EVP_EncryptInit_ex(&key->stream_enc, _streamCipher, NULL, NULL, NULL); -- EVP_DecryptInit_ex(&key->stream_dec, _streamCipher, NULL, NULL, NULL); -- -- EVP_CIPHER_CTX_set_key_length(&key->block_enc, _keySize); -- EVP_CIPHER_CTX_set_key_length(&key->block_dec, _keySize); -- EVP_CIPHER_CTX_set_key_length(&key->stream_enc, _keySize); -- EVP_CIPHER_CTX_set_key_length(&key->stream_dec, _keySize); -- -- EVP_CIPHER_CTX_set_padding(&key->block_enc, 0); -- EVP_CIPHER_CTX_set_padding(&key->block_dec, 0); -- EVP_CIPHER_CTX_set_padding(&key->stream_enc, 0); -- EVP_CIPHER_CTX_set_padding(&key->stream_dec, 0); -- -- EVP_EncryptInit_ex(&key->block_enc, NULL, NULL, KeyData(key), NULL); -- EVP_DecryptInit_ex(&key->block_dec, NULL, NULL, KeyData(key), NULL); -- EVP_EncryptInit_ex(&key->stream_enc, NULL, NULL, KeyData(key), NULL); -- EVP_DecryptInit_ex(&key->stream_dec, NULL, NULL, KeyData(key), NULL); -- -- HMAC_Init_ex(&key->mac_ctx, KeyData(key), _keySize, EVP_sha1(), 0); -+ EVP_EncryptInit_ex(key->block_enc, _blockCipher, NULL, NULL, NULL); -+ EVP_DecryptInit_ex(key->block_dec, _blockCipher, NULL, NULL, NULL); -+ EVP_EncryptInit_ex(key->stream_enc, _streamCipher, NULL, NULL, NULL); -+ EVP_DecryptInit_ex(key->stream_dec, _streamCipher, NULL, NULL, NULL); -+ -+ EVP_CIPHER_CTX_set_key_length(key->block_enc, _keySize); -+ EVP_CIPHER_CTX_set_key_length(key->block_dec, _keySize); -+ EVP_CIPHER_CTX_set_key_length(key->stream_enc, _keySize); -+ EVP_CIPHER_CTX_set_key_length(key->stream_dec, _keySize); -+ -+ EVP_CIPHER_CTX_set_padding(key->block_enc, 0); -+ EVP_CIPHER_CTX_set_padding(key->block_dec, 0); -+ EVP_CIPHER_CTX_set_padding(key->stream_enc, 0); -+ EVP_CIPHER_CTX_set_padding(key->stream_dec, 0); -+ -+ EVP_EncryptInit_ex(key->block_enc, NULL, NULL, KeyData(key), NULL); -+ EVP_DecryptInit_ex(key->block_dec, NULL, NULL, KeyData(key), NULL); -+ EVP_EncryptInit_ex(key->stream_enc, NULL, NULL, KeyData(key), NULL); -+ EVP_DecryptInit_ex(key->stream_dec, NULL, NULL, KeyData(key), NULL); -+ -+ HMAC_Init_ex(key->mac_ctx, KeyData(key), _keySize, EVP_sha1(), 0); - } - - SSL_Cipher::SSL_Cipher(const Interface &iface_, const Interface &realIface_, -@@ -451,8 +456,8 @@ static uint64_t _checksum_64(SSLKey *key, const unsigned char *data, - unsigned char md[EVP_MAX_MD_SIZE]; - unsigned int mdLen = EVP_MAX_MD_SIZE; - -- HMAC_Init_ex(&key->mac_ctx, 0, 0, 0, 0); -- HMAC_Update(&key->mac_ctx, data, dataLen); -+ HMAC_Init_ex(key->mac_ctx, 0, 0, 0, 0); -+ HMAC_Update(key->mac_ctx, data, dataLen); - if (chainedIV) { - // toss in the chained IV as well - uint64_t tmp = *chainedIV; -@@ -462,10 +467,10 @@ static uint64_t _checksum_64(SSLKey *key, const unsigned char *data, - tmp >>= 8; - } - -- HMAC_Update(&key->mac_ctx, h, 8); -+ HMAC_Update(key->mac_ctx, h, 8); - } - -- HMAC_Final(&key->mac_ctx, md, &mdLen); -+ HMAC_Final(key->mac_ctx, md, &mdLen); - - rAssert(mdLen >= 8); - -@@ -636,10 +641,10 @@ void SSL_Cipher::setIVec(unsigned char *ivec, uint64_t seed, - } - - // combine ivec and seed with HMAC -- HMAC_Init_ex(&key->mac_ctx, 0, 0, 0, 0); -- HMAC_Update(&key->mac_ctx, ivec, _ivLength); -- HMAC_Update(&key->mac_ctx, md, 8); -- HMAC_Final(&key->mac_ctx, md, &mdLen); -+ HMAC_Init_ex(key->mac_ctx, 0, 0, 0, 0); -+ HMAC_Update(key->mac_ctx, ivec, _ivLength); -+ HMAC_Update(key->mac_ctx, md, 8); -+ HMAC_Final(key->mac_ctx, md, &mdLen); - rAssert(mdLen >= _ivLength); - - memcpy(ivec, md, _ivLength); -@@ -731,17 +736,17 @@ bool SSL_Cipher::streamEncode(unsigned char *buf, int size, uint64_t iv64, - shuffleBytes(buf, size); - - setIVec(ivec, iv64, key); -- EVP_EncryptInit_ex(&key->stream_enc, NULL, NULL, NULL, ivec); -- EVP_EncryptUpdate(&key->stream_enc, buf, &dstLen, buf, size); -- EVP_EncryptFinal_ex(&key->stream_enc, buf + dstLen, &tmpLen); -+ EVP_EncryptInit_ex(key->stream_enc, NULL, NULL, NULL, ivec); -+ EVP_EncryptUpdate(key->stream_enc, buf, &dstLen, buf, size); -+ EVP_EncryptFinal_ex(key->stream_enc, buf + dstLen, &tmpLen); - - flipBytes(buf, size); - shuffleBytes(buf, size); - - setIVec(ivec, iv64 + 1, key); -- EVP_EncryptInit_ex(&key->stream_enc, NULL, NULL, NULL, ivec); -- EVP_EncryptUpdate(&key->stream_enc, buf, &dstLen, buf, size); -- EVP_EncryptFinal_ex(&key->stream_enc, buf + dstLen, &tmpLen); -+ EVP_EncryptInit_ex(key->stream_enc, NULL, NULL, NULL, ivec); -+ EVP_EncryptUpdate(key->stream_enc, buf, &dstLen, buf, size); -+ EVP_EncryptFinal_ex(key->stream_enc, buf + dstLen, &tmpLen); - - dstLen += tmpLen; - if (dstLen != size) { -@@ -765,17 +770,17 @@ bool SSL_Cipher::streamDecode(unsigned char *buf, int size, uint64_t iv64, - int dstLen = 0, tmpLen = 0; - - setIVec(ivec, iv64 + 1, key); -- EVP_DecryptInit_ex(&key->stream_dec, NULL, NULL, NULL, ivec); -- EVP_DecryptUpdate(&key->stream_dec, buf, &dstLen, buf, size); -- EVP_DecryptFinal_ex(&key->stream_dec, buf + dstLen, &tmpLen); -+ EVP_DecryptInit_ex(key->stream_dec, NULL, NULL, NULL, ivec); -+ EVP_DecryptUpdate(key->stream_dec, buf, &dstLen, buf, size); -+ EVP_DecryptFinal_ex(key->stream_dec, buf + dstLen, &tmpLen); - - unshuffleBytes(buf, size); - flipBytes(buf, size); - - setIVec(ivec, iv64, key); -- EVP_DecryptInit_ex(&key->stream_dec, NULL, NULL, NULL, ivec); -- EVP_DecryptUpdate(&key->stream_dec, buf, &dstLen, buf, size); -- EVP_DecryptFinal_ex(&key->stream_dec, buf + dstLen, &tmpLen); -+ EVP_DecryptInit_ex(key->stream_dec, NULL, NULL, NULL, ivec); -+ EVP_DecryptUpdate(key->stream_dec, buf, &dstLen, buf, size); -+ EVP_DecryptFinal_ex(key->stream_dec, buf + dstLen, &tmpLen); - - unshuffleBytes(buf, size); - -@@ -796,7 +801,7 @@ bool SSL_Cipher::blockEncode(unsigned char *buf, int size, uint64_t iv64, - rAssert(key->ivLength == _ivLength); - - // data must be integer number of blocks -- const int blockMod = size % EVP_CIPHER_CTX_block_size(&key->block_enc); -+ const int blockMod = size % EVP_CIPHER_CTX_block_size(key->block_enc); - if (blockMod != 0) - throw Error("Invalid data size, not multiple of block size"); - -@@ -807,9 +812,9 @@ bool SSL_Cipher::blockEncode(unsigned char *buf, int size, uint64_t iv64, - int dstLen = 0, tmpLen = 0; - setIVec(ivec, iv64, key); - -- EVP_EncryptInit_ex(&key->block_enc, NULL, NULL, NULL, ivec); -- EVP_EncryptUpdate(&key->block_enc, buf, &dstLen, buf, size); -- EVP_EncryptFinal_ex(&key->block_enc, buf + dstLen, &tmpLen); -+ EVP_EncryptInit_ex(key->block_enc, NULL, NULL, NULL, ivec); -+ EVP_EncryptUpdate(key->block_enc, buf, &dstLen, buf, size); -+ EVP_EncryptFinal_ex(key->block_enc, buf + dstLen, &tmpLen); - dstLen += tmpLen; - - if (dstLen != size) { -@@ -828,7 +833,7 @@ bool SSL_Cipher::blockDecode(unsigned char *buf, int size, uint64_t iv64, - rAssert(key->ivLength == _ivLength); - - // data must be integer number of blocks -- const int blockMod = size % EVP_CIPHER_CTX_block_size(&key->block_dec); -+ const int blockMod = size % EVP_CIPHER_CTX_block_size(key->block_dec); - if (blockMod != 0) - throw Error("Invalid data size, not multiple of block size"); - -@@ -839,9 +844,9 @@ bool SSL_Cipher::blockDecode(unsigned char *buf, int size, uint64_t iv64, - int dstLen = 0, tmpLen = 0; - setIVec(ivec, iv64, key); - -- EVP_DecryptInit_ex(&key->block_dec, NULL, NULL, NULL, ivec); -- EVP_DecryptUpdate(&key->block_dec, buf, &dstLen, buf, size); -- EVP_DecryptFinal_ex(&key->block_dec, buf + dstLen, &tmpLen); -+ EVP_DecryptInit_ex(key->block_dec, NULL, NULL, NULL, ivec); -+ EVP_DecryptUpdate(key->block_dec, buf, &dstLen, buf, size); -+ EVP_DecryptFinal_ex(key->block_dec, buf + dstLen, &tmpLen); - dstLen += tmpLen; - - if (dstLen != size) { -diff --git a/encfs/SSL_Compat.h b/encfs/SSL_Compat.h -new file mode 100644 -index 0000000..f7b1629 ---- /dev/null -+++ b/encfs/SSL_Compat.h -@@ -0,0 +1,52 @@ -+/***************************************************************************** -+ * Author: Rogelio Dominguez Hernandez <[email protected]> -+ * -+ ***************************************************************************** -+ * Copyright (c) 2016, Rogelio Dominguez Hernandez -+ * -+ * This program is free software: you can redistribute it and/or modify it -+ * under the terms of the GNU Lesser General Public License as published by the -+ * Free Software Foundation, either version 3 of the License, or (at your -+ * option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License -+ * for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public License -+ * along with this program. If not, see <http://www.gnu.org/licenses/>. -+ */ -+ -+#ifndef _SSL_Compat_incl_ -+#define _SSL_Compat_incl_ -+ -+// OpenSSL < 1.1.0 -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+ -+// Equivalent methods -+#define EVP_MD_CTX_new EVP_MD_CTX_create -+#define EVP_MD_CTX_free EVP_MD_CTX_destroy -+#define HMAC_CTX_reset HMAC_CTX_cleanup -+ -+// Missing methods (based on 1.1.0 versions) -+HMAC_CTX *HMAC_CTX_new(void) -+{ -+ HMAC_CTX *ctx = (HMAC_CTX *)OPENSSL_malloc(sizeof(HMAC_CTX)); -+ if (ctx != NULL) { -+ memset(ctx, 0, sizeof(HMAC_CTX)); -+ HMAC_CTX_reset(ctx); -+ } -+ return ctx; -+} -+ -+void HMAC_CTX_free(HMAC_CTX *ctx) -+{ -+ if (ctx != NULL) { -+ HMAC_CTX_cleanup(ctx); -+ OPENSSL_free(ctx); -+ } -+} -+#endif -+ -+#endif -diff --git a/encfs/encfssh b/encfs/encfssh -old mode 100755 -new mode 100644 -
