Date: Friday, May 22, 2020 @ 19:39:56 Author: zorun Revision: 631680 archrelease: copy trunk to community-x86_64
Added: fastd/repos/community-x86_64/0001-cipher-aes128-ctr-openssl-fix-compatiblity-with-Open.patch (from rev 631679, fastd/trunk/0001-cipher-aes128-ctr-openssl-fix-compatiblity-with-Open.patch) fastd/repos/community-x86_64/PKGBUILD (from rev 631679, fastd/trunk/PKGBUILD) Deleted: fastd/repos/community-x86_64/0001-cipher-aes128-ctr-openssl-fix-compatiblity-with-Open.patch fastd/repos/community-x86_64/PKGBUILD -----------------------------------------------------------------+ 0001-cipher-aes128-ctr-openssl-fix-compatiblity-with-Open.patch | 72 +++---- PKGBUILD | 92 ++++------ 2 files changed, 78 insertions(+), 86 deletions(-) Deleted: 0001-cipher-aes128-ctr-openssl-fix-compatiblity-with-Open.patch =================================================================== --- 0001-cipher-aes128-ctr-openssl-fix-compatiblity-with-Open.patch 2020-05-22 19:39:41 UTC (rev 631679) +++ 0001-cipher-aes128-ctr-openssl-fix-compatiblity-with-Open.patch 2020-05-22 19:39:56 UTC (rev 631680) @@ -1,36 +0,0 @@ -From 8505374ee208d51a39e7b22846f9b781b9ccb452 Mon Sep 17 00:00:00 2001 -Message-Id: <8505374ee208d51a39e7b22846f9b781b9ccb452.1515434692.git.mschif...@universe-factory.net> -From: Matthias Schiffer <mschif...@universe-factory.net> -Date: Fri, 19 May 2017 19:36:24 +0200 -Subject: [PATCH] cipher: aes128-ctr: openssl: fix compatiblity with OpenSSL - 1.1 - ---- - src/crypto/cipher/aes128_ctr/openssl/aes128_ctr_openssl.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/crypto/cipher/aes128_ctr/openssl/aes128_ctr_openssl.c b/src/crypto/cipher/aes128_ctr/openssl/aes128_ctr_openssl.c -index 7a2b565..c44427f 100644 ---- a/src/crypto/cipher/aes128_ctr/openssl/aes128_ctr_openssl.c -+++ b/src/crypto/cipher/aes128_ctr/openssl/aes128_ctr_openssl.c -@@ -47,7 +47,7 @@ static fastd_cipher_state_t * aes128_ctr_init(const uint8_t *key) { - fastd_cipher_state_t *state = fastd_new(fastd_cipher_state_t); - - state->aes = EVP_CIPHER_CTX_new(); -- EVP_EncryptInit(state->aes, EVP_aes_128_ctr(), (const unsigned char *)key, NULL); -+ EVP_EncryptInit_ex(state->aes, EVP_aes_128_ctr(), NULL, (const unsigned char *)key, NULL); - - return state; - } -@@ -56,7 +56,7 @@ static fastd_cipher_state_t * aes128_ctr_init(const uint8_t *key) { - static bool aes128_ctr_crypt(const fastd_cipher_state_t *state, fastd_block128_t *out, const fastd_block128_t *in, size_t len, const uint8_t *iv) { - int clen, clen2; - -- if (!EVP_EncryptInit(state->aes, NULL, NULL, iv)) -+ if (!EVP_EncryptInit_ex(state->aes, NULL, NULL, NULL, iv)) - return false; - - if (!EVP_EncryptUpdate(state->aes, (unsigned char *)out, &clen, (const unsigned char *)in, len)) --- -2.15.1 - Copied: fastd/repos/community-x86_64/0001-cipher-aes128-ctr-openssl-fix-compatiblity-with-Open.patch (from rev 631679, fastd/trunk/0001-cipher-aes128-ctr-openssl-fix-compatiblity-with-Open.patch) =================================================================== --- 0001-cipher-aes128-ctr-openssl-fix-compatiblity-with-Open.patch (rev 0) +++ 0001-cipher-aes128-ctr-openssl-fix-compatiblity-with-Open.patch 2020-05-22 19:39:56 UTC (rev 631680) @@ -0,0 +1,36 @@ +From 8505374ee208d51a39e7b22846f9b781b9ccb452 Mon Sep 17 00:00:00 2001 +Message-Id: <8505374ee208d51a39e7b22846f9b781b9ccb452.1515434692.git.mschif...@universe-factory.net> +From: Matthias Schiffer <mschif...@universe-factory.net> +Date: Fri, 19 May 2017 19:36:24 +0200 +Subject: [PATCH] cipher: aes128-ctr: openssl: fix compatiblity with OpenSSL + 1.1 + +--- + src/crypto/cipher/aes128_ctr/openssl/aes128_ctr_openssl.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/crypto/cipher/aes128_ctr/openssl/aes128_ctr_openssl.c b/src/crypto/cipher/aes128_ctr/openssl/aes128_ctr_openssl.c +index 7a2b565..c44427f 100644 +--- a/src/crypto/cipher/aes128_ctr/openssl/aes128_ctr_openssl.c ++++ b/src/crypto/cipher/aes128_ctr/openssl/aes128_ctr_openssl.c +@@ -47,7 +47,7 @@ static fastd_cipher_state_t * aes128_ctr_init(const uint8_t *key) { + fastd_cipher_state_t *state = fastd_new(fastd_cipher_state_t); + + state->aes = EVP_CIPHER_CTX_new(); +- EVP_EncryptInit(state->aes, EVP_aes_128_ctr(), (const unsigned char *)key, NULL); ++ EVP_EncryptInit_ex(state->aes, EVP_aes_128_ctr(), NULL, (const unsigned char *)key, NULL); + + return state; + } +@@ -56,7 +56,7 @@ static fastd_cipher_state_t * aes128_ctr_init(const uint8_t *key) { + static bool aes128_ctr_crypt(const fastd_cipher_state_t *state, fastd_block128_t *out, const fastd_block128_t *in, size_t len, const uint8_t *iv) { + int clen, clen2; + +- if (!EVP_EncryptInit(state->aes, NULL, NULL, iv)) ++ if (!EVP_EncryptInit_ex(state->aes, NULL, NULL, NULL, iv)) + return false; + + if (!EVP_EncryptUpdate(state->aes, (unsigned char *)out, &clen, (const unsigned char *)in, len)) +-- +2.15.1 + Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-05-22 19:39:41 UTC (rev 631679) +++ PKGBUILD 2020-05-22 19:39:56 UTC (rev 631680) @@ -1,50 +0,0 @@ -# Maintainer: Baptiste Jonglez <archlinux at bitsofnetworks dot org> -# Contributor: NeoRaider - -pkgname=fastd -arch=("x86_64") -pkgver=18 -pkgrel=6 -pkgdesc="Fast and secure tunneling daemon" -makedepends=('cmake') -depends=('libcap' 'gcc-libs' 'libuecc>=6' 'libsodium' 'json-c' 'openssl') -url="https://projects.universe-factory.net/projects/fastd" -license=('BSD') -source=("https://projects.universe-factory.net/attachments/download/86/${pkgname}-${pkgver}.tar.xz" - '0001-cipher-aes128-ctr-openssl-fix-compatiblity-with-Open.patch') -sha512sums=('ec3a9f86bd539d7ffe751a81328f44671f0facca624e23ac273ac7e54da68de0dc0b50d1be490082bbb25f2896de0428802f74fc023f9acc986607875417bdae' - '93c0e11a9d61effbd8a62e00e191e8a9bf29e39b7bb1ec2d40eb932403e679f94a106907a7dcbc89ca65e52ea3681b68961846079c179feb7ec65b261763b32e') - -prepare() { - cd "$srcdir/${pkgname}-${pkgver}" - patch -p1 < "$srcdir/0001-cipher-aes128-ctr-openssl-fix-compatiblity-with-Open.patch" -} - -build() { - mkdir -p "$srcdir/build-${pkgver}" - cd "$srcdir/build-${pkgver}" - - cmake \ - -D CMAKE_BUILD_TYPE=RELEASE \ - -D CMAKE_AR=/usr/bin/gcc-ar \ - -D CMAKE_NM=/usr/bin/gcc-nm \ - -D CMAKE_RANLIB=/usr/bin/gcc-ranlib \ - -D CMAKE_INSTALL_PREFIX=/usr \ - -D ENABLE_SYSTEMD=ON \ - -D ENABLE_LTO=ON \ - -D WITH_CIPHER_AES128_CTR_NACL=OFF \ - -D ENABLE_OPENSSL=ON \ - "../${pkgname}-${pkgver}" - make -} - -package() { - cd "$srcdir/build-${pkgver}" - make install DESTDIR="${pkgdir}" - - install -dm755 "${pkgdir}/etc/fastd/" - - install -Dm644 "$srcdir/${pkgname}-${pkgver}/COPYRIGHT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - install -Dm644 "$srcdir/${pkgname}-${pkgver}/doc/examples/fastd@.service" "${pkgdir}/usr/lib/systemd/system/fastd@.service" - install -Dm644 "$srcdir/${pkgname}-${pkgver}/doc/fastd.1" "${pkgdir}/usr/share/man/man1/fastd.1" -} Copied: fastd/repos/community-x86_64/PKGBUILD (from rev 631679, fastd/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-05-22 19:39:56 UTC (rev 631680) @@ -0,0 +1,42 @@ +# Maintainer: Baptiste Jonglez <archlinux at bitsofnetworks dot org> +# Contributor: NeoRaider + +pkgname=fastd +arch=("x86_64") +pkgver=19 +pkgrel=1 +pkgdesc="Fast and secure tunneling daemon" +makedepends=('cmake') +depends=('libcap' 'gcc-libs' 'libuecc>=6' 'libsodium' 'json-c' 'openssl') +url="https://projects.universe-factory.net/projects/fastd" +license=('BSD') +source=("https://projects.universe-factory.net/attachments/download/86/${pkgname}-${pkgver}.tar.xz") +sha512sums=('fc15c34214c41880449fe5f47c7577e31b61dda68eb8b3aa5a0b1ad2ab1922a3c4a92afa87a318ea30bb4579b8b0f6cee510312d895c16b3f5824bbc23523a3e') + +build() { + mkdir -p "$srcdir/build-${pkgver}" + cd "$srcdir/build-${pkgver}" + + cmake \ + -D CMAKE_BUILD_TYPE=RELEASE \ + -D CMAKE_AR=/usr/bin/gcc-ar \ + -D CMAKE_NM=/usr/bin/gcc-nm \ + -D CMAKE_RANLIB=/usr/bin/gcc-ranlib \ + -D CMAKE_INSTALL_PREFIX=/usr \ + -D ENABLE_SYSTEMD=ON \ + -D ENABLE_LTO=ON \ + -D ENABLE_OPENSSL=ON \ + "../${pkgname}-${pkgver}" + make +} + +package() { + cd "$srcdir/build-${pkgver}" + make install DESTDIR="${pkgdir}" + + install -dm755 "${pkgdir}/etc/fastd/" + + install -Dm644 "$srcdir/${pkgname}-${pkgver}/COPYRIGHT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 "$srcdir/${pkgname}-${pkgver}/doc/examples/fastd@.service" "${pkgdir}/usr/lib/systemd/system/fastd@.service" + install -Dm644 "$srcdir/${pkgname}-${pkgver}/doc/fastd.1" "${pkgdir}/usr/share/man/man1/fastd.1" +}