2021-01-06 18:17:53 +01:00
|
|
|
Description: Fix OpenSSL 1.1 detection and access to now opaque structures.
|
|
|
|
|
Bug-Debian: https://bugs.debian.org/845035
|
|
|
|
|
Author: Axel Beckert <abe@debian.org>
|
|
|
|
|
Forwarded: http://lists.dillo.org/pipermail/dillo-dev/2017-September/011076.html
|
|
|
|
|
|
srcpkgs/d*: convert patches to -Np1
* daemontools and dmraid is kept at -Np0
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
2021-06-19 05:03:21 +02:00
|
|
|
--- a/configure 2015-06-30 16:07:22.000000000 +0200
|
|
|
|
|
+++ b/configure 2015-06-30 16:07:22.000000000 +0200
|
2021-01-06 18:17:53 +01:00
|
|
|
@@ -6002,9 +6002,9 @@
|
|
|
|
|
|
|
|
|
|
if test "x$ssl_ok" = "xyes"; then
|
|
|
|
|
old_libs="$LIBS"
|
|
|
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5
|
|
|
|
|
-$as_echo_n "checking for SSL_library_init in -lssl... " >&6; }
|
|
|
|
|
-if ${ac_cv_lib_ssl_SSL_library_init+:} false; then :
|
|
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_new in -lssl" >&5
|
|
|
|
|
+$as_echo_n "checking for SSL_new in -lssl... " >&6; }
|
|
|
|
|
+if ${ac_cv_lib_ssl_SSL_new+:} false; then :
|
|
|
|
|
$as_echo_n "(cached) " >&6
|
|
|
|
|
else
|
|
|
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
|
|
|
@@ -6018,27 +6018,27 @@
|
|
|
|
|
#ifdef __cplusplus
|
|
|
|
|
extern "C"
|
|
|
|
|
#endif
|
|
|
|
|
-char SSL_library_init ();
|
|
|
|
|
+char SSL_new ();
|
|
|
|
|
int
|
|
|
|
|
main ()
|
|
|
|
|
{
|
|
|
|
|
-return SSL_library_init ();
|
|
|
|
|
+return SSL_new ();
|
|
|
|
|
;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
_ACEOF
|
|
|
|
|
if ac_fn_c_try_link "$LINENO"; then :
|
|
|
|
|
- ac_cv_lib_ssl_SSL_library_init=yes
|
|
|
|
|
+ ac_cv_lib_ssl_SSL_new=yes
|
|
|
|
|
else
|
|
|
|
|
- ac_cv_lib_ssl_SSL_library_init=no
|
|
|
|
|
+ ac_cv_lib_ssl_SSL_new=no
|
|
|
|
|
fi
|
|
|
|
|
rm -f core conftest.err conftest.$ac_objext \
|
|
|
|
|
conftest$ac_exeext conftest.$ac_ext
|
|
|
|
|
LIBS=$ac_check_lib_save_LIBS
|
|
|
|
|
fi
|
|
|
|
|
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_library_init" >&5
|
|
|
|
|
-$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; }
|
|
|
|
|
-if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes; then :
|
|
|
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_new" >&5
|
|
|
|
|
+$as_echo "$ac_cv_lib_ssl_SSL_new" >&6; }
|
|
|
|
|
+if test "x$ac_cv_lib_ssl_SSL_new" = xyes; then :
|
|
|
|
|
ssl_ok=yes
|
|
|
|
|
else
|
|
|
|
|
ssl_ok=no
|
srcpkgs/d*: convert patches to -Np1
* daemontools and dmraid is kept at -Np0
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
2021-06-19 05:03:21 +02:00
|
|
|
--- a/dpi/https.c
|
|
|
|
|
+++ b/dpi/https.c
|
2021-01-06 18:17:53 +01:00
|
|
|
@@ -476,7 +476,7 @@
|
|
|
|
|
case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
|
|
|
|
|
/*Either self signed and untrusted*/
|
|
|
|
|
/*Extract CN from certificate name information*/
|
|
|
|
|
- if ((cn = strstr(remote_cert->name, "/CN=")) == NULL) {
|
|
|
|
|
+ if ((cn = strstr(X509_get_subject_name((X509 *) remote_cert), "/CN=")) == NULL) {
|
|
|
|
|
strcpy(buf, "(no CN given)");
|
|
|
|
|
} else {
|
|
|
|
|
char *cn_end;
|
