view tests/test-mq-qdiff.out @ 12592:f2937d6492c5 stable

url: verify correctness of https server certificates (issue2407) Pythons SSL module verifies that certificates received for HTTPS are valid according to the specified cacerts, but it doesn't verify that the certificate is for the host we connect to. We now explicitly verify that the commonName in the received certificate matches the requested hostname and is valid for the time being. This is a minimal patch where we try to fail to the safe side, but we do still rely on Python's SSL functionality and do not try to implement the standards fully and correctly. CRLs and subjectAltName are not handled and proxies haven't been considered. This change might break connections to some sites if cacerts is specified and the certificates (by our definition) isn't correct. The workaround is to disable cacerts which in most cases isn't much worse than it was before with cacerts.
author Mads Kiilerich <mads@kiilerich.com>
date Fri, 01 Oct 2010 00:46:59 +0200
parents a84f14228b1d
children
line wrap: on
line source

% init
% commit
adding base
% qnew mqbase
% qrefresh
% qdiff
diff -r 67e992f2c4f3 base
--- a/base
+++ b/base
@@ -1,1 +1,1 @@
-base
+patched
% qdiff dirname
diff -r 67e992f2c4f3 base
--- a/base
+++ b/base
@@ -1,1 +1,1 @@
-base
+patched
% qdiff filename
diff -r 67e992f2c4f3 base
--- a/base
+++ b/base
@@ -1,1 +1,1 @@
-base
+patched
% revert
% qpop
popping mqbase
patch queue now empty
% qdelete mqbase
% commit 2
adding lines
% qnew 2
% qdiff -U 1
diff -r 35fb829491c1 lines
--- a/lines
+++ b/lines
@@ -1,1 +1,3 @@
+
+
 1
@@ -4,4 +6,4 @@
 4
-hello world
-goodbye world
+hello  world
+     goodbye world
 7
% qdiff -b
diff -r 35fb829491c1 lines
--- a/lines
+++ b/lines
@@ -1,9 +1,11 @@
+
+
 1
 2
 3
 4
 hello world
-goodbye world
+     goodbye world
 7
 8
 9
% qdiff -U 1 -B
diff -r 35fb829491c1 lines
--- a/lines
+++ b/lines
@@ -4,4 +6,4 @@
 4
-hello world
-goodbye world
+hello  world
+     goodbye world
 7
% qdiff -w
diff -r 35fb829491c1 lines
--- a/lines
+++ b/lines
@@ -1,3 +1,5 @@
+
+
 1
 2
 3
% qdiff --reverse
diff -r 35fb829491c1 lines
--- a/lines
+++ b/lines
@@ -1,11 +1,9 @@
-
-
 1
 2
 3
 4
-hello  world
-     goodbye world
+hello world
+goodbye world
 7
 8
 9
% qdiff preserve existing git flag
diff --git a/lines b/lines
--- a/lines
+++ b/lines
@@ -1,9 +1,12 @@
+
+
 1
 2
 3
 4
-hello world
-goodbye world
+hello  world
+     goodbye world
 7
 8
 9
+a
% qdiff --stat
 lines |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)