February 2019 - tor-commits - lists.torproject.org

[tor/master] Fix compilation when openssl is compiled without engine support.
by asn＠torproject.org 14 Feb '19

14 Feb '19

commit b9abdcd6bce961baea17274ff6d213322d2b46d7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 8 08:50:04 2019 -0500 Fix compilation when openssl is compiled without engine support. Patch from Mangix. Closes part of ticket 29026. --- src/lib/crypt_ops/aes_openssl.c | 2 +- src/lib/crypt_ops/crypto_openssl_mgt.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/crypt_ops/aes_openssl.c b/src/lib/crypt_ops/aes_openssl.c index 42ee924a8..2f985d451 100644 --- a/src/lib/crypt_ops/aes_openssl.c +++ b/src/lib/crypt_ops/aes_openssl.c @@ -43,7 +43,7 @@ ENABLE_GCC_WARNING(redundant-decls) #include "lib/log/log.h" #include "lib/ctime/di_ops.h" -#ifdef ANDROID +#ifdef OPENSSL_NO_ENGINE /* Android's OpenSSL seems to have removed all of its Engine support. */ #define DISABLE_ENGINES #endif diff --git a/src/lib/crypt_ops/crypto_openssl_mgt.h b/src/lib/crypt_ops/crypto_openssl_mgt.h index 83fb44cad..a3dd03aa0 100644 --- a/src/lib/crypt_ops/crypto_openssl_mgt.h +++ b/src/lib/crypt_ops/crypto_openssl_mgt.h @@ -50,7 +50,7 @@ #define OPENSSL_V_SERIES(a,b,c) \ OPENSSL_VER((a),(b),(c),0,0) -#ifdef ANDROID +#ifdef OPENSSL_NO_ENGINE /* Android's OpenSSL seems to have removed all of its Engine support. */ #define DISABLE_ENGINES #endif

1 0

[tor/maint-0.3.5] Changes file for ticket29026.
by asn＠torproject.org 14 Feb '19

14 Feb '19

commit b63404ebba747337aece30555d94150b4d1bdd30 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 8 08:52:46 2019 -0500 Changes file for ticket29026. --- changes/ticket29026 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/ticket29026 b/changes/ticket29026 new file mode 100644 index 000000000..1db873dfc --- /dev/null +++ b/changes/ticket29026 @@ -0,0 +1,4 @@ + o Minor features (compilation): + - Compile correctly when OpenSSL is built with engine support + disabled, or with deprecated APIs disabled. Closes ticket + 29026. Patches from "Mangix".

1 0

[tor/maint-0.3.5] Add more openssl includes to fix no-deprecated compilation
by asn＠torproject.org 14 Feb '19

14 Feb '19

commit 49ec29044d12ff1d609ebe491f08f84e958be748 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 8 08:51:04 2019 -0500 Add more openssl includes to fix no-deprecated compilation Closes ticket 29026; patch from Mangix. --- src/lib/crypt_ops/crypto_hkdf.c | 1 + src/lib/crypt_ops/crypto_rand.c | 1 + src/lib/crypt_ops/crypto_rsa.c | 4 ++++ src/lib/tls/x509_openssl.c | 3 +++ 4 files changed, 9 insertions(+) diff --git a/src/lib/crypt_ops/crypto_hkdf.c b/src/lib/crypt_ops/crypto_hkdf.c index 6c82fa14f..fd2e70165 100644 --- a/src/lib/crypt_ops/crypto_hkdf.c +++ b/src/lib/crypt_ops/crypto_hkdf.c @@ -18,6 +18,7 @@ #include "lib/log/util_bug.h" #ifdef ENABLE_OPENSSL +#include <openssl/evp.h> #include <openssl/opensslv.h> #if defined(HAVE_ERR_LOAD_KDF_STRINGS) diff --git a/src/lib/crypt_ops/crypto_rand.c b/src/lib/crypt_ops/crypto_rand.c index 70b2965ca..915fe0870 100644 --- a/src/lib/crypt_ops/crypto_rand.c +++ b/src/lib/crypt_ops/crypto_rand.c @@ -45,6 +45,7 @@ #ifdef ENABLE_OPENSSL DISABLE_GCC_WARNING(redundant-decls) #include <openssl/rand.h> +#include <openssl/sha.h> ENABLE_GCC_WARNING(redundant-decls) #endif diff --git a/src/lib/crypt_ops/crypto_rsa.c b/src/lib/crypt_ops/crypto_rsa.c index 2b977b0b9..c9189b0df 100644 --- a/src/lib/crypt_ops/crypto_rsa.c +++ b/src/lib/crypt_ops/crypto_rsa.c @@ -31,6 +31,10 @@ #include <sys/stat.h> #endif +#ifdef ENABLE_OPENSSL +#include <openssl/rsa.h> +#endif + /** Return the number of bytes added by padding method padding. */ int diff --git a/src/lib/tls/x509_openssl.c b/src/lib/tls/x509_openssl.c index cf276c424..a344279c2 100644 --- a/src/lib/tls/x509_openssl.c +++ b/src/lib/tls/x509_openssl.c @@ -31,7 +31,10 @@ DISABLE_GCC_WARNING(redundant-decls) #include <openssl/asn1.h> #include <openssl/bio.h> #include <openssl/bn.h> +#include <openssl/evp.h> +#include <openssl/objects.h> #include <openssl/rsa.h> +#include <openssl/x509.h> ENABLE_GCC_WARNING(redundant-decls)

1 0

[tor/maint-0.3.5] Merge branch 'tor-github/pr/689' into maint-0.3.5
by asn＠torproject.org 14 Feb '19

14 Feb '19

commit d83c299eba8010204b3fe0760b1372c7564889fe Merge: 9bfe4ed6d b63404ebb Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Feb 14 18:00:05 2019 +0200 Merge branch 'tor-github/pr/689' into maint-0.3.5 changes/ticket29026 | 4 ++++ src/lib/crypt_ops/aes_openssl.c | 2 +- src/lib/crypt_ops/crypto_hkdf.c | 1 + src/lib/crypt_ops/crypto_openssl_mgt.h | 2 +- src/lib/crypt_ops/crypto_rand.c | 1 + src/lib/crypt_ops/crypto_rsa.c | 4 ++++ src/lib/tls/x509_openssl.c | 3 +++ 7 files changed, 15 insertions(+), 2 deletions(-)

1 0

[tor/master] Add more openssl includes to fix no-deprecated compilation
by asn＠torproject.org 14 Feb '19

14 Feb '19

commit 49ec29044d12ff1d609ebe491f08f84e958be748 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 8 08:51:04 2019 -0500 Add more openssl includes to fix no-deprecated compilation Closes ticket 29026; patch from Mangix. --- src/lib/crypt_ops/crypto_hkdf.c | 1 + src/lib/crypt_ops/crypto_rand.c | 1 + src/lib/crypt_ops/crypto_rsa.c | 4 ++++ src/lib/tls/x509_openssl.c | 3 +++ 4 files changed, 9 insertions(+) diff --git a/src/lib/crypt_ops/crypto_hkdf.c b/src/lib/crypt_ops/crypto_hkdf.c index 6c82fa14f..fd2e70165 100644 --- a/src/lib/crypt_ops/crypto_hkdf.c +++ b/src/lib/crypt_ops/crypto_hkdf.c @@ -18,6 +18,7 @@ #include "lib/log/util_bug.h" #ifdef ENABLE_OPENSSL +#include <openssl/evp.h> #include <openssl/opensslv.h> #if defined(HAVE_ERR_LOAD_KDF_STRINGS) diff --git a/src/lib/crypt_ops/crypto_rand.c b/src/lib/crypt_ops/crypto_rand.c index 70b2965ca..915fe0870 100644 --- a/src/lib/crypt_ops/crypto_rand.c +++ b/src/lib/crypt_ops/crypto_rand.c @@ -45,6 +45,7 @@ #ifdef ENABLE_OPENSSL DISABLE_GCC_WARNING(redundant-decls) #include <openssl/rand.h> +#include <openssl/sha.h> ENABLE_GCC_WARNING(redundant-decls) #endif diff --git a/src/lib/crypt_ops/crypto_rsa.c b/src/lib/crypt_ops/crypto_rsa.c index 2b977b0b9..c9189b0df 100644 --- a/src/lib/crypt_ops/crypto_rsa.c +++ b/src/lib/crypt_ops/crypto_rsa.c @@ -31,6 +31,10 @@ #include <sys/stat.h> #endif +#ifdef ENABLE_OPENSSL +#include <openssl/rsa.h> +#endif + /** Return the number of bytes added by padding method padding. */ int diff --git a/src/lib/tls/x509_openssl.c b/src/lib/tls/x509_openssl.c index cf276c424..a344279c2 100644 --- a/src/lib/tls/x509_openssl.c +++ b/src/lib/tls/x509_openssl.c @@ -31,7 +31,10 @@ DISABLE_GCC_WARNING(redundant-decls) #include <openssl/asn1.h> #include <openssl/bio.h> #include <openssl/bn.h> +#include <openssl/evp.h> +#include <openssl/objects.h> #include <openssl/rsa.h> +#include <openssl/x509.h> ENABLE_GCC_WARNING(redundant-decls)

1 0

[tor/release-0.3.5] Fix compilation when openssl is compiled without engine support.
by asn＠torproject.org 14 Feb '19

14 Feb '19

commit b9abdcd6bce961baea17274ff6d213322d2b46d7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 8 08:50:04 2019 -0500 Fix compilation when openssl is compiled without engine support. Patch from Mangix. Closes part of ticket 29026. --- src/lib/crypt_ops/aes_openssl.c | 2 +- src/lib/crypt_ops/crypto_openssl_mgt.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/crypt_ops/aes_openssl.c b/src/lib/crypt_ops/aes_openssl.c index 42ee924a8..2f985d451 100644 --- a/src/lib/crypt_ops/aes_openssl.c +++ b/src/lib/crypt_ops/aes_openssl.c @@ -43,7 +43,7 @@ ENABLE_GCC_WARNING(redundant-decls) #include "lib/log/log.h" #include "lib/ctime/di_ops.h" -#ifdef ANDROID +#ifdef OPENSSL_NO_ENGINE /* Android's OpenSSL seems to have removed all of its Engine support. */ #define DISABLE_ENGINES #endif diff --git a/src/lib/crypt_ops/crypto_openssl_mgt.h b/src/lib/crypt_ops/crypto_openssl_mgt.h index 83fb44cad..a3dd03aa0 100644 --- a/src/lib/crypt_ops/crypto_openssl_mgt.h +++ b/src/lib/crypt_ops/crypto_openssl_mgt.h @@ -50,7 +50,7 @@ #define OPENSSL_V_SERIES(a,b,c) \ OPENSSL_VER((a),(b),(c),0,0) -#ifdef ANDROID +#ifdef OPENSSL_NO_ENGINE /* Android's OpenSSL seems to have removed all of its Engine support. */ #define DISABLE_ENGINES #endif

1 0

[tor/master] Merge branch 'tor-github/pr/689' into maint-0.3.5
by asn＠torproject.org 14 Feb '19

14 Feb '19

commit d83c299eba8010204b3fe0760b1372c7564889fe Merge: 9bfe4ed6d b63404ebb Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Feb 14 18:00:05 2019 +0200 Merge branch 'tor-github/pr/689' into maint-0.3.5 changes/ticket29026 | 4 ++++ src/lib/crypt_ops/aes_openssl.c | 2 +- src/lib/crypt_ops/crypto_hkdf.c | 1 + src/lib/crypt_ops/crypto_openssl_mgt.h | 2 +- src/lib/crypt_ops/crypto_rand.c | 1 + src/lib/crypt_ops/crypto_rsa.c | 4 ++++ src/lib/tls/x509_openssl.c | 3 +++ 7 files changed, 15 insertions(+), 2 deletions(-)

1 0

[tor/master] Changes file for ticket29026.
by asn＠torproject.org 14 Feb '19

14 Feb '19

commit b63404ebba747337aece30555d94150b4d1bdd30 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 8 08:52:46 2019 -0500 Changes file for ticket29026. --- changes/ticket29026 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/ticket29026 b/changes/ticket29026 new file mode 100644 index 000000000..1db873dfc --- /dev/null +++ b/changes/ticket29026 @@ -0,0 +1,4 @@ + o Minor features (compilation): + - Compile correctly when OpenSSL is built with engine support + disabled, or with deprecated APIs disabled. Closes ticket + 29026. Patches from "Mangix".

1 0

[tor/master] Merge branch 'maint-0.3.5'
by asn＠torproject.org 14 Feb '19

14 Feb '19

commit 00b073b1bc909d2d2a30a3c1ddd5abd5e670da80 Merge: b804d5bc4 d83c299eb Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Feb 14 18:01:07 2019 +0200 Merge branch 'maint-0.3.5' changes/ticket29026 | 4 ++++ src/lib/crypt_ops/aes_openssl.c | 2 +- src/lib/crypt_ops/crypto_hkdf.c | 1 + src/lib/crypt_ops/crypto_openssl_mgt.h | 2 +- src/lib/crypt_ops/crypto_rand.c | 1 + src/lib/crypt_ops/crypto_rsa.c | 4 ++++ src/lib/tls/x509_openssl.c | 3 +++ 7 files changed, 15 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.5] Add more openssl includes to fix no-deprecated compilation
by asn＠torproject.org 14 Feb '19

14 Feb '19

commit 49ec29044d12ff1d609ebe491f08f84e958be748 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 8 08:51:04 2019 -0500 Add more openssl includes to fix no-deprecated compilation Closes ticket 29026; patch from Mangix. --- src/lib/crypt_ops/crypto_hkdf.c | 1 + src/lib/crypt_ops/crypto_rand.c | 1 + src/lib/crypt_ops/crypto_rsa.c | 4 ++++ src/lib/tls/x509_openssl.c | 3 +++ 4 files changed, 9 insertions(+) diff --git a/src/lib/crypt_ops/crypto_hkdf.c b/src/lib/crypt_ops/crypto_hkdf.c index 6c82fa14f..fd2e70165 100644 --- a/src/lib/crypt_ops/crypto_hkdf.c +++ b/src/lib/crypt_ops/crypto_hkdf.c @@ -18,6 +18,7 @@ #include "lib/log/util_bug.h" #ifdef ENABLE_OPENSSL +#include <openssl/evp.h> #include <openssl/opensslv.h> #if defined(HAVE_ERR_LOAD_KDF_STRINGS) diff --git a/src/lib/crypt_ops/crypto_rand.c b/src/lib/crypt_ops/crypto_rand.c index 70b2965ca..915fe0870 100644 --- a/src/lib/crypt_ops/crypto_rand.c +++ b/src/lib/crypt_ops/crypto_rand.c @@ -45,6 +45,7 @@ #ifdef ENABLE_OPENSSL DISABLE_GCC_WARNING(redundant-decls) #include <openssl/rand.h> +#include <openssl/sha.h> ENABLE_GCC_WARNING(redundant-decls) #endif diff --git a/src/lib/crypt_ops/crypto_rsa.c b/src/lib/crypt_ops/crypto_rsa.c index 2b977b0b9..c9189b0df 100644 --- a/src/lib/crypt_ops/crypto_rsa.c +++ b/src/lib/crypt_ops/crypto_rsa.c @@ -31,6 +31,10 @@ #include <sys/stat.h> #endif +#ifdef ENABLE_OPENSSL +#include <openssl/rsa.h> +#endif + /** Return the number of bytes added by padding method padding. */ int diff --git a/src/lib/tls/x509_openssl.c b/src/lib/tls/x509_openssl.c index cf276c424..a344279c2 100644 --- a/src/lib/tls/x509_openssl.c +++ b/src/lib/tls/x509_openssl.c @@ -31,7 +31,10 @@ DISABLE_GCC_WARNING(redundant-decls) #include <openssl/asn1.h> #include <openssl/bio.h> #include <openssl/bn.h> +#include <openssl/evp.h> +#include <openssl/objects.h> #include <openssl/rsa.h> +#include <openssl/x509.h> ENABLE_GCC_WARNING(redundant-decls)

1 0