diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-12-17 14:12:04 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-12-17 14:12:04 +0100 |
| commit | 51b821b3fdc5a7eab2369cb6a6680598a6264b08 (patch) | |
| tree | f3608a518bbb9e31b0a42b9a10742fb11ef5b39b /security/nss/fuzz | |
| parent | 8e44bbb43789e585fab9fc1ce8becc94b45d566c (diff) | |
| parent | 680c3eadb6aaec1f3653636db081a519e0f62ef5 (diff) | |
| download | UXP-51b821b3fdc5a7eab2369cb6a6680598a6264b08.tar UXP-51b821b3fdc5a7eab2369cb6a6680598a6264b08.tar.gz UXP-51b821b3fdc5a7eab2369cb6a6680598a6264b08.tar.lz UXP-51b821b3fdc5a7eab2369cb6a6680598a6264b08.tar.xz UXP-51b821b3fdc5a7eab2369cb6a6680598a6264b08.zip | |
Merge branch 'master' into Sync-weave
Diffstat (limited to 'security/nss/fuzz')
| -rw-r--r-- | security/nss/fuzz/config/git-copy.sh | 6 | ||||
| -rw-r--r-- | security/nss/fuzz/tls_server_certs.cc | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/security/nss/fuzz/config/git-copy.sh b/security/nss/fuzz/config/git-copy.sh index a9e817e2a..fac8cbecf 100644 --- a/security/nss/fuzz/config/git-copy.sh +++ b/security/nss/fuzz/config/git-copy.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -set -e +set -ex if [ $# -lt 3 ]; then echo "Usage: $0 <repo> <branch> <directory>" 1>&2 @@ -28,7 +28,7 @@ fi rm -rf "$DIR" git init -q "$DIR" -git -C "$DIR" fetch -q --depth=1 "$REPO" "$COMMIT":git-copy-tmp -git -C "$DIR" reset --hard git-copy-tmp +git -C "$DIR" fetch -q --depth=1 "$REPO" "$COMMIT" +git -C "$DIR" reset -q --hard FETCH_HEAD git -C "$DIR" rev-parse --verify HEAD > "$DIR"/.git-copy rm -rf "$DIR"/.git diff --git a/security/nss/fuzz/tls_server_certs.cc b/security/nss/fuzz/tls_server_certs.cc index 705b6aab3..20732a5e0 100644 --- a/security/nss/fuzz/tls_server_certs.cc +++ b/security/nss/fuzz/tls_server_certs.cc @@ -8,7 +8,7 @@ #include "ssl.h" #include "cpputil.h" -#include "scoped_ptrs.h" +#include "nss_scoped_ptrs.h" #include "tls_server_certs.h" const uint8_t kP256ServerCert[] = { |