Imported Upstream version 1.4upstream/1.4

2 files changed, 0 insertions, 199 deletions

diff --git a/src/pkg/crypto/subtle/constant_time.go b/src/pkg/crypto/subtle/constant_time.go
deleted file mode 100644
index 9c4b14a65..000000000
--- a/src/pkg/crypto/subtle/constant_time.go
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package subtle implements functions that are often useful in cryptographic
-// code but require careful thought to use correctly.
-package subtle
-
-// ConstantTimeCompare returns 1 iff the two equal length slices, x
-// and y, have equal contents. The time taken is a function of the length of
-// the slices and is independent of the contents.
-func ConstantTimeCompare(x, y []byte) int {
-	if len(x) != len(y) {
-		panic("subtle: slices have different lengths")
-	}
-
-	var v byte
-
-	for i := 0; i < len(x); i++ {
-		v |= x[i] ^ y[i]
-	}
-
-	return ConstantTimeByteEq(v, 0)
-}
-
-// ConstantTimeSelect returns x if v is 1 and y if v is 0.
-// Its behavior is undefined if v takes any other value.
-func ConstantTimeSelect(v, x, y int) int { return ^(v-1)&x | (v-1)&y }
-
-// ConstantTimeByteEq returns 1 if x == y and 0 otherwise.
-func ConstantTimeByteEq(x, y uint8) int {
-	z := ^(x ^ y)
-	z &= z >> 4
-	z &= z >> 2
-	z &= z >> 1
-
-	return int(z)
-}
-
-// ConstantTimeEq returns 1 if x == y and 0 otherwise.
-func ConstantTimeEq(x, y int32) int {
-	z := ^(x ^ y)
-	z &= z >> 16
-	z &= z >> 8
-	z &= z >> 4
-	z &= z >> 2
-	z &= z >> 1
-
-	return int(z & 1)
-}
-
-// ConstantTimeCopy copies the contents of y into x (a slice of equal length)
-// if v == 1. If v == 0, x is left unchanged. Its behavior is undefined if v
-// takes any other value.
-func ConstantTimeCopy(v int, x, y []byte) {
-	if len(x) != len(y) {
-		panic("subtle: slices have different lengths")
-	}
-
-	xmask := byte(v - 1)
-	ymask := byte(^(v - 1))
-	for i := 0; i < len(x); i++ {
-		x[i] = x[i]&xmask | y[i]&ymask
-	}
-	return
-}
-
-// ConstantTimeLessOrEq returns 1 if x <= y and 0 otherwise.
-// Its behavior is undefined if x or y are negative or > 2**31 - 1.
-func ConstantTimeLessOrEq(x, y int) int {
-	x32 := int32(x)
-	y32 := int32(y)
-	return int(((x32 - y32 - 1) >> 31) & 1)
-}
diff --git a/src/pkg/crypto/subtle/constant_time_test.go b/src/pkg/crypto/subtle/constant_time_test.go
deleted file mode 100644
index d8e321ec0..000000000
--- a/src/pkg/crypto/subtle/constant_time_test.go
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package subtle
-
-import (
-	"testing"
-	"testing/quick"
-)
-
-type TestConstantTimeCompareStruct struct {
-	a, b []byte
-	out  int
-}
-
-var testConstantTimeCompareData = []TestConstantTimeCompareStruct{
-	{[]byte{}, []byte{}, 1},
-	{[]byte{0x11}, []byte{0x11}, 1},
-	{[]byte{0x12}, []byte{0x11}, 0},
-}
-
-func TestConstantTimeCompare(t *testing.T) {
-	for i, test := range testConstantTimeCompareData {
-		if r := ConstantTimeCompare(test.a, test.b); r != test.out {
-			t.Errorf("#%d bad result (got %x, want %x)", i, r, test.out)
-		}
-	}
-}
-
-type TestConstantTimeByteEqStruct struct {
-	a, b uint8
-	out  int
-}
-
-var testConstandTimeByteEqData = []TestConstantTimeByteEqStruct{
-	{0, 0, 1},
-	{0, 1, 0},
-	{1, 0, 0},
-	{0xff, 0xff, 1},
-	{0xff, 0xfe, 0},
-}
-
-func byteEq(a, b uint8) int {
-	if a == b {
-		return 1
-	}
-	return 0
-}
-
-func TestConstantTimeByteEq(t *testing.T) {
-	for i, test := range testConstandTimeByteEqData {
-		if r := ConstantTimeByteEq(test.a, test.b); r != test.out {
-			t.Errorf("#%d bad result (got %x, want %x)", i, r, test.out)
-		}
-	}
-	err := quick.CheckEqual(ConstantTimeByteEq, byteEq, nil)
-	if err != nil {
-		t.Error(err)
-	}
-}
-
-func eq(a, b int32) int {
-	if a == b {
-		return 1
-	}
-	return 0
-}
-
-func TestConstantTimeEq(t *testing.T) {
-	err := quick.CheckEqual(ConstantTimeEq, eq, nil)
-	if err != nil {
-		t.Error(err)
-	}
-}
-
-func makeCopy(v int, x, y []byte) []byte {
-	if len(x) > len(y) {
-		x = x[0:len(y)]
-	} else {
-		y = y[0:len(x)]
-	}
-	if v == 1 {
-		copy(x, y)
-	}
-	return x
-}
-
-func constantTimeCopyWrapper(v int, x, y []byte) []byte {
-	if len(x) > len(y) {
-		x = x[0:len(y)]
-	} else {
-		y = y[0:len(x)]
-	}
-	v &= 1
-	ConstantTimeCopy(v, x, y)
-	return x
-}
-
-func TestConstantTimeCopy(t *testing.T) {
-	err := quick.CheckEqual(constantTimeCopyWrapper, makeCopy, nil)
-	if err != nil {
-		t.Error(err)
-	}
-}
-
-var lessOrEqTests = []struct {
-	x, y, result int
-}{
-	{0, 0, 1},
-	{1, 0, 0},
-	{0, 1, 1},
-	{10, 20, 1},
-	{20, 10, 0},
-	{10, 10, 1},
-}
-
-func TestConstantTimeLessOrEq(t *testing.T) {
-	for i, test := range lessOrEqTests {
-		result := ConstantTimeLessOrEq(test.x, test.y)
-		if result != test.result {
-			t.Errorf("#%d: %d <= %d gave %d, expected %d", i, test.x, test.y, result, test.result)
-		}
-	}
-}