Issue 10451012: Revert 138795 - Revert "nss: revert encrypted and origin bound certificates support."

Issue 10451012: Revert 138795 - Revert "nss: revert encrypted and origin bound certificates support." (Closed)

Created:
8 years, 7 months ago by agl

Modified:
8 years, 7 months ago

Reviewers:
agl

CC:
chromium-reviews, cbentzel+watch_chromium.org, mihaip-chromium-reviews_chromium.org, jochen+watch-content_chromium.org, jam, joi+watch-content_chromium.org, Aaron Boodman, darin-cc_chromium.org, kinuko+watch

Base URL:
svn://svn.chromium.org/chrome/trunk/src/

Visibility:
Public.

More Reviews

Description

Revert 138795 - Revert "nss: revert encrypted and origin bound certificates support." Cleaning up git-svn mess with drover. TBR=agl@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=138796

Patch Set 1 #

Created: 8 years, 7 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Stats (+260 lines, -954 lines)			Patch
M	chrome/browser/extensions/extension_service_unittest.cc	View	1 chunk	+32 lines, -0 lines	0 comments	Download
M	chrome/browser/extensions/unpacked_installer.cc	View	2 chunks	+2 lines, -2 lines	0 comments	Download
A +	chrome/test/data/extensions/unpacked/symlinks_allowed/icon.png	View	0 chunks	+-1 lines, --1 lines	0 comments	Download
A +	chrome/test/data/extensions/unpacked/symlinks_allowed/manifest.json	View	0 chunks	+-1 lines, --1 lines	0 comments	Download
M	content/browser/fileapi/fileapi_message_filter.h	View	1 chunk	+0 lines, -2 lines	0 comments	Download
M	content/browser/fileapi/fileapi_message_filter.cc	View	3 chunks	+0 lines, -14 lines	0 comments	Download
M	content/common/fileapi/webblobregistry_impl.cc	View	3 chunks	+7 lines, -11 lines	0 comments	Download
M	net/base/transport_security_state.cc	View	1 chunk	+2 lines, -0 lines	0 comments	Download
M	net/base/transport_security_state_static.h	View	3 chunks	+74 lines, -0 lines	0 comments	Download
MM	net/base/transport_security_state_static.certs	View	1 chunk	+56 lines, -0 lines	0 comments	Download
M	net/base/transport_security_state_static.json	View	2 chunks	+8 lines, -0 lines	0 comments	Download
M	net/base/transport_security_state_static_generate.go	View	4 chunks	+12 lines, -4 lines	0 comments	Download
M	net/socket/ssl_client_socket_nss.cc	View	1 chunk	+3 lines, -6 lines	0 comments	Download
M	net/third_party/nss/README.chromium	View	2 chunks	+0 lines, -9 lines	0 comments	Download
M	net/third_party/nss/patches/applypatches.sh	View	1 chunk	+0 lines, -4 lines	0 comments	Download
D	net/third_party/nss/patches/encryptedclientcerts.patch	View	1 chunk	+0 lines, -390 lines	0 comments	Download
D	net/third_party/nss/patches/origin_bound_certs.patch	View	1 chunk	+0 lines, -219 lines	0 comments	Download
M	net/third_party/nss/ssl/ssl.h	View	1 chunk	+0 lines, -2 lines	0 comments	Download
M	net/third_party/nss/ssl/ssl3con.c	View	9 chunks	+36 lines, -72 lines	0 comments	Download
M	net/third_party/nss/ssl/ssl3ext.c	View	8 chunks	+1 line, -147 lines	0 comments	Download
M	net/third_party/nss/ssl/sslimpl.h	View	3 chunks	+0 lines, -8 lines	0 comments	Download
M	net/third_party/nss/ssl/sslsock.c	View	5 chunks	+0 lines, -24 lines	0 comments	Download
M	net/third_party/nss/ssl/sslt.h	View	1 chunk	+2 lines, -4 lines	0 comments	Download
M	webkit/blob/blob_data.h	View	3 chunks	+25 lines, -5 lines	0 comments	Download
M	webkit/blob/blob_data.cc	View	2 chunks	+1 line, -32 lines	0 comments	Download
M	webkit/blob/blob_storage_controller.cc	View	1 chunk	+0 lines, -1 line	0 comments	Download
M	webkit/fileapi/file_system_operation_write_unittest.cc	View	1 chunk	+1 line, -0 lines	0 comments	Download

Messages

Total messages: 3 (0 generated)

Expand Messages | Collapse Messages

agl

8 years, 7 months ago (2012-05-25 14:46:43 UTC) #3

On Thu, May 24, 2012 at 1:34 PM,  <wtc@chromium.org> wrote:
> What happened?

I committed what I intended to commit, but git-svn got confused and
updated the git tree with a mess of a commit. I thought that I must
have made a mistake and so reverted the messy commit that git-svn
believed existed. However, I hadn't made a mistake, git-svn had and my
revert actually did mess up the tree. This CL is the drover revert of
the revert to get things back to normal :(


Cheers

AGL

Expand Messages | Collapse Messages