1*4882a593SmuzhiyunFrom ff44d8b2d5211a502afdb3e612dae0e8133b5124 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Johannes Hofmann <Johannes.Hofmann@gmx.de> 3*4882a593SmuzhiyunDate: Thu, 9 Jan 2020 22:07:15 +0100 4*4882a593SmuzhiyunSubject: [PATCH] Support OpenSSL 1.1.0 5*4882a593Smuzhiyun 6*4882a593Smuzhiyuntaken-from: pkgsrc (Ryo ONODERA) 7*4882a593Smuzhiyunsubmitted-by: Jun Ebihara <jun@soum.co.jp> 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunUpstream: https://hg.dillo.org/dillo/rev/b171b8610400 10*4882a593SmuzhiyunSigned-off-by: Peter Seiderer <ps.report@gmx.net> 11*4882a593Smuzhiyun--- 12*4882a593Smuzhiyun dpi/https.c | 4 ++++ 13*4882a593Smuzhiyun 1 file changed, 4 insertions(+) 14*4882a593Smuzhiyun 15*4882a593Smuzhiyundiff --git a/dpi/https.c b/dpi/https.c 16*4882a593Smuzhiyunindex 766b3af..025cfc4 100644 17*4882a593Smuzhiyun--- a/dpi/https.c 18*4882a593Smuzhiyun+++ b/dpi/https.c 19*4882a593Smuzhiyun@@ -476,7 +476,11 @@ static int handle_certificate_problem(SSL * ssl_connection) 20*4882a593Smuzhiyun case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT: 21*4882a593Smuzhiyun /*Either self signed and untrusted*/ 22*4882a593Smuzhiyun /*Extract CN from certificate name information*/ 23*4882a593Smuzhiyun+#if OPENSSL_VERSION_NUMBER < 0x10100000L 24*4882a593Smuzhiyun if ((cn = strstr(remote_cert->name, "/CN=")) == NULL) { 25*4882a593Smuzhiyun+#else 26*4882a593Smuzhiyun+ if ((cn = strstr(X509_get_subject_name(remote_cert), "/CN=")) == NULL) { 27*4882a593Smuzhiyun+#endif 28*4882a593Smuzhiyun strcpy(buf, "(no CN given)"); 29*4882a593Smuzhiyun } else { 30*4882a593Smuzhiyun char *cn_end; 31*4882a593Smuzhiyun-- 32*4882a593Smuzhiyun2.24.1 33*4882a593Smuzhiyun 34