net/data/ssl/scripts/generate-keychain.sh - Issue 2347893002: Revert of CertVerifyProcMac: Add Keychain re-ordering hack, check CRLsets in path pruning loop.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/data/ssl/scripts/generate-keychain.sh

Issue 2347893002: Revert of CertVerifyProcMac: Add Keychain re-ordering hack, check CRLsets in path pruning loop. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: git cl patch is broken so try a manual revert instead Created 4 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « net/data/ssl/certificates/verisign_class3_g5_crosssigned-trusted.keychain ('k') | net/data/ssl/scripts/generate-multi-root-BFE-keychain.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/data/ssl/scripts/generate-keychain.sh

diff --git a/net/data/ssl/scripts/generate-keychain.sh b/net/data/ssl/scripts/generate-keychain.sh

deleted file mode 100755

index 4256cd9c81db227ea627b055cd42dbe334a03d81..0000000000000000000000000000000000000000

--- a/net/data/ssl/scripts/generate-keychain.sh

+++ /dev/null

@@ -1,73 +0,0 @@

-#!/bin/sh

-# Use of this source code is governed by a BSD-style license that can be

-# found in the LICENSE file.

-set -e -x

-SECURITY=/usr/bin/security

-KEYCHAIN="$1"

-shift

-# security create-keychain will interpret a non-absolute path relative to the

-# keychain directory rather than the current directory, and OSX doesn't have a

-# realpath command. Be lazy and make the user pass in an absolute path.

-if [ `echo "$KEYCHAIN" | cut -c1` != '/' ]; then

- echo keychain path must be absolute

- exit 1

-fi

-PASSWORD=aoeu

-# create-keychain modifes the global keychain search list, save it first.

-# (or does it?)

-SAVED_KEYCHAIN_LIST=`$SECURITY list -d user`

-echo "Saved user keychain list:"

-echo "$SAVED_KEYCHAIN_LIST"

-echo

-$SECURITY create-keychain -p "$PASSWORD" "$KEYCHAIN"

-trusted=0

-for cert in "$@"; do

- if [ "$cert" = "--trusted" ]; then

- trusted=1

- continue

- fi

- if [ "$cert" = "--untrusted" ]; then

- trusted=0

- continue

- fi

- # security tool only accepts DER. If input is a PEM, convert it.

- if grep -- "-----BEGIN CERTIFICATE-----" "$cert" ; then

- tmpcert="${cert}.der.tmp"

- openssl x509 -inform PEM -in "$cert" -outform DER -out "$tmpcert"

- cert="$tmpcert"

- fi

- if [ $trusted = 1 ]; then

- $SECURITY add-trusted-cert -r trustAsRoot -k "$KEYCHAIN" "$cert"

- else

- $SECURITY add-certificates -k "$KEYCHAIN" "$cert"

- fi

-done

-#TODO: Would be good to restore the keychain search list on failure too.

-echo "pre-restore user keychain list:"

-$SECURITY list -d user

-# restore the original keychain search list

-/bin/echo -n "${SAVED_KEYCHAIN_LIST}" | xargs $SECURITY list -d user -s

-echo "Restored user keychain list:"

-$SECURITY list -d user

-echo