http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/868863aa/cli/vendor/golang.org/x/crypto/curve25519/ladderstep_amd64.s
----------------------------------------------------------------------
diff --git a/cli/vendor/golang.org/x/crypto/curve25519/ladderstep_amd64.s 
b/cli/vendor/golang.org/x/crypto/curve25519/ladderstep_amd64.s
deleted file mode 100644
index 3949f9c..0000000
--- a/cli/vendor/golang.org/x/crypto/curve25519/ladderstep_amd64.s
+++ /dev/null
@@ -1,1398 +0,0 @@
-// Copyright 2012 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.
-
-// This code was translated into a form compatible with 6a from the public
-// domain sources in SUPERCOP: http://bench.cr.yp.to/supercop.html
-
-// +build amd64,!gccgo,!appengine
-
-// func ladderstep(inout *[5][5]uint64)
-TEXT ·ladderstep(SB),0,$384-8
-       MOVQ inout+0(FP),DI
-
-       MOVQ SP,R11
-       MOVQ $31,CX
-       NOTQ CX
-       ANDQ CX,SP
-       ADDQ $32,SP
-
-       MOVQ R11,0(SP)
-       MOVQ R12,8(SP)
-       MOVQ R13,16(SP)
-       MOVQ R14,24(SP)
-       MOVQ R15,32(SP)
-       MOVQ BX,40(SP)
-       MOVQ BP,48(SP)
-       MOVQ 40(DI),SI
-       MOVQ 48(DI),DX
-       MOVQ 56(DI),CX
-       MOVQ 64(DI),R8
-       MOVQ 72(DI),R9
-       MOVQ SI,AX
-       MOVQ DX,R10
-       MOVQ CX,R11
-       MOVQ R8,R12
-       MOVQ R9,R13
-       ADDQ ·_2P0(SB),AX
-       ADDQ ·_2P1234(SB),R10
-       ADDQ ·_2P1234(SB),R11
-       ADDQ ·_2P1234(SB),R12
-       ADDQ ·_2P1234(SB),R13
-       ADDQ 80(DI),SI
-       ADDQ 88(DI),DX
-       ADDQ 96(DI),CX
-       ADDQ 104(DI),R8
-       ADDQ 112(DI),R9
-       SUBQ 80(DI),AX
-       SUBQ 88(DI),R10
-       SUBQ 96(DI),R11
-       SUBQ 104(DI),R12
-       SUBQ 112(DI),R13
-       MOVQ SI,56(SP)
-       MOVQ DX,64(SP)
-       MOVQ CX,72(SP)
-       MOVQ R8,80(SP)
-       MOVQ R9,88(SP)
-       MOVQ AX,96(SP)
-       MOVQ R10,104(SP)
-       MOVQ R11,112(SP)
-       MOVQ R12,120(SP)
-       MOVQ R13,128(SP)
-       MOVQ 96(SP),AX
-       MULQ 96(SP)
-       MOVQ AX,SI
-       MOVQ DX,CX
-       MOVQ 96(SP),AX
-       SHLQ $1,AX
-       MULQ 104(SP)
-       MOVQ AX,R8
-       MOVQ DX,R9
-       MOVQ 96(SP),AX
-       SHLQ $1,AX
-       MULQ 112(SP)
-       MOVQ AX,R10
-       MOVQ DX,R11
-       MOVQ 96(SP),AX
-       SHLQ $1,AX
-       MULQ 120(SP)
-       MOVQ AX,R12
-       MOVQ DX,R13
-       MOVQ 96(SP),AX
-       SHLQ $1,AX
-       MULQ 128(SP)
-       MOVQ AX,R14
-       MOVQ DX,R15
-       MOVQ 104(SP),AX
-       MULQ 104(SP)
-       ADDQ AX,R10
-       ADCQ DX,R11
-       MOVQ 104(SP),AX
-       SHLQ $1,AX
-       MULQ 112(SP)
-       ADDQ AX,R12
-       ADCQ DX,R13
-       MOVQ 104(SP),AX
-       SHLQ $1,AX
-       MULQ 120(SP)
-       ADDQ AX,R14
-       ADCQ DX,R15
-       MOVQ 104(SP),DX
-       IMUL3Q $38,DX,AX
-       MULQ 128(SP)
-       ADDQ AX,SI
-       ADCQ DX,CX
-       MOVQ 112(SP),AX
-       MULQ 112(SP)
-       ADDQ AX,R14
-       ADCQ DX,R15
-       MOVQ 112(SP),DX
-       IMUL3Q $38,DX,AX
-       MULQ 120(SP)
-       ADDQ AX,SI
-       ADCQ DX,CX
-       MOVQ 112(SP),DX
-       IMUL3Q $38,DX,AX
-       MULQ 128(SP)
-       ADDQ AX,R8
-       ADCQ DX,R9
-       MOVQ 120(SP),DX
-       IMUL3Q $19,DX,AX
-       MULQ 120(SP)
-       ADDQ AX,R8
-       ADCQ DX,R9
-       MOVQ 120(SP),DX
-       IMUL3Q $38,DX,AX
-       MULQ 128(SP)
-       ADDQ AX,R10
-       ADCQ DX,R11
-       MOVQ 128(SP),DX
-       IMUL3Q $19,DX,AX
-       MULQ 128(SP)
-       ADDQ AX,R12
-       ADCQ DX,R13
-       MOVQ ·REDMASK51(SB),DX
-       SHLQ $13,CX:SI
-       ANDQ DX,SI
-       SHLQ $13,R9:R8
-       ANDQ DX,R8
-       ADDQ CX,R8
-       SHLQ $13,R11:R10
-       ANDQ DX,R10
-       ADDQ R9,R10
-       SHLQ $13,R13:R12
-       ANDQ DX,R12
-       ADDQ R11,R12
-       SHLQ $13,R15:R14
-       ANDQ DX,R14
-       ADDQ R13,R14
-       IMUL3Q $19,R15,CX
-       ADDQ CX,SI
-       MOVQ SI,CX
-       SHRQ $51,CX
-       ADDQ R8,CX
-       ANDQ DX,SI
-       MOVQ CX,R8
-       SHRQ $51,CX
-       ADDQ R10,CX
-       ANDQ DX,R8
-       MOVQ CX,R9
-       SHRQ $51,CX
-       ADDQ R12,CX
-       ANDQ DX,R9
-       MOVQ CX,AX
-       SHRQ $51,CX
-       ADDQ R14,CX
-       ANDQ DX,AX
-       MOVQ CX,R10
-       SHRQ $51,CX
-       IMUL3Q $19,CX,CX
-       ADDQ CX,SI
-       ANDQ DX,R10
-       MOVQ SI,136(SP)
-       MOVQ R8,144(SP)
-       MOVQ R9,152(SP)
-       MOVQ AX,160(SP)
-       MOVQ R10,168(SP)
-       MOVQ 56(SP),AX
-       MULQ 56(SP)
-       MOVQ AX,SI
-       MOVQ DX,CX
-       MOVQ 56(SP),AX
-       SHLQ $1,AX
-       MULQ 64(SP)
-       MOVQ AX,R8
-       MOVQ DX,R9
-       MOVQ 56(SP),AX
-       SHLQ $1,AX
-       MULQ 72(SP)
-       MOVQ AX,R10
-       MOVQ DX,R11
-       MOVQ 56(SP),AX
-       SHLQ $1,AX
-       MULQ 80(SP)
-       MOVQ AX,R12
-       MOVQ DX,R13
-       MOVQ 56(SP),AX
-       SHLQ $1,AX
-       MULQ 88(SP)
-       MOVQ AX,R14
-       MOVQ DX,R15
-       MOVQ 64(SP),AX
-       MULQ 64(SP)
-       ADDQ AX,R10
-       ADCQ DX,R11
-       MOVQ 64(SP),AX
-       SHLQ $1,AX
-       MULQ 72(SP)
-       ADDQ AX,R12
-       ADCQ DX,R13
-       MOVQ 64(SP),AX
-       SHLQ $1,AX
-       MULQ 80(SP)
-       ADDQ AX,R14
-       ADCQ DX,R15
-       MOVQ 64(SP),DX
-       IMUL3Q $38,DX,AX
-       MULQ 88(SP)
-       ADDQ AX,SI
-       ADCQ DX,CX
-       MOVQ 72(SP),AX
-       MULQ 72(SP)
-       ADDQ AX,R14
-       ADCQ DX,R15
-       MOVQ 72(SP),DX
-       IMUL3Q $38,DX,AX
-       MULQ 80(SP)
-       ADDQ AX,SI
-       ADCQ DX,CX
-       MOVQ 72(SP),DX
-       IMUL3Q $38,DX,AX
-       MULQ 88(SP)
-       ADDQ AX,R8
-       ADCQ DX,R9
-       MOVQ 80(SP),DX
-       IMUL3Q $19,DX,AX
-       MULQ 80(SP)
-       ADDQ AX,R8
-       ADCQ DX,R9
-       MOVQ 80(SP),DX
-       IMUL3Q $38,DX,AX
-       MULQ 88(SP)
-       ADDQ AX,R10
-       ADCQ DX,R11
-       MOVQ 88(SP),DX
-       IMUL3Q $19,DX,AX
-       MULQ 88(SP)
-       ADDQ AX,R12
-       ADCQ DX,R13
-       MOVQ ·REDMASK51(SB),DX
-       SHLQ $13,CX:SI
-       ANDQ DX,SI
-       SHLQ $13,R9:R8
-       ANDQ DX,R8
-       ADDQ CX,R8
-       SHLQ $13,R11:R10
-       ANDQ DX,R10
-       ADDQ R9,R10
-       SHLQ $13,R13:R12
-       ANDQ DX,R12
-       ADDQ R11,R12
-       SHLQ $13,R15:R14
-       ANDQ DX,R14
-       ADDQ R13,R14
-       IMUL3Q $19,R15,CX
-       ADDQ CX,SI
-       MOVQ SI,CX
-       SHRQ $51,CX
-       ADDQ R8,CX
-       ANDQ DX,SI
-       MOVQ CX,R8
-       SHRQ $51,CX
-       ADDQ R10,CX
-       ANDQ DX,R8
-       MOVQ CX,R9
-       SHRQ $51,CX
-       ADDQ R12,CX
-       ANDQ DX,R9
-       MOVQ CX,AX
-       SHRQ $51,CX
-       ADDQ R14,CX
-       ANDQ DX,AX
-       MOVQ CX,R10
-       SHRQ $51,CX
-       IMUL3Q $19,CX,CX
-       ADDQ CX,SI
-       ANDQ DX,R10
-       MOVQ SI,176(SP)
-       MOVQ R8,184(SP)
-       MOVQ R9,192(SP)
-       MOVQ AX,200(SP)
-       MOVQ R10,208(SP)
-       MOVQ SI,SI
-       MOVQ R8,DX
-       MOVQ R9,CX
-       MOVQ AX,R8
-       MOVQ R10,R9
-       ADDQ ·_2P0(SB),SI
-       ADDQ ·_2P1234(SB),DX
-       ADDQ ·_2P1234(SB),CX
-       ADDQ ·_2P1234(SB),R8
-       ADDQ ·_2P1234(SB),R9
-       SUBQ 136(SP),SI
-       SUBQ 144(SP),DX
-       SUBQ 152(SP),CX
-       SUBQ 160(SP),R8
-       SUBQ 168(SP),R9
-       MOVQ SI,216(SP)
-       MOVQ DX,224(SP)
-       MOVQ CX,232(SP)
-       MOVQ R8,240(SP)
-       MOVQ R9,248(SP)
-       MOVQ 120(DI),SI
-       MOVQ 128(DI),DX
-       MOVQ 136(DI),CX
-       MOVQ 144(DI),R8
-       MOVQ 152(DI),R9
-       MOVQ SI,AX
-       MOVQ DX,R10
-       MOVQ CX,R11
-       MOVQ R8,R12
-       MOVQ R9,R13
-       ADDQ ·_2P0(SB),AX
-       ADDQ ·_2P1234(SB),R10
-       ADDQ ·_2P1234(SB),R11
-       ADDQ ·_2P1234(SB),R12
-       ADDQ ·_2P1234(SB),R13
-       ADDQ 160(DI),SI
-       ADDQ 168(DI),DX
-       ADDQ 176(DI),CX
-       ADDQ 184(DI),R8
-       ADDQ 192(DI),R9
-       SUBQ 160(DI),AX
-       SUBQ 168(DI),R10
-       SUBQ 176(DI),R11
-       SUBQ 184(DI),R12
-       SUBQ 192(DI),R13
-       MOVQ SI,256(SP)
-       MOVQ DX,264(SP)
-       MOVQ CX,272(SP)
-       MOVQ R8,280(SP)
-       MOVQ R9,288(SP)
-       MOVQ AX,296(SP)
-       MOVQ R10,304(SP)
-       MOVQ R11,312(SP)
-       MOVQ R12,320(SP)
-       MOVQ R13,328(SP)
-       MOVQ 280(SP),SI
-       IMUL3Q $19,SI,AX
-       MOVQ AX,336(SP)
-       MULQ 112(SP)
-       MOVQ AX,SI
-       MOVQ DX,CX
-       MOVQ 288(SP),DX
-       IMUL3Q $19,DX,AX
-       MOVQ AX,344(SP)
-       MULQ 104(SP)
-       ADDQ AX,SI
-       ADCQ DX,CX
-       MOVQ 256(SP),AX
-       MULQ 96(SP)
-       ADDQ AX,SI
-       ADCQ DX,CX
-       MOVQ 256(SP),AX
-       MULQ 104(SP)
-       MOVQ AX,R8
-       MOVQ DX,R9
-       MOVQ 256(SP),AX
-       MULQ 112(SP)
-       MOVQ AX,R10
-       MOVQ DX,R11
-       MOVQ 256(SP),AX
-       MULQ 120(SP)
-       MOVQ AX,R12
-       MOVQ DX,R13
-       MOVQ 256(SP),AX
-       MULQ 128(SP)
-       MOVQ AX,R14
-       MOVQ DX,R15
-       MOVQ 264(SP),AX
-       MULQ 96(SP)
-       ADDQ AX,R8
-       ADCQ DX,R9
-       MOVQ 264(SP),AX
-       MULQ 104(SP)
-       ADDQ AX,R10
-       ADCQ DX,R11
-       MOVQ 264(SP),AX
-       MULQ 112(SP)
-       ADDQ AX,R12
-       ADCQ DX,R13
-       MOVQ 264(SP),AX
-       MULQ 120(SP)
-       ADDQ AX,R14
-       ADCQ DX,R15
-       MOVQ 264(SP),DX
-       IMUL3Q $19,DX,AX
-       MULQ 128(SP)
-       ADDQ AX,SI
-       ADCQ DX,CX
-       MOVQ 272(SP),AX
-       MULQ 96(SP)
-       ADDQ AX,R10
-       ADCQ DX,R11
-       MOVQ 272(SP),AX
-       MULQ 104(SP)
-       ADDQ AX,R12
-       ADCQ DX,R13
-       MOVQ 272(SP),AX
-       MULQ 112(SP)
-       ADDQ AX,R14
-       ADCQ DX,R15
-       MOVQ 272(SP),DX
-       IMUL3Q $19,DX,AX
-       MULQ 120(SP)
-       ADDQ AX,SI
-       ADCQ DX,CX
-       MOVQ 272(SP),DX
-       IMUL3Q $19,DX,AX
-       MULQ 128(SP)
-       ADDQ AX,R8
-       ADCQ DX,R9
-       MOVQ 280(SP),AX
-       MULQ 96(SP)
-       ADDQ AX,R12
-       ADCQ DX,R13
-       MOVQ 280(SP),AX
-       MULQ 104(SP)
-       ADDQ AX,R14
-       ADCQ DX,R15
-       MOVQ 336(SP),AX
-       MULQ 120(SP)
-       ADDQ AX,R8
-       ADCQ DX,R9
-       MOVQ 336(SP),AX
-       MULQ 128(SP)
-       ADDQ AX,R10
-       ADCQ DX,R11
-       MOVQ 288(SP),AX
-       MULQ 96(SP)
-       ADDQ AX,R14
-       ADCQ DX,R15
-       MOVQ 344(SP),AX
-       MULQ 112(SP)
-       ADDQ AX,R8
-       ADCQ DX,R9
-       MOVQ 344(SP),AX
-       MULQ 120(SP)
-       ADDQ AX,R10
-       ADCQ DX,R11
-       MOVQ 344(SP),AX
-       MULQ 128(SP)
-       ADDQ AX,R12
-       ADCQ DX,R13
-       MOVQ ·REDMASK51(SB),DX
-       SHLQ $13,CX:SI
-       ANDQ DX,SI
-       SHLQ $13,R9:R8
-       ANDQ DX,R8
-       ADDQ CX,R8
-       SHLQ $13,R11:R10
-       ANDQ DX,R10
-       ADDQ R9,R10
-       SHLQ $13,R13:R12
-       ANDQ DX,R12
-       ADDQ R11,R12
-       SHLQ $13,R15:R14
-       ANDQ DX,R14
-       ADDQ R13,R14
-       IMUL3Q $19,R15,CX
-       ADDQ CX,SI
-       MOVQ SI,CX
-       SHRQ $51,CX
-       ADDQ R8,CX
-       MOVQ CX,R8
-       SHRQ $51,CX
-       ANDQ DX,SI
-       ADDQ R10,CX
-       MOVQ CX,R9
-       SHRQ $51,CX
-       ANDQ DX,R8
-       ADDQ R12,CX
-       MOVQ CX,AX
-       SHRQ $51,CX
-       ANDQ DX,R9
-       ADDQ R14,CX
-       MOVQ CX,R10
-       SHRQ $51,CX
-       ANDQ DX,AX
-       IMUL3Q $19,CX,CX
-       ADDQ CX,SI
-       ANDQ DX,R10
-       MOVQ SI,96(SP)
-       MOVQ R8,104(SP)
-       MOVQ R9,112(SP)
-       MOVQ AX,120(SP)
-       MOVQ R10,128(SP)
-       MOVQ 320(SP),SI
-       IMUL3Q $19,SI,AX
-       MOVQ AX,256(SP)
-       MULQ 72(SP)
-       MOVQ AX,SI
-       MOVQ DX,CX
-       MOVQ 328(SP),DX
-       IMUL3Q $19,DX,AX
-       MOVQ AX,264(SP)
-       MULQ 64(SP)
-       ADDQ AX,SI
-       ADCQ DX,CX
-       MOVQ 296(SP),AX
-       MULQ 56(SP)
-       ADDQ AX,SI
-       ADCQ DX,CX
-       MOVQ 296(SP),AX
-       MULQ 64(SP)
-       MOVQ AX,R8
-       MOVQ DX,R9
-       MOVQ 296(SP),AX
-       MULQ 72(SP)
-       MOVQ AX,R10
-       MOVQ DX,R11
-       MOVQ 296(SP),AX
-       MULQ 80(SP)
-       MOVQ AX,R12
-       MOVQ DX,R13
-       MOVQ 296(SP),AX
-       MULQ 88(SP)
-       MOVQ AX,R14
-       MOVQ DX,R15
-       MOVQ 304(SP),AX
-       MULQ 56(SP)
-       ADDQ AX,R8
-       ADCQ DX,R9
-       MOVQ 304(SP),AX
-       MULQ 64(SP)
-       ADDQ AX,R10
-       ADCQ DX,R11
-       MOVQ 304(SP),AX
-       MULQ 72(SP)
-       ADDQ AX,R12
-       ADCQ DX,R13
-       MOVQ 304(SP),AX
-       MULQ 80(SP)
-       ADDQ AX,R14
-       ADCQ DX,R15
-       MOVQ 304(SP),DX
-       IMUL3Q $19,DX,AX
-       MULQ 88(SP)
-       ADDQ AX,SI
-       ADCQ DX,CX
-       MOVQ 312(SP),AX
-       MULQ 56(SP)
-       ADDQ AX,R10
-       ADCQ DX,R11
-       MOVQ 312(SP),AX
-       MULQ 64(SP)
-       ADDQ AX,R12
-       ADCQ DX,R13
-       MOVQ 312(SP),AX
-       MULQ 72(SP)
-       ADDQ AX,R14
-       ADCQ DX,R15
-       MOVQ 312(SP),DX
-       IMUL3Q $19,DX,AX
-       MULQ 80(SP)
-       ADDQ AX,SI
-       ADCQ DX,CX
-       MOVQ 312(SP),DX
-       IMUL3Q $19,DX,AX
-       MULQ 88(SP)
-       ADDQ AX,R8
-       ADCQ DX,R9
-       MOVQ 320(SP),AX
-       MULQ 56(SP)
-       ADDQ AX,R12
-       ADCQ DX,R13
-       MOVQ 320(SP),AX
-       MULQ 64(SP)
-       ADDQ AX,R14
-       ADCQ DX,R15
-       MOVQ 256(SP),AX
-       MULQ 80(SP)
-       ADDQ AX,R8
-       ADCQ DX,R9
-       MOVQ 256(SP),AX
-       MULQ 88(SP)
-       ADDQ AX,R10
-       ADCQ DX,R11
-       MOVQ 328(SP),AX
-       MULQ 56(SP)
-       ADDQ AX,R14
-       ADCQ DX,R15
-       MOVQ 264(SP),AX
-       MULQ 72(SP)
-       ADDQ AX,R8
-       ADCQ DX,R9
-       MOVQ 264(SP),AX
-       MULQ 80(SP)
-       ADDQ AX,R10
-       ADCQ DX,R11
-       MOVQ 264(SP),AX
-       MULQ 88(SP)
-       ADDQ AX,R12
-       ADCQ DX,R13
-       MOVQ ·REDMASK51(SB),DX
-       SHLQ $13,CX:SI
-       ANDQ DX,SI
-       SHLQ $13,R9:R8
-       ANDQ DX,R8
-       ADDQ CX,R8
-       SHLQ $13,R11:R10
-       ANDQ DX,R10
-       ADDQ R9,R10
-       SHLQ $13,R13:R12
-       ANDQ DX,R12
-       ADDQ R11,R12
-       SHLQ $13,R15:R14
-       ANDQ DX,R14
-       ADDQ R13,R14
-       IMUL3Q $19,R15,CX
-       ADDQ CX,SI
-       MOVQ SI,CX
-       SHRQ $51,CX
-       ADDQ R8,CX
-       MOVQ CX,R8
-       SHRQ $51,CX
-       ANDQ DX,SI
-       ADDQ R10,CX
-       MOVQ CX,R9
-       SHRQ $51,CX
-       ANDQ DX,R8
-       ADDQ R12,CX
-       MOVQ CX,AX
-       SHRQ $51,CX
-       ANDQ DX,R9
-       ADDQ R14,CX
-       MOVQ CX,R10
-       SHRQ $51,CX
-       ANDQ DX,AX
-       IMUL3Q $19,CX,CX
-       ADDQ CX,SI
-       ANDQ DX,R10
-       MOVQ SI,DX
-       MOVQ R8,CX
-       MOVQ R9,R11
-       MOVQ AX,R12
-       MOVQ R10,R13
-       ADDQ ·_2P0(SB),DX
-       ADDQ ·_2P1234(SB),CX
-       ADDQ ·_2P1234(SB),R11
-       ADDQ ·_2P1234(SB),R12
-       ADDQ ·_2P1234(SB),R13
-       ADDQ 96(SP),SI
-       ADDQ 104(SP),R8
-       ADDQ 112(SP),R9
-       ADDQ 120(SP),AX
-       ADDQ 128(SP),R10
-       SUBQ 96(SP),DX
-       SUBQ 104(SP),CX
-       SUBQ 112(SP),R11
-       SUBQ 120(SP),R12
-       SUBQ 128(SP),R13
-       MOVQ SI,120(DI)
-       MOVQ R8,128(DI)
-       MOVQ R9,136(DI)
-       MOVQ AX,144(DI)
-       MOVQ R10,152(DI)
-       MOVQ DX,160(DI)
-       MOVQ CX,168(DI)
-       MOVQ R11,176(DI)
-       MOVQ R12,184(DI)
-       MOVQ R13,192(DI)
-       MOVQ 120(DI),AX
-       MULQ 120(DI)
-       MOVQ AX,SI
-       MOVQ DX,CX
-       MOVQ 120(DI),AX
-       SHLQ $1,AX
-       MULQ 128(DI)
-       MOVQ AX,R8
-       MOVQ DX,R9
-       MOVQ 120(DI),AX
-       SHLQ $1,AX
-       MULQ 136(DI)
-       MOVQ AX,R10
-       MOVQ DX,R11
-       MOVQ 120(DI),AX
-       SHLQ $1,AX
-       MULQ 144(DI)
-       MOVQ AX,R12
-       MOVQ DX,R13
-       MOVQ 120(DI),AX
-       SHLQ $1,AX
-       MULQ 152(DI)
-       MOVQ AX,R14
-       MOVQ DX,R15
-       MOVQ 128(DI),AX
-       MULQ 128(DI)
-       ADDQ AX,R10
-       ADCQ DX,R11
-       MOVQ 128(DI),AX
-       SHLQ $1,AX
-       MULQ 136(DI)
-       ADDQ AX,R12
-       ADCQ DX,R13
-       MOVQ 128(DI),AX
-       SHLQ $1,AX
-       MULQ 144(DI)
-       ADDQ AX,R14
-       ADCQ DX,R15
-       MOVQ 128(DI),DX
-       IMUL3Q $38,DX,AX
-       MULQ 152(DI)
-       ADDQ AX,SI
-       ADCQ DX,CX
-       MOVQ 136(DI),AX
-       MULQ 136(DI)
-       ADDQ AX,R14
-       ADCQ DX,R15
-       MOVQ 136(DI),DX
-       IMUL3Q $38,DX,AX
-       MULQ 144(DI)
-       ADDQ AX,SI
-       ADCQ DX,CX
-       MOVQ 136(DI),DX
-       IMUL3Q $38,DX,AX
-       MULQ 152(DI)
-       ADDQ AX,R8
-       ADCQ DX,R9
-       MOVQ 144(DI),DX
-       IMUL3Q $19,DX,AX
-       MULQ 144(DI)
-       ADDQ AX,R8
-       ADCQ DX,R9
-       MOVQ 144(DI),DX
-       IMUL3Q $38,DX,AX
-       MULQ 152(DI)
-       ADDQ AX,R10
-       ADCQ DX,R11
-       MOVQ 152(DI),DX
-       IMUL3Q $19,DX,AX
-       MULQ 152(DI)
-       ADDQ AX,R12
-       ADCQ DX,R13
-       MOVQ ·REDMASK51(SB),DX
-       SHLQ $13,CX:SI
-       ANDQ DX,SI
-       SHLQ $13,R9:R8
-       ANDQ DX,R8
-       ADDQ CX,R8
-       SHLQ $13,R11:R10
-       ANDQ DX,R10
-       ADDQ R9,R10
-       SHLQ $13,R13:R12
-       ANDQ DX,R12
-       ADDQ R11,R12
-       SHLQ $13,R15:R14
-       ANDQ DX,R14
-       ADDQ R13,R14
-       IMUL3Q $19,R15,CX
-       ADDQ CX,SI
-       MOVQ SI,CX
-       SHRQ $51,CX
-       ADDQ R8,CX
-       ANDQ DX,SI
-       MOVQ CX,R8
-       SHRQ $51,CX
-       ADDQ R10,CX
-       ANDQ DX,R8
-       MOVQ CX,R9
-       SHRQ $51,CX
-       ADDQ R12,CX
-       ANDQ DX,R9
-       MOVQ CX,AX
-       SHRQ $51,CX
-       ADDQ R14,CX
-       ANDQ DX,AX
-       MOVQ CX,R10
-       SHRQ $51,CX
-       IMUL3Q $19,CX,CX
-       ADDQ CX,SI
-       ANDQ DX,R10
-       MOVQ SI,120(DI)
-       MOVQ R8,128(DI)
-       MOVQ R9,136(DI)
-       MOVQ AX,144(DI)
-       MOVQ R10,152(DI)
-       MOVQ 160(DI),AX
-       MULQ 160(DI)
-       MOVQ AX,SI
-       MOVQ DX,CX
-       MOVQ 160(DI),AX
-       SHLQ $1,AX
-       MULQ 168(DI)
-       MOVQ AX,R8
-       MOVQ DX,R9
-       MOVQ 160(DI),AX
-       SHLQ $1,AX
-       MULQ 176(DI)
-       MOVQ AX,R10
-       MOVQ DX,R11
-       MOVQ 160(DI),AX
-       SHLQ $1,AX
-       MULQ 184(DI)
-       MOVQ AX,R12
-       MOVQ DX,R13
-       MOVQ 160(DI),AX
-       SHLQ $1,AX
-       MULQ 192(DI)
-       MOVQ AX,R14
-       MOVQ DX,R15
-       MOVQ 168(DI),AX
-       MULQ 168(DI)
-       ADDQ AX,R10
-       ADCQ DX,R11
-       MOVQ 168(DI),AX
-       SHLQ $1,AX
-       MULQ 176(DI)
-       ADDQ AX,R12
-       ADCQ DX,R13
-       MOVQ 168(DI),AX
-       SHLQ $1,AX
-       MULQ 184(DI)
-       ADDQ AX,R14
-       ADCQ DX,R15
-       MOVQ 168(DI),DX
-       IMUL3Q $38,DX,AX
-       MULQ 192(DI)
-       ADDQ AX,SI
-       ADCQ DX,CX
-       MOVQ 176(DI),AX
-       MULQ 176(DI)
-       ADDQ AX,R14
-       ADCQ DX,R15
-       MOVQ 176(DI),DX
-       IMUL3Q $38,DX,AX
-       MULQ 184(DI)
-       ADDQ AX,SI
-       ADCQ DX,CX
-       MOVQ 176(DI),DX
-       IMUL3Q $38,DX,AX
-       MULQ 192(DI)
-       ADDQ AX,R8
-       ADCQ DX,R9
-       MOVQ 184(DI),DX
-       IMUL3Q $19,DX,AX
-       MULQ 184(DI)
-       ADDQ AX,R8
-       ADCQ DX,R9
-       MOVQ 184(DI),DX
-       IMUL3Q $38,DX,AX
-       MULQ 192(DI)
-       ADDQ AX,R10
-       ADCQ DX,R11
-       MOVQ 192(DI),DX
-       IMUL3Q $19,DX,AX
-       MULQ 192(DI)
-       ADDQ AX,R12
-       ADCQ DX,R13
-       MOVQ ·REDMASK51(SB),DX
-       SHLQ $13,CX:SI
-       ANDQ DX,SI
-       SHLQ $13,R9:R8
-       ANDQ DX,R8
-       ADDQ CX,R8
-       SHLQ $13,R11:R10
-       ANDQ DX,R10
-       ADDQ R9,R10
-       SHLQ $13,R13:R12
-       ANDQ DX,R12
-       ADDQ R11,R12
-       SHLQ $13,R15:R14
-       ANDQ DX,R14
-       ADDQ R13,R14
-       IMUL3Q $19,R15,CX
-       ADDQ CX,SI
-       MOVQ SI,CX
-       SHRQ $51,CX
-       ADDQ R8,CX
-       ANDQ DX,SI
-       MOVQ CX,R8
-       SHRQ $51,CX
-       ADDQ R10,CX
-       ANDQ DX,R8
-       MOVQ CX,R9
-       SHRQ $51,CX
-       ADDQ R12,CX
-       ANDQ DX,R9
-       MOVQ CX,AX
-       SHRQ $51,CX
-       ADDQ R14,CX
-       ANDQ DX,AX
-       MOVQ CX,R10
-       SHRQ $51,CX
-       IMUL3Q $19,CX,CX
-       ADDQ CX,SI
-       ANDQ DX,R10
-       MOVQ SI,160(DI)
-       MOVQ R8,168(DI)
-       MOVQ R9,176(DI)
-       MOVQ AX,184(DI)
-       MOVQ R10,192(DI)
-       MOVQ 184(DI),SI
-       IMUL3Q $19,SI,AX
-       MOVQ AX,56(SP)
-       MULQ 16(DI)
-       MOVQ AX,SI
-       MOVQ DX,CX
-       MOVQ 192(DI),DX
-       IMUL3Q $19,DX,AX
-       MOVQ AX,64(SP)
-       MULQ 8(DI)
-       ADDQ AX,SI
-       ADCQ DX,CX
-       MOVQ 160(DI),AX
-       MULQ 0(DI)
-       ADDQ AX,SI
-       ADCQ DX,CX
-       MOVQ 160(DI),AX
-       MULQ 8(DI)
-       MOVQ AX,R8
-       MOVQ DX,R9
-       MOVQ 160(DI),AX
-       MULQ 16(DI)
-       MOVQ AX,R10
-       MOVQ DX,R11
-       MOVQ 160(DI),AX
-       MULQ 24(DI)
-       MOVQ AX,R12
-       MOVQ DX,R13
-       MOVQ 160(DI),AX
-       MULQ 32(DI)
-       MOVQ AX,R14
-       MOVQ DX,R15
-       MOVQ 168(DI),AX
-       MULQ 0(DI)
-       ADDQ AX,R8
-       ADCQ DX,R9
-       MOVQ 168(DI),AX
-       MULQ 8(DI)
-       ADDQ AX,R10
-       ADCQ DX,R11
-       MOVQ 168(DI),AX
-       MULQ 16(DI)
-       ADDQ AX,R12
-       ADCQ DX,R13
-       MOVQ 168(DI),AX
-       MULQ 24(DI)
-       ADDQ AX,R14
-       ADCQ DX,R15
-       MOVQ 168(DI),DX
-       IMUL3Q $19,DX,AX
-       MULQ 32(DI)
-       ADDQ AX,SI
-       ADCQ DX,CX
-       MOVQ 176(DI),AX
-       MULQ 0(DI)
-       ADDQ AX,R10
-       ADCQ DX,R11
-       MOVQ 176(DI),AX
-       MULQ 8(DI)
-       ADDQ AX,R12
-       ADCQ DX,R13
-       MOVQ 176(DI),AX
-       MULQ 16(DI)
-       ADDQ AX,R14
-       ADCQ DX,R15
-       MOVQ 176(DI),DX
-       IMUL3Q $19,DX,AX
-       MULQ 24(DI)
-       ADDQ AX,SI
-       ADCQ DX,CX
-       MOVQ 176(DI),DX
-       IMUL3Q $19,DX,AX
-       MULQ 32(DI)
-       ADDQ AX,R8
-       ADCQ DX,R9
-       MOVQ 184(DI),AX
-       MULQ 0(DI)
-       ADDQ AX,R12
-       ADCQ DX,R13
-       MOVQ 184(DI),AX
-       MULQ 8(DI)
-       ADDQ AX,R14
-       ADCQ DX,R15
-       MOVQ 56(SP),AX
-       MULQ 24(DI)
-       ADDQ AX,R8
-       ADCQ DX,R9
-       MOVQ 56(SP),AX
-       MULQ 32(DI)
-       ADDQ AX,R10
-       ADCQ DX,R11
-       MOVQ 192(DI),AX
-       MULQ 0(DI)
-       ADDQ AX,R14
-       ADCQ DX,R15
-       MOVQ 64(SP),AX
-       MULQ 16(DI)
-       ADDQ AX,R8
-       ADCQ DX,R9
-       MOVQ 64(SP),AX
-       MULQ 24(DI)
-       ADDQ AX,R10
-       ADCQ DX,R11
-       MOVQ 64(SP),AX
-       MULQ 32(DI)
-       ADDQ AX,R12
-       ADCQ DX,R13
-       MOVQ ·REDMASK51(SB),DX
-       SHLQ $13,CX:SI
-       ANDQ DX,SI
-       SHLQ $13,R9:R8
-       ANDQ DX,R8
-       ADDQ CX,R8
-       SHLQ $13,R11:R10
-       ANDQ DX,R10
-       ADDQ R9,R10
-       SHLQ $13,R13:R12
-       ANDQ DX,R12
-       ADDQ R11,R12
-       SHLQ $13,R15:R14
-       ANDQ DX,R14
-       ADDQ R13,R14
-       IMUL3Q $19,R15,CX
-       ADDQ CX,SI
-       MOVQ SI,CX
-       SHRQ $51,CX
-       ADDQ R8,CX
-       MOVQ CX,R8
-       SHRQ $51,CX
-       ANDQ DX,SI
-       ADDQ R10,CX
-       MOVQ CX,R9
-       SHRQ $51,CX
-       ANDQ DX,R8
-       ADDQ R12,CX
-       MOVQ CX,AX
-       SHRQ $51,CX
-       ANDQ DX,R9
-       ADDQ R14,CX
-       MOVQ CX,R10
-       SHRQ $51,CX
-       ANDQ DX,AX
-       IMUL3Q $19,CX,CX
-       ADDQ CX,SI
-       ANDQ DX,R10
-       MOVQ SI,160(DI)
-       MOVQ R8,168(DI)
-       MOVQ R9,176(DI)
-       MOVQ AX,184(DI)
-       MOVQ R10,192(DI)
-       MOVQ 200(SP),SI
-       IMUL3Q $19,SI,AX
-       MOVQ AX,56(SP)
-       MULQ 152(SP)
-       MOVQ AX,SI
-       MOVQ DX,CX
-       MOVQ 208(SP),DX
-       IMUL3Q $19,DX,AX
-       MOVQ AX,64(SP)
-       MULQ 144(SP)
-       ADDQ AX,SI
-       ADCQ DX,CX
-       MOVQ 176(SP),AX
-       MULQ 136(SP)
-       ADDQ AX,SI
-       ADCQ DX,CX
-       MOVQ 176(SP),AX
-       MULQ 144(SP)
-       MOVQ AX,R8
-       MOVQ DX,R9
-       MOVQ 176(SP),AX
-       MULQ 152(SP)
-       MOVQ AX,R10
-       MOVQ DX,R11
-       MOVQ 176(SP),AX
-       MULQ 160(SP)
-       MOVQ AX,R12
-       MOVQ DX,R13
-       MOVQ 176(SP),AX
-       MULQ 168(SP)
-       MOVQ AX,R14
-       MOVQ DX,R15
-       MOVQ 184(SP),AX
-       MULQ 136(SP)
-       ADDQ AX,R8
-       ADCQ DX,R9
-       MOVQ 184(SP),AX
-       MULQ 144(SP)
-       ADDQ AX,R10
-       ADCQ DX,R11
-       MOVQ 184(SP),AX
-       MULQ 152(SP)
-       ADDQ AX,R12
-       ADCQ DX,R13
-       MOVQ 184(SP),AX
-       MULQ 160(SP)
-       ADDQ AX,R14
-       ADCQ DX,R15
-       MOVQ 184(SP),DX
-       IMUL3Q $19,DX,AX
-       MULQ 168(SP)
-       ADDQ AX,SI
-       ADCQ DX,CX
-       MOVQ 192(SP),AX
-       MULQ 136(SP)
-       ADDQ AX,R10
-       ADCQ DX,R11
-       MOVQ 192(SP),AX
-       MULQ 144(SP)
-       ADDQ AX,R12
-       ADCQ DX,R13
-       MOVQ 192(SP),AX
-       MULQ 152(SP)
-       ADDQ AX,R14
-       ADCQ DX,R15
-       MOVQ 192(SP),DX
-       IMUL3Q $19,DX,AX
-       MULQ 160(SP)
-       ADDQ AX,SI
-       ADCQ DX,CX
-       MOVQ 192(SP),DX
-       IMUL3Q $19,DX,AX
-       MULQ 168(SP)
-       ADDQ AX,R8
-       ADCQ DX,R9
-       MOVQ 200(SP),AX
-       MULQ 136(SP)
-       ADDQ AX,R12
-       ADCQ DX,R13
-       MOVQ 200(SP),AX
-       MULQ 144(SP)
-       ADDQ AX,R14
-       ADCQ DX,R15
-       MOVQ 56(SP),AX
-       MULQ 160(SP)
-       ADDQ AX,R8
-       ADCQ DX,R9
-       MOVQ 56(SP),AX
-       MULQ 168(SP)
-       ADDQ AX,R10
-       ADCQ DX,R11
-       MOVQ 208(SP),AX
-       MULQ 136(SP)
-       ADDQ AX,R14
-       ADCQ DX,R15
-       MOVQ 64(SP),AX
-       MULQ 152(SP)
-       ADDQ AX,R8
-       ADCQ DX,R9
-       MOVQ 64(SP),AX
-       MULQ 160(SP)
-       ADDQ AX,R10
-       ADCQ DX,R11
-       MOVQ 64(SP),AX
-       MULQ 168(SP)
-       ADDQ AX,R12
-       ADCQ DX,R13
-       MOVQ ·REDMASK51(SB),DX
-       SHLQ $13,CX:SI
-       ANDQ DX,SI
-       SHLQ $13,R9:R8
-       ANDQ DX,R8
-       ADDQ CX,R8
-       SHLQ $13,R11:R10
-       ANDQ DX,R10
-       ADDQ R9,R10
-       SHLQ $13,R13:R12
-       ANDQ DX,R12
-       ADDQ R11,R12
-       SHLQ $13,R15:R14
-       ANDQ DX,R14
-       ADDQ R13,R14
-       IMUL3Q $19,R15,CX
-       ADDQ CX,SI
-       MOVQ SI,CX
-       SHRQ $51,CX
-       ADDQ R8,CX
-       MOVQ CX,R8
-       SHRQ $51,CX
-       ANDQ DX,SI
-       ADDQ R10,CX
-       MOVQ CX,R9
-       SHRQ $51,CX
-       ANDQ DX,R8
-       ADDQ R12,CX
-       MOVQ CX,AX
-       SHRQ $51,CX
-       ANDQ DX,R9
-       ADDQ R14,CX
-       MOVQ CX,R10
-       SHRQ $51,CX
-       ANDQ DX,AX
-       IMUL3Q $19,CX,CX
-       ADDQ CX,SI
-       ANDQ DX,R10
-       MOVQ SI,40(DI)
-       MOVQ R8,48(DI)
-       MOVQ R9,56(DI)
-       MOVQ AX,64(DI)
-       MOVQ R10,72(DI)
-       MOVQ 216(SP),AX
-       MULQ ·_121666_213(SB)
-       SHRQ $13,AX
-       MOVQ AX,SI
-       MOVQ DX,CX
-       MOVQ 224(SP),AX
-       MULQ ·_121666_213(SB)
-       SHRQ $13,AX
-       ADDQ AX,CX
-       MOVQ DX,R8
-       MOVQ 232(SP),AX
-       MULQ ·_121666_213(SB)
-       SHRQ $13,AX
-       ADDQ AX,R8
-       MOVQ DX,R9
-       MOVQ 240(SP),AX
-       MULQ ·_121666_213(SB)
-       SHRQ $13,AX
-       ADDQ AX,R9
-       MOVQ DX,R10
-       MOVQ 248(SP),AX
-       MULQ ·_121666_213(SB)
-       SHRQ $13,AX
-       ADDQ AX,R10
-       IMUL3Q $19,DX,DX
-       ADDQ DX,SI
-       ADDQ 136(SP),SI
-       ADDQ 144(SP),CX
-       ADDQ 152(SP),R8
-       ADDQ 160(SP),R9
-       ADDQ 168(SP),R10
-       MOVQ SI,80(DI)
-       MOVQ CX,88(DI)
-       MOVQ R8,96(DI)
-       MOVQ R9,104(DI)
-       MOVQ R10,112(DI)
-       MOVQ 104(DI),SI
-       IMUL3Q $19,SI,AX
-       MOVQ AX,56(SP)
-       MULQ 232(SP)
-       MOVQ AX,SI
-       MOVQ DX,CX
-       MOVQ 112(DI),DX
-       IMUL3Q $19,DX,AX
-       MOVQ AX,64(SP)
-       MULQ 224(SP)
-       ADDQ AX,SI
-       ADCQ DX,CX
-       MOVQ 80(DI),AX
-       MULQ 216(SP)
-       ADDQ AX,SI
-       ADCQ DX,CX
-       MOVQ 80(DI),AX
-       MULQ 224(SP)
-       MOVQ AX,R8
-       MOVQ DX,R9
-       MOVQ 80(DI),AX
-       MULQ 232(SP)
-       MOVQ AX,R10
-       MOVQ DX,R11
-       MOVQ 80(DI),AX
-       MULQ 240(SP)
-       MOVQ AX,R12
-       MOVQ DX,R13
-       MOVQ 80(DI),AX
-       MULQ 248(SP)
-       MOVQ AX,R14
-       MOVQ DX,R15
-       MOVQ 88(DI),AX
-       MULQ 216(SP)
-       ADDQ AX,R8
-       ADCQ DX,R9
-       MOVQ 88(DI),AX
-       MULQ 224(SP)
-       ADDQ AX,R10
-       ADCQ DX,R11
-       MOVQ 88(DI),AX
-       MULQ 232(SP)
-       ADDQ AX,R12
-       ADCQ DX,R13
-       MOVQ 88(DI),AX
-       MULQ 240(SP)
-       ADDQ AX,R14
-       ADCQ DX,R15
-       MOVQ 88(DI),DX
-       IMUL3Q $19,DX,AX
-       MULQ 248(SP)
-       ADDQ AX,SI
-       ADCQ DX,CX
-       MOVQ 96(DI),AX
-       MULQ 216(SP)
-       ADDQ AX,R10
-       ADCQ DX,R11
-       MOVQ 96(DI),AX
-       MULQ 224(SP)
-       ADDQ AX,R12
-       ADCQ DX,R13
-       MOVQ 96(DI),AX
-       MULQ 232(SP)
-       ADDQ AX,R14
-       ADCQ DX,R15
-       MOVQ 96(DI),DX
-       IMUL3Q $19,DX,AX
-       MULQ 240(SP)
-       ADDQ AX,SI
-       ADCQ DX,CX
-       MOVQ 96(DI),DX
-       IMUL3Q $19,DX,AX
-       MULQ 248(SP)
-       ADDQ AX,R8
-       ADCQ DX,R9
-       MOVQ 104(DI),AX
-       MULQ 216(SP)
-       ADDQ AX,R12
-       ADCQ DX,R13
-       MOVQ 104(DI),AX
-       MULQ 224(SP)
-       ADDQ AX,R14
-       ADCQ DX,R15
-       MOVQ 56(SP),AX
-       MULQ 240(SP)
-       ADDQ AX,R8
-       ADCQ DX,R9
-       MOVQ 56(SP),AX
-       MULQ 248(SP)
-       ADDQ AX,R10
-       ADCQ DX,R11
-       MOVQ 112(DI),AX
-       MULQ 216(SP)
-       ADDQ AX,R14
-       ADCQ DX,R15
-       MOVQ 64(SP),AX
-       MULQ 232(SP)
-       ADDQ AX,R8
-       ADCQ DX,R9
-       MOVQ 64(SP),AX
-       MULQ 240(SP)
-       ADDQ AX,R10
-       ADCQ DX,R11
-       MOVQ 64(SP),AX
-       MULQ 248(SP)
-       ADDQ AX,R12
-       ADCQ DX,R13
-       MOVQ ·REDMASK51(SB),DX
-       SHLQ $13,CX:SI
-       ANDQ DX,SI
-       SHLQ $13,R9:R8
-       ANDQ DX,R8
-       ADDQ CX,R8
-       SHLQ $13,R11:R10
-       ANDQ DX,R10
-       ADDQ R9,R10
-       SHLQ $13,R13:R12
-       ANDQ DX,R12
-       ADDQ R11,R12
-       SHLQ $13,R15:R14
-       ANDQ DX,R14
-       ADDQ R13,R14
-       IMUL3Q $19,R15,CX
-       ADDQ CX,SI
-       MOVQ SI,CX
-       SHRQ $51,CX
-       ADDQ R8,CX
-       MOVQ CX,R8
-       SHRQ $51,CX
-       ANDQ DX,SI
-       ADDQ R10,CX
-       MOVQ CX,R9
-       SHRQ $51,CX
-       ANDQ DX,R8
-       ADDQ R12,CX
-       MOVQ CX,AX
-       SHRQ $51,CX
-       ANDQ DX,R9
-       ADDQ R14,CX
-       MOVQ CX,R10
-       SHRQ $51,CX
-       ANDQ DX,AX
-       IMUL3Q $19,CX,CX
-       ADDQ CX,SI
-       ANDQ DX,R10
-       MOVQ SI,80(DI)
-       MOVQ R8,88(DI)
-       MOVQ R9,96(DI)
-       MOVQ AX,104(DI)
-       MOVQ R10,112(DI)
-       MOVQ 0(SP),R11
-       MOVQ 8(SP),R12
-       MOVQ 16(SP),R13
-       MOVQ 24(SP),R14
-       MOVQ 32(SP),R15
-       MOVQ 40(SP),BX
-       MOVQ 48(SP),BP
-       MOVQ R11,SP
-       MOVQ DI,AX
-       MOVQ SI,DX
-       RET

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/868863aa/cli/vendor/golang.org/x/crypto/curve25519/mont25519_amd64.go
----------------------------------------------------------------------
diff --git a/cli/vendor/golang.org/x/crypto/curve25519/mont25519_amd64.go 
b/cli/vendor/golang.org/x/crypto/curve25519/mont25519_amd64.go
deleted file mode 100644
index 5822bd5..0000000
--- a/cli/vendor/golang.org/x/crypto/curve25519/mont25519_amd64.go
+++ /dev/null
@@ -1,240 +0,0 @@
-// Copyright 2012 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.
-
-// +build amd64,!gccgo,!appengine
-
-package curve25519
-
-// These functions are implemented in the .s files. The names of the functions
-// in the rest of the file are also taken from the SUPERCOP sources to help
-// people following along.
-
-//go:noescape
-
-func cswap(inout *[5]uint64, v uint64)
-
-//go:noescape
-
-func ladderstep(inout *[5][5]uint64)
-
-//go:noescape
-
-func freeze(inout *[5]uint64)
-
-//go:noescape
-
-func mul(dest, a, b *[5]uint64)
-
-//go:noescape
-
-func square(out, in *[5]uint64)
-
-// mladder uses a Montgomery ladder to calculate (xr/zr) *= s.
-func mladder(xr, zr *[5]uint64, s *[32]byte) {
-       var work [5][5]uint64
-
-       work[0] = *xr
-       setint(&work[1], 1)
-       setint(&work[2], 0)
-       work[3] = *xr
-       setint(&work[4], 1)
-
-       j := uint(6)
-       var prevbit byte
-
-       for i := 31; i >= 0; i-- {
-               for j < 8 {
-                       bit := ((*s)[i] >> j) & 1
-                       swap := bit ^ prevbit
-                       prevbit = bit
-                       cswap(&work[1], uint64(swap))
-                       ladderstep(&work)
-                       j--
-               }
-               j = 7
-       }
-
-       *xr = work[1]
-       *zr = work[2]
-}
-
-func scalarMult(out, in, base *[32]byte) {
-       var e [32]byte
-       copy(e[:], (*in)[:])
-       e[0] &= 248
-       e[31] &= 127
-       e[31] |= 64
-
-       var t, z [5]uint64
-       unpack(&t, base)
-       mladder(&t, &z, &e)
-       invert(&z, &z)
-       mul(&t, &t, &z)
-       pack(out, &t)
-}
-
-func setint(r *[5]uint64, v uint64) {
-       r[0] = v
-       r[1] = 0
-       r[2] = 0
-       r[3] = 0
-       r[4] = 0
-}
-
-// unpack sets r = x where r consists of 5, 51-bit limbs in little-endian
-// order.
-func unpack(r *[5]uint64, x *[32]byte) {
-       r[0] = uint64(x[0]) |
-               uint64(x[1])<<8 |
-               uint64(x[2])<<16 |
-               uint64(x[3])<<24 |
-               uint64(x[4])<<32 |
-               uint64(x[5])<<40 |
-               uint64(x[6]&7)<<48
-
-       r[1] = uint64(x[6])>>3 |
-               uint64(x[7])<<5 |
-               uint64(x[8])<<13 |
-               uint64(x[9])<<21 |
-               uint64(x[10])<<29 |
-               uint64(x[11])<<37 |
-               uint64(x[12]&63)<<45
-
-       r[2] = uint64(x[12])>>6 |
-               uint64(x[13])<<2 |
-               uint64(x[14])<<10 |
-               uint64(x[15])<<18 |
-               uint64(x[16])<<26 |
-               uint64(x[17])<<34 |
-               uint64(x[18])<<42 |
-               uint64(x[19]&1)<<50
-
-       r[3] = uint64(x[19])>>1 |
-               uint64(x[20])<<7 |
-               uint64(x[21])<<15 |
-               uint64(x[22])<<23 |
-               uint64(x[23])<<31 |
-               uint64(x[24])<<39 |
-               uint64(x[25]&15)<<47
-
-       r[4] = uint64(x[25])>>4 |
-               uint64(x[26])<<4 |
-               uint64(x[27])<<12 |
-               uint64(x[28])<<20 |
-               uint64(x[29])<<28 |
-               uint64(x[30])<<36 |
-               uint64(x[31]&127)<<44
-}
-
-// pack sets out = x where out is the usual, little-endian form of the 5,
-// 51-bit limbs in x.
-func pack(out *[32]byte, x *[5]uint64) {
-       t := *x
-       freeze(&t)
-
-       out[0] = byte(t[0])
-       out[1] = byte(t[0] >> 8)
-       out[2] = byte(t[0] >> 16)
-       out[3] = byte(t[0] >> 24)
-       out[4] = byte(t[0] >> 32)
-       out[5] = byte(t[0] >> 40)
-       out[6] = byte(t[0] >> 48)
-
-       out[6] ^= byte(t[1]<<3) & 0xf8
-       out[7] = byte(t[1] >> 5)
-       out[8] = byte(t[1] >> 13)
-       out[9] = byte(t[1] >> 21)
-       out[10] = byte(t[1] >> 29)
-       out[11] = byte(t[1] >> 37)
-       out[12] = byte(t[1] >> 45)
-
-       out[12] ^= byte(t[2]<<6) & 0xc0
-       out[13] = byte(t[2] >> 2)
-       out[14] = byte(t[2] >> 10)
-       out[15] = byte(t[2] >> 18)
-       out[16] = byte(t[2] >> 26)
-       out[17] = byte(t[2] >> 34)
-       out[18] = byte(t[2] >> 42)
-       out[19] = byte(t[2] >> 50)
-
-       out[19] ^= byte(t[3]<<1) & 0xfe
-       out[20] = byte(t[3] >> 7)
-       out[21] = byte(t[3] >> 15)
-       out[22] = byte(t[3] >> 23)
-       out[23] = byte(t[3] >> 31)
-       out[24] = byte(t[3] >> 39)
-       out[25] = byte(t[3] >> 47)
-
-       out[25] ^= byte(t[4]<<4) & 0xf0
-       out[26] = byte(t[4] >> 4)
-       out[27] = byte(t[4] >> 12)
-       out[28] = byte(t[4] >> 20)
-       out[29] = byte(t[4] >> 28)
-       out[30] = byte(t[4] >> 36)
-       out[31] = byte(t[4] >> 44)
-}
-
-// invert calculates r = x^-1 mod p using Fermat's little theorem.
-func invert(r *[5]uint64, x *[5]uint64) {
-       var z2, z9, z11, z2_5_0, z2_10_0, z2_20_0, z2_50_0, z2_100_0, t 
[5]uint64
-
-       square(&z2, x)        /* 2 */
-       square(&t, &z2)       /* 4 */
-       square(&t, &t)        /* 8 */
-       mul(&z9, &t, x)       /* 9 */
-       mul(&z11, &z9, &z2)   /* 11 */
-       square(&t, &z11)      /* 22 */
-       mul(&z2_5_0, &t, &z9) /* 2^5 - 2^0 = 31 */
-
-       square(&t, &z2_5_0)      /* 2^6 - 2^1 */
-       for i := 1; i < 5; i++ { /* 2^20 - 2^10 */
-               square(&t, &t)
-       }
-       mul(&z2_10_0, &t, &z2_5_0) /* 2^10 - 2^0 */
-
-       square(&t, &z2_10_0)      /* 2^11 - 2^1 */
-       for i := 1; i < 10; i++ { /* 2^20 - 2^10 */
-               square(&t, &t)
-       }
-       mul(&z2_20_0, &t, &z2_10_0) /* 2^20 - 2^0 */
-
-       square(&t, &z2_20_0)      /* 2^21 - 2^1 */
-       for i := 1; i < 20; i++ { /* 2^40 - 2^20 */
-               square(&t, &t)
-       }
-       mul(&t, &t, &z2_20_0) /* 2^40 - 2^0 */
-
-       square(&t, &t)            /* 2^41 - 2^1 */
-       for i := 1; i < 10; i++ { /* 2^50 - 2^10 */
-               square(&t, &t)
-       }
-       mul(&z2_50_0, &t, &z2_10_0) /* 2^50 - 2^0 */
-
-       square(&t, &z2_50_0)      /* 2^51 - 2^1 */
-       for i := 1; i < 50; i++ { /* 2^100 - 2^50 */
-               square(&t, &t)
-       }
-       mul(&z2_100_0, &t, &z2_50_0) /* 2^100 - 2^0 */
-
-       square(&t, &z2_100_0)      /* 2^101 - 2^1 */
-       for i := 1; i < 100; i++ { /* 2^200 - 2^100 */
-               square(&t, &t)
-       }
-       mul(&t, &t, &z2_100_0) /* 2^200 - 2^0 */
-
-       square(&t, &t)            /* 2^201 - 2^1 */
-       for i := 1; i < 50; i++ { /* 2^250 - 2^50 */
-               square(&t, &t)
-       }
-       mul(&t, &t, &z2_50_0) /* 2^250 - 2^0 */
-
-       square(&t, &t) /* 2^251 - 2^1 */
-       square(&t, &t) /* 2^252 - 2^2 */
-       square(&t, &t) /* 2^253 - 2^3 */
-
-       square(&t, &t) /* 2^254 - 2^4 */
-
-       square(&t, &t)   /* 2^255 - 2^5 */
-       mul(r, &t, &z11) /* 2^255 - 21 */
-}

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/868863aa/cli/vendor/golang.org/x/crypto/curve25519/mul_amd64.s
----------------------------------------------------------------------
diff --git a/cli/vendor/golang.org/x/crypto/curve25519/mul_amd64.s 
b/cli/vendor/golang.org/x/crypto/curve25519/mul_amd64.s
deleted file mode 100644
index e48d183..0000000
--- a/cli/vendor/golang.org/x/crypto/curve25519/mul_amd64.s
+++ /dev/null
@@ -1,191 +0,0 @@
-// Copyright 2012 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.
-
-// This code was translated into a form compatible with 6a from the public
-// domain sources in SUPERCOP: http://bench.cr.yp.to/supercop.html
-
-// +build amd64,!gccgo,!appengine
-
-// func mul(dest, a, b *[5]uint64)
-TEXT ·mul(SB),0,$128-24
-       MOVQ dest+0(FP), DI
-       MOVQ a+8(FP), SI
-       MOVQ b+16(FP), DX
-
-       MOVQ SP,R11
-       MOVQ $31,CX
-       NOTQ CX
-       ANDQ CX,SP
-       ADDQ $32,SP
-
-       MOVQ R11,0(SP)
-       MOVQ R12,8(SP)
-       MOVQ R13,16(SP)
-       MOVQ R14,24(SP)
-       MOVQ R15,32(SP)
-       MOVQ BX,40(SP)
-       MOVQ BP,48(SP)
-       MOVQ DI,56(SP)
-       MOVQ DX,CX
-       MOVQ 24(SI),DX
-       IMUL3Q $19,DX,AX
-       MOVQ AX,64(SP)
-       MULQ 16(CX)
-       MOVQ AX,R8
-       MOVQ DX,R9
-       MOVQ 32(SI),DX
-       IMUL3Q $19,DX,AX
-       MOVQ AX,72(SP)
-       MULQ 8(CX)
-       ADDQ AX,R8
-       ADCQ DX,R9
-       MOVQ 0(SI),AX
-       MULQ 0(CX)
-       ADDQ AX,R8
-       ADCQ DX,R9
-       MOVQ 0(SI),AX
-       MULQ 8(CX)
-       MOVQ AX,R10
-       MOVQ DX,R11
-       MOVQ 0(SI),AX
-       MULQ 16(CX)
-       MOVQ AX,R12
-       MOVQ DX,R13
-       MOVQ 0(SI),AX
-       MULQ 24(CX)
-       MOVQ AX,R14
-       MOVQ DX,R15
-       MOVQ 0(SI),AX
-       MULQ 32(CX)
-       MOVQ AX,BX
-       MOVQ DX,BP
-       MOVQ 8(SI),AX
-       MULQ 0(CX)
-       ADDQ AX,R10
-       ADCQ DX,R11
-       MOVQ 8(SI),AX
-       MULQ 8(CX)
-       ADDQ AX,R12
-       ADCQ DX,R13
-       MOVQ 8(SI),AX
-       MULQ 16(CX)
-       ADDQ AX,R14
-       ADCQ DX,R15
-       MOVQ 8(SI),AX
-       MULQ 24(CX)
-       ADDQ AX,BX
-       ADCQ DX,BP
-       MOVQ 8(SI),DX
-       IMUL3Q $19,DX,AX
-       MULQ 32(CX)
-       ADDQ AX,R8
-       ADCQ DX,R9
-       MOVQ 16(SI),AX
-       MULQ 0(CX)
-       ADDQ AX,R12
-       ADCQ DX,R13
-       MOVQ 16(SI),AX
-       MULQ 8(CX)
-       ADDQ AX,R14
-       ADCQ DX,R15
-       MOVQ 16(SI),AX
-       MULQ 16(CX)
-       ADDQ AX,BX
-       ADCQ DX,BP
-       MOVQ 16(SI),DX
-       IMUL3Q $19,DX,AX
-       MULQ 24(CX)
-       ADDQ AX,R8
-       ADCQ DX,R9
-       MOVQ 16(SI),DX
-       IMUL3Q $19,DX,AX
-       MULQ 32(CX)
-       ADDQ AX,R10
-       ADCQ DX,R11
-       MOVQ 24(SI),AX
-       MULQ 0(CX)
-       ADDQ AX,R14
-       ADCQ DX,R15
-       MOVQ 24(SI),AX
-       MULQ 8(CX)
-       ADDQ AX,BX
-       ADCQ DX,BP
-       MOVQ 64(SP),AX
-       MULQ 24(CX)
-       ADDQ AX,R10
-       ADCQ DX,R11
-       MOVQ 64(SP),AX
-       MULQ 32(CX)
-       ADDQ AX,R12
-       ADCQ DX,R13
-       MOVQ 32(SI),AX
-       MULQ 0(CX)
-       ADDQ AX,BX
-       ADCQ DX,BP
-       MOVQ 72(SP),AX
-       MULQ 16(CX)
-       ADDQ AX,R10
-       ADCQ DX,R11
-       MOVQ 72(SP),AX
-       MULQ 24(CX)
-       ADDQ AX,R12
-       ADCQ DX,R13
-       MOVQ 72(SP),AX
-       MULQ 32(CX)
-       ADDQ AX,R14
-       ADCQ DX,R15
-       MOVQ ·REDMASK51(SB),SI
-       SHLQ $13,R9:R8
-       ANDQ SI,R8
-       SHLQ $13,R11:R10
-       ANDQ SI,R10
-       ADDQ R9,R10
-       SHLQ $13,R13:R12
-       ANDQ SI,R12
-       ADDQ R11,R12
-       SHLQ $13,R15:R14
-       ANDQ SI,R14
-       ADDQ R13,R14
-       SHLQ $13,BP:BX
-       ANDQ SI,BX
-       ADDQ R15,BX
-       IMUL3Q $19,BP,DX
-       ADDQ DX,R8
-       MOVQ R8,DX
-       SHRQ $51,DX
-       ADDQ R10,DX
-       MOVQ DX,CX
-       SHRQ $51,DX
-       ANDQ SI,R8
-       ADDQ R12,DX
-       MOVQ DX,R9
-       SHRQ $51,DX
-       ANDQ SI,CX
-       ADDQ R14,DX
-       MOVQ DX,AX
-       SHRQ $51,DX
-       ANDQ SI,R9
-       ADDQ BX,DX
-       MOVQ DX,R10
-       SHRQ $51,DX
-       ANDQ SI,AX
-       IMUL3Q $19,DX,DX
-       ADDQ DX,R8
-       ANDQ SI,R10
-       MOVQ R8,0(DI)
-       MOVQ CX,8(DI)
-       MOVQ R9,16(DI)
-       MOVQ AX,24(DI)
-       MOVQ R10,32(DI)
-       MOVQ 0(SP),R11
-       MOVQ 8(SP),R12
-       MOVQ 16(SP),R13
-       MOVQ 24(SP),R14
-       MOVQ 32(SP),R15
-       MOVQ 40(SP),BX
-       MOVQ 48(SP),BP
-       MOVQ R11,SP
-       MOVQ DI,AX
-       MOVQ SI,DX
-       RET

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/868863aa/cli/vendor/golang.org/x/crypto/curve25519/square_amd64.s
----------------------------------------------------------------------
diff --git a/cli/vendor/golang.org/x/crypto/curve25519/square_amd64.s 
b/cli/vendor/golang.org/x/crypto/curve25519/square_amd64.s
deleted file mode 100644
index 78d1a50..0000000
--- a/cli/vendor/golang.org/x/crypto/curve25519/square_amd64.s
+++ /dev/null
@@ -1,153 +0,0 @@
-// Copyright 2012 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.
-
-// This code was translated into a form compatible with 6a from the public
-// domain sources in SUPERCOP: http://bench.cr.yp.to/supercop.html
-
-// +build amd64,!gccgo,!appengine
-
-// func square(out, in *[5]uint64)
-TEXT ·square(SB),7,$96-16
-       MOVQ out+0(FP), DI
-       MOVQ in+8(FP), SI
-
-       MOVQ SP,R11
-       MOVQ $31,CX
-       NOTQ CX
-       ANDQ CX,SP
-       ADDQ $32, SP
-
-       MOVQ R11,0(SP)
-       MOVQ R12,8(SP)
-       MOVQ R13,16(SP)
-       MOVQ R14,24(SP)
-       MOVQ R15,32(SP)
-       MOVQ BX,40(SP)
-       MOVQ BP,48(SP)
-       MOVQ 0(SI),AX
-       MULQ 0(SI)
-       MOVQ AX,CX
-       MOVQ DX,R8
-       MOVQ 0(SI),AX
-       SHLQ $1,AX
-       MULQ 8(SI)
-       MOVQ AX,R9
-       MOVQ DX,R10
-       MOVQ 0(SI),AX
-       SHLQ $1,AX
-       MULQ 16(SI)
-       MOVQ AX,R11
-       MOVQ DX,R12
-       MOVQ 0(SI),AX
-       SHLQ $1,AX
-       MULQ 24(SI)
-       MOVQ AX,R13
-       MOVQ DX,R14
-       MOVQ 0(SI),AX
-       SHLQ $1,AX
-       MULQ 32(SI)
-       MOVQ AX,R15
-       MOVQ DX,BX
-       MOVQ 8(SI),AX
-       MULQ 8(SI)
-       ADDQ AX,R11
-       ADCQ DX,R12
-       MOVQ 8(SI),AX
-       SHLQ $1,AX
-       MULQ 16(SI)
-       ADDQ AX,R13
-       ADCQ DX,R14
-       MOVQ 8(SI),AX
-       SHLQ $1,AX
-       MULQ 24(SI)
-       ADDQ AX,R15
-       ADCQ DX,BX
-       MOVQ 8(SI),DX
-       IMUL3Q $38,DX,AX
-       MULQ 32(SI)
-       ADDQ AX,CX
-       ADCQ DX,R8
-       MOVQ 16(SI),AX
-       MULQ 16(SI)
-       ADDQ AX,R15
-       ADCQ DX,BX
-       MOVQ 16(SI),DX
-       IMUL3Q $38,DX,AX
-       MULQ 24(SI)
-       ADDQ AX,CX
-       ADCQ DX,R8
-       MOVQ 16(SI),DX
-       IMUL3Q $38,DX,AX
-       MULQ 32(SI)
-       ADDQ AX,R9
-       ADCQ DX,R10
-       MOVQ 24(SI),DX
-       IMUL3Q $19,DX,AX
-       MULQ 24(SI)
-       ADDQ AX,R9
-       ADCQ DX,R10
-       MOVQ 24(SI),DX
-       IMUL3Q $38,DX,AX
-       MULQ 32(SI)
-       ADDQ AX,R11
-       ADCQ DX,R12
-       MOVQ 32(SI),DX
-       IMUL3Q $19,DX,AX
-       MULQ 32(SI)
-       ADDQ AX,R13
-       ADCQ DX,R14
-       MOVQ ·REDMASK51(SB),SI
-       SHLQ $13,R8:CX
-       ANDQ SI,CX
-       SHLQ $13,R10:R9
-       ANDQ SI,R9
-       ADDQ R8,R9
-       SHLQ $13,R12:R11
-       ANDQ SI,R11
-       ADDQ R10,R11
-       SHLQ $13,R14:R13
-       ANDQ SI,R13
-       ADDQ R12,R13
-       SHLQ $13,BX:R15
-       ANDQ SI,R15
-       ADDQ R14,R15
-       IMUL3Q $19,BX,DX
-       ADDQ DX,CX
-       MOVQ CX,DX
-       SHRQ $51,DX
-       ADDQ R9,DX
-       ANDQ SI,CX
-       MOVQ DX,R8
-       SHRQ $51,DX
-       ADDQ R11,DX
-       ANDQ SI,R8
-       MOVQ DX,R9
-       SHRQ $51,DX
-       ADDQ R13,DX
-       ANDQ SI,R9
-       MOVQ DX,AX
-       SHRQ $51,DX
-       ADDQ R15,DX
-       ANDQ SI,AX
-       MOVQ DX,R10
-       SHRQ $51,DX
-       IMUL3Q $19,DX,DX
-       ADDQ DX,CX
-       ANDQ SI,R10
-       MOVQ CX,0(DI)
-       MOVQ R8,8(DI)
-       MOVQ R9,16(DI)
-       MOVQ AX,24(DI)
-       MOVQ R10,32(DI)
-       MOVQ 0(SP),R11
-       MOVQ 8(SP),R12
-       MOVQ 16(SP),R13
-       MOVQ 24(SP),R14
-       MOVQ 32(SP),R15
-       MOVQ 40(SP),BX
-       MOVQ 48(SP),BP
-       MOVQ R11,SP
-       MOVQ DI,AX
-       MOVQ SI,DX
-       RET

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/868863aa/cli/vendor/golang.org/x/crypto/hkdf/example_test.go
----------------------------------------------------------------------
diff --git a/cli/vendor/golang.org/x/crypto/hkdf/example_test.go 
b/cli/vendor/golang.org/x/crypto/hkdf/example_test.go
deleted file mode 100644
index df84395..0000000
--- a/cli/vendor/golang.org/x/crypto/hkdf/example_test.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2014 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 hkdf_test
-
-import (
-       "bytes"
-       "crypto/rand"
-       "crypto/sha256"
-       "fmt"
-       "golang.org/x/crypto/hkdf"
-       "io"
-)
-
-// Usage example that expands one master key into three other cryptographically
-// secure keys.
-func Example_usage() {
-       // Underlying hash function to use
-       hash := sha256.New
-
-       // Cryptographically secure master key.
-       master := []byte{0x00, 0x01, 0x02, 0x03} // i.e. NOT this.
-
-       // Non secret salt, optional (can be nil)
-       // Recommended: hash-length sized random
-       salt := make([]byte, hash().Size())
-       n, err := io.ReadFull(rand.Reader, salt)
-       if n != len(salt) || err != nil {
-               fmt.Println("error:", err)
-               return
-       }
-
-       // Non secret context specific info, optional (can be nil).
-       // Note, independent from the master key.
-       info := []byte{0x03, 0x14, 0x15, 0x92, 0x65}
-
-       // Create the key derivation function
-       hkdf := hkdf.New(hash, master, salt, info)
-
-       // Generate the required keys
-       keys := make([][]byte, 3)
-       for i := 0; i < len(keys); i++ {
-               keys[i] = make([]byte, 24)
-               n, err := io.ReadFull(hkdf, keys[i])
-               if n != len(keys[i]) || err != nil {
-                       fmt.Println("error:", err)
-                       return
-               }
-       }
-
-       // Keys should contain 192 bit random keys
-       for i := 1; i <= len(keys); i++ {
-               fmt.Printf("Key #%d: %v\n", i, !bytes.Equal(keys[i-1], 
make([]byte, 24)))
-       }
-
-       // Output:
-       // Key #1: true
-       // Key #2: true
-       // Key #3: true
-}

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/868863aa/cli/vendor/golang.org/x/crypto/hkdf/hkdf.go
----------------------------------------------------------------------
diff --git a/cli/vendor/golang.org/x/crypto/hkdf/hkdf.go 
b/cli/vendor/golang.org/x/crypto/hkdf/hkdf.go
deleted file mode 100644
index 5bc2463..0000000
--- a/cli/vendor/golang.org/x/crypto/hkdf/hkdf.go
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2014 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 hkdf implements the HMAC-based Extract-and-Expand Key Derivation
-// Function (HKDF) as defined in RFC 5869.
-//
-// HKDF is a cryptographic key derivation function (KDF) with the goal of
-// expanding limited input keying material into one or more cryptographically
-// strong secret keys.
-//
-// RFC 5869: https://tools.ietf.org/html/rfc5869
-package hkdf // import "golang.org/x/crypto/hkdf"
-
-import (
-       "crypto/hmac"
-       "errors"
-       "hash"
-       "io"
-)
-
-type hkdf struct {
-       expander hash.Hash
-       size     int
-
-       info    []byte
-       counter byte
-
-       prev  []byte
-       cache []byte
-}
-
-func (f *hkdf) Read(p []byte) (int, error) {
-       // Check whether enough data can be generated
-       need := len(p)
-       remains := len(f.cache) + int(255-f.counter+1)*f.size
-       if remains < need {
-               return 0, errors.New("hkdf: entropy limit reached")
-       }
-       // Read from the cache, if enough data is present
-       n := copy(p, f.cache)
-       p = p[n:]
-
-       // Fill the buffer
-       for len(p) > 0 {
-               f.expander.Reset()
-               f.expander.Write(f.prev)
-               f.expander.Write(f.info)
-               f.expander.Write([]byte{f.counter})
-               f.prev = f.expander.Sum(f.prev[:0])
-               f.counter++
-
-               // Copy the new batch into p
-               f.cache = f.prev
-               n = copy(p, f.cache)
-               p = p[n:]
-       }
-       // Save leftovers for next run
-       f.cache = f.cache[n:]
-
-       return need, nil
-}
-
-// New returns a new HKDF using the given hash, the secret keying material to 
expand
-// and optional salt and info fields.
-func New(hash func() hash.Hash, secret, salt, info []byte) io.Reader {
-       if salt == nil {
-               salt = make([]byte, hash().Size())
-       }
-       extractor := hmac.New(hash, salt)
-       extractor.Write(secret)
-       prk := extractor.Sum(nil)
-
-       return &hkdf{hmac.New(hash, prk), extractor.Size(), info, 1, nil, nil}
-}

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/868863aa/cli/vendor/golang.org/x/crypto/hkdf/hkdf_test.go
----------------------------------------------------------------------
diff --git a/cli/vendor/golang.org/x/crypto/hkdf/hkdf_test.go 
b/cli/vendor/golang.org/x/crypto/hkdf/hkdf_test.go
deleted file mode 100644
index cee659b..0000000
--- a/cli/vendor/golang.org/x/crypto/hkdf/hkdf_test.go
+++ /dev/null
@@ -1,370 +0,0 @@
-// Copyright 2014 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 hkdf
-
-import (
-       "bytes"
-       "crypto/md5"
-       "crypto/sha1"
-       "crypto/sha256"
-       "crypto/sha512"
-       "hash"
-       "io"
-       "testing"
-)
-
-type hkdfTest struct {
-       hash   func() hash.Hash
-       master []byte
-       salt   []byte
-       info   []byte
-       out    []byte
-}
-
-var hkdfTests = []hkdfTest{
-       // Tests from RFC 5869
-       {
-               sha256.New,
-               []byte{
-                       0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-                       0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-                       0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-               },
-               []byte{
-                       0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-                       0x08, 0x09, 0x0a, 0x0b, 0x0c,
-               },
-               []byte{
-                       0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
-                       0xf8, 0xf9,
-               },
-               []byte{
-                       0x3c, 0xb2, 0x5f, 0x25, 0xfa, 0xac, 0xd5, 0x7a,
-                       0x90, 0x43, 0x4f, 0x64, 0xd0, 0x36, 0x2f, 0x2a,
-                       0x2d, 0x2d, 0x0a, 0x90, 0xcf, 0x1a, 0x5a, 0x4c,
-                       0x5d, 0xb0, 0x2d, 0x56, 0xec, 0xc4, 0xc5, 0xbf,
-                       0x34, 0x00, 0x72, 0x08, 0xd5, 0xb8, 0x87, 0x18,
-                       0x58, 0x65,
-               },
-       },
-       {
-               sha256.New,
-               []byte{
-                       0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-                       0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-                       0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-                       0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
-                       0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
-                       0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
-                       0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
-                       0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
-                       0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
-                       0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
-               },
-               []byte{
-                       0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
-                       0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
-                       0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
-                       0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
-                       0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
-                       0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
-                       0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
-                       0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
-                       0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
-                       0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
-               },
-               []byte{
-                       0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
-                       0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
-                       0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
-                       0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
-                       0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
-                       0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
-                       0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7,
-                       0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
-                       0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
-                       0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
-               },
-               []byte{
-                       0xb1, 0x1e, 0x39, 0x8d, 0xc8, 0x03, 0x27, 0xa1,
-                       0xc8, 0xe7, 0xf7, 0x8c, 0x59, 0x6a, 0x49, 0x34,
-                       0x4f, 0x01, 0x2e, 0xda, 0x2d, 0x4e, 0xfa, 0xd8,
-                       0xa0, 0x50, 0xcc, 0x4c, 0x19, 0xaf, 0xa9, 0x7c,
-                       0x59, 0x04, 0x5a, 0x99, 0xca, 0xc7, 0x82, 0x72,
-                       0x71, 0xcb, 0x41, 0xc6, 0x5e, 0x59, 0x0e, 0x09,
-                       0xda, 0x32, 0x75, 0x60, 0x0c, 0x2f, 0x09, 0xb8,
-                       0x36, 0x77, 0x93, 0xa9, 0xac, 0xa3, 0xdb, 0x71,
-                       0xcc, 0x30, 0xc5, 0x81, 0x79, 0xec, 0x3e, 0x87,
-                       0xc1, 0x4c, 0x01, 0xd5, 0xc1, 0xf3, 0x43, 0x4f,
-                       0x1d, 0x87,
-               },
-       },
-       {
-               sha256.New,
-               []byte{
-                       0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-                       0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-                       0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-               },
-               []byte{},
-               []byte{},
-               []byte{
-                       0x8d, 0xa4, 0xe7, 0x75, 0xa5, 0x63, 0xc1, 0x8f,
-                       0x71, 0x5f, 0x80, 0x2a, 0x06, 0x3c, 0x5a, 0x31,
-                       0xb8, 0xa1, 0x1f, 0x5c, 0x5e, 0xe1, 0x87, 0x9e,
-                       0xc3, 0x45, 0x4e, 0x5f, 0x3c, 0x73, 0x8d, 0x2d,
-                       0x9d, 0x20, 0x13, 0x95, 0xfa, 0xa4, 0xb6, 0x1a,
-                       0x96, 0xc8,
-               },
-       },
-       {
-               sha1.New,
-               []byte{
-                       0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-                       0x0b, 0x0b, 0x0b,
-               },
-               []byte{
-                       0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-                       0x08, 0x09, 0x0a, 0x0b, 0x0c,
-               },
-               []byte{
-                       0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
-                       0xf8, 0xf9,
-               },
-               []byte{
-                       0x08, 0x5a, 0x01, 0xea, 0x1b, 0x10, 0xf3, 0x69,
-                       0x33, 0x06, 0x8b, 0x56, 0xef, 0xa5, 0xad, 0x81,
-                       0xa4, 0xf1, 0x4b, 0x82, 0x2f, 0x5b, 0x09, 0x15,
-                       0x68, 0xa9, 0xcd, 0xd4, 0xf1, 0x55, 0xfd, 0xa2,
-                       0xc2, 0x2e, 0x42, 0x24, 0x78, 0xd3, 0x05, 0xf3,
-                       0xf8, 0x96,
-               },
-       },
-       {
-               sha1.New,
-               []byte{
-                       0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-                       0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-                       0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-                       0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
-                       0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
-                       0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
-                       0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
-                       0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
-                       0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
-                       0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
-               },
-               []byte{
-                       0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
-                       0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
-                       0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
-                       0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
-                       0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
-                       0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
-                       0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
-                       0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
-                       0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
-                       0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
-               },
-               []byte{
-                       0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
-                       0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
-                       0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
-                       0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
-                       0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
-                       0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
-                       0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7,
-                       0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
-                       0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
-                       0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
-               },
-               []byte{
-                       0x0b, 0xd7, 0x70, 0xa7, 0x4d, 0x11, 0x60, 0xf7,
-                       0xc9, 0xf1, 0x2c, 0xd5, 0x91, 0x2a, 0x06, 0xeb,
-                       0xff, 0x6a, 0xdc, 0xae, 0x89, 0x9d, 0x92, 0x19,
-                       0x1f, 0xe4, 0x30, 0x56, 0x73, 0xba, 0x2f, 0xfe,
-                       0x8f, 0xa3, 0xf1, 0xa4, 0xe5, 0xad, 0x79, 0xf3,
-                       0xf3, 0x34, 0xb3, 0xb2, 0x02, 0xb2, 0x17, 0x3c,
-                       0x48, 0x6e, 0xa3, 0x7c, 0xe3, 0xd3, 0x97, 0xed,
-                       0x03, 0x4c, 0x7f, 0x9d, 0xfe, 0xb1, 0x5c, 0x5e,
-                       0x92, 0x73, 0x36, 0xd0, 0x44, 0x1f, 0x4c, 0x43,
-                       0x00, 0xe2, 0xcf, 0xf0, 0xd0, 0x90, 0x0b, 0x52,
-                       0xd3, 0xb4,
-               },
-       },
-       {
-               sha1.New,
-               []byte{
-                       0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-                       0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-                       0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-               },
-               []byte{},
-               []byte{},
-               []byte{
-                       0x0a, 0xc1, 0xaf, 0x70, 0x02, 0xb3, 0xd7, 0x61,
-                       0xd1, 0xe5, 0x52, 0x98, 0xda, 0x9d, 0x05, 0x06,
-                       0xb9, 0xae, 0x52, 0x05, 0x72, 0x20, 0xa3, 0x06,
-                       0xe0, 0x7b, 0x6b, 0x87, 0xe8, 0xdf, 0x21, 0xd0,
-                       0xea, 0x00, 0x03, 0x3d, 0xe0, 0x39, 0x84, 0xd3,
-                       0x49, 0x18,
-               },
-       },
-       {
-               sha1.New,
-               []byte{
-                       0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
-                       0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
-                       0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
-               },
-               nil,
-               []byte{},
-               []byte{
-                       0x2c, 0x91, 0x11, 0x72, 0x04, 0xd7, 0x45, 0xf3,
-                       0x50, 0x0d, 0x63, 0x6a, 0x62, 0xf6, 0x4f, 0x0a,
-                       0xb3, 0xba, 0xe5, 0x48, 0xaa, 0x53, 0xd4, 0x23,
-                       0xb0, 0xd1, 0xf2, 0x7e, 0xbb, 0xa6, 0xf5, 0xe5,
-                       0x67, 0x3a, 0x08, 0x1d, 0x70, 0xcc, 0xe7, 0xac,
-                       0xfc, 0x48,
-               },
-       },
-}
-
-func TestHKDF(t *testing.T) {
-       for i, tt := range hkdfTests {
-               hkdf := New(tt.hash, tt.master, tt.salt, tt.info)
-               out := make([]byte, len(tt.out))
-
-               n, err := io.ReadFull(hkdf, out)
-               if n != len(tt.out) || err != nil {
-                       t.Errorf("test %d: not enough output bytes: %d.", i, n)
-               }
-
-               if !bytes.Equal(out, tt.out) {
-                       t.Errorf("test %d: incorrect output: have %v, need 
%v.", i, out, tt.out)
-               }
-       }
-}
-
-func TestHKDFMultiRead(t *testing.T) {
-       for i, tt := range hkdfTests {
-               hkdf := New(tt.hash, tt.master, tt.salt, tt.info)
-               out := make([]byte, len(tt.out))
-
-               for b := 0; b < len(tt.out); b++ {
-                       n, err := io.ReadFull(hkdf, out[b:b+1])
-                       if n != 1 || err != nil {
-                               t.Errorf("test %d.%d: not enough output bytes: 
have %d, need %d .", i, b, n, len(tt.out))
-                       }
-               }
-
-               if !bytes.Equal(out, tt.out) {
-                       t.Errorf("test %d: incorrect output: have %v, need 
%v.", i, out, tt.out)
-               }
-       }
-}
-
-func TestHKDFLimit(t *testing.T) {
-       hash := sha1.New
-       master := []byte{0x00, 0x01, 0x02, 0x03}
-       info := []byte{}
-
-       hkdf := New(hash, master, nil, info)
-       limit := hash().Size() * 255
-       out := make([]byte, limit)
-
-       // The maximum output bytes should be extractable
-       n, err := io.ReadFull(hkdf, out)
-       if n != limit || err != nil {
-               t.Errorf("not enough output bytes: %d, %v.", n, err)
-       }
-
-       // Reading one more should fail
-       n, err = io.ReadFull(hkdf, make([]byte, 1))
-       if n > 0 || err == nil {
-               t.Errorf("key expansion overflowed: n = %d, err = %v", n, err)
-       }
-}
-
-func Benchmark16ByteMD5Single(b *testing.B) {
-       benchmarkHKDFSingle(md5.New, 16, b)
-}
-
-func Benchmark20ByteSHA1Single(b *testing.B) {
-       benchmarkHKDFSingle(sha1.New, 20, b)
-}
-
-func Benchmark32ByteSHA256Single(b *testing.B) {
-       benchmarkHKDFSingle(sha256.New, 32, b)
-}
-
-func Benchmark64ByteSHA512Single(b *testing.B) {
-       benchmarkHKDFSingle(sha512.New, 64, b)
-}
-
-func Benchmark8ByteMD5Stream(b *testing.B) {
-       benchmarkHKDFStream(md5.New, 8, b)
-}
-
-func Benchmark16ByteMD5Stream(b *testing.B) {
-       benchmarkHKDFStream(md5.New, 16, b)
-}
-
-func Benchmark8ByteSHA1Stream(b *testing.B) {
-       benchmarkHKDFStream(sha1.New, 8, b)
-}
-
-func Benchmark20ByteSHA1Stream(b *testing.B) {
-       benchmarkHKDFStream(sha1.New, 20, b)
-}
-
-func Benchmark8ByteSHA256Stream(b *testing.B) {
-       benchmarkHKDFStream(sha256.New, 8, b)
-}
-
-func Benchmark32ByteSHA256Stream(b *testing.B) {
-       benchmarkHKDFStream(sha256.New, 32, b)
-}
-
-func Benchmark8ByteSHA512Stream(b *testing.B) {
-       benchmarkHKDFStream(sha512.New, 8, b)
-}
-
-func Benchmark64ByteSHA512Stream(b *testing.B) {
-       benchmarkHKDFStream(sha512.New, 64, b)
-}
-
-func benchmarkHKDFSingle(hasher func() hash.Hash, block int, b *testing.B) {
-       master := []byte{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}
-       salt := []byte{0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17}
-       info := []byte{0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27}
-       out := make([]byte, block)
-
-       b.SetBytes(int64(block))
-       b.ResetTimer()
-
-       for i := 0; i < b.N; i++ {
-               hkdf := New(hasher, master, salt, info)
-               io.ReadFull(hkdf, out)
-       }
-}
-
-func benchmarkHKDFStream(hasher func() hash.Hash, block int, b *testing.B) {
-       master := []byte{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}
-       salt := []byte{0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17}
-       info := []byte{0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27}
-       out := make([]byte, block)
-
-       b.SetBytes(int64(block))
-       b.ResetTimer()
-
-       hkdf := New(hasher, master, salt, info)
-       for i := 0; i < b.N; i++ {
-               _, err := io.ReadFull(hkdf, out)
-               if err != nil {
-                       hkdf = New(hasher, master, salt, info)
-                       i--
-               }
-       }
-}

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/868863aa/cli/vendor/golang.org/x/crypto/md4/md4.go
----------------------------------------------------------------------
diff --git a/cli/vendor/golang.org/x/crypto/md4/md4.go 
b/cli/vendor/golang.org/x/crypto/md4/md4.go
deleted file mode 100644
index 6d9ba9e..0000000
--- a/cli/vendor/golang.org/x/crypto/md4/md4.go
+++ /dev/null
@@ -1,118 +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 md4 implements the MD4 hash algorithm as defined in RFC 1320.
-package md4 // import "golang.org/x/crypto/md4"
-
-import (
-       "crypto"
-       "hash"
-)
-
-func init() {
-       crypto.RegisterHash(crypto.MD4, New)
-}
-
-// The size of an MD4 checksum in bytes.
-const Size = 16
-
-// The blocksize of MD4 in bytes.
-const BlockSize = 64
-
-const (
-       _Chunk = 64
-       _Init0 = 0x67452301
-       _Init1 = 0xEFCDAB89
-       _Init2 = 0x98BADCFE
-       _Init3 = 0x10325476
-)
-
-// digest represents the partial evaluation of a checksum.
-type digest struct {
-       s   [4]uint32
-       x   [_Chunk]byte
-       nx  int
-       len uint64
-}
-
-func (d *digest) Reset() {
-       d.s[0] = _Init0
-       d.s[1] = _Init1
-       d.s[2] = _Init2
-       d.s[3] = _Init3
-       d.nx = 0
-       d.len = 0
-}
-
-// New returns a new hash.Hash computing the MD4 checksum.
-func New() hash.Hash {
-       d := new(digest)
-       d.Reset()
-       return d
-}
-
-func (d *digest) Size() int { return Size }
-
-func (d *digest) BlockSize() int { return BlockSize }
-
-func (d *digest) Write(p []byte) (nn int, err error) {
-       nn = len(p)
-       d.len += uint64(nn)
-       if d.nx > 0 {
-               n := len(p)
-               if n > _Chunk-d.nx {
-                       n = _Chunk - d.nx
-               }
-               for i := 0; i < n; i++ {
-                       d.x[d.nx+i] = p[i]
-               }
-               d.nx += n
-               if d.nx == _Chunk {
-                       _Block(d, d.x[0:])
-                       d.nx = 0
-               }
-               p = p[n:]
-       }
-       n := _Block(d, p)
-       p = p[n:]
-       if len(p) > 0 {
-               d.nx = copy(d.x[:], p)
-       }
-       return
-}
-
-func (d0 *digest) Sum(in []byte) []byte {
-       // Make a copy of d0, so that caller can keep writing and summing.
-       d := new(digest)
-       *d = *d0
-
-       // Padding.  Add a 1 bit and 0 bits until 56 bytes mod 64.
-       len := d.len
-       var tmp [64]byte
-       tmp[0] = 0x80
-       if len%64 < 56 {
-               d.Write(tmp[0 : 56-len%64])
-       } else {
-               d.Write(tmp[0 : 64+56-len%64])
-       }
-
-       // Length in bits.
-       len <<= 3
-       for i := uint(0); i < 8; i++ {
-               tmp[i] = byte(len >> (8 * i))
-       }
-       d.Write(tmp[0:8])
-
-       if d.nx != 0 {
-               panic("d.nx != 0")
-       }
-
-       for _, s := range d.s {
-               in = append(in, byte(s>>0))
-               in = append(in, byte(s>>8))
-               in = append(in, byte(s>>16))
-               in = append(in, byte(s>>24))
-       }
-       return in
-}

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/868863aa/cli/vendor/golang.org/x/crypto/md4/md4_test.go
----------------------------------------------------------------------
diff --git a/cli/vendor/golang.org/x/crypto/md4/md4_test.go 
b/cli/vendor/golang.org/x/crypto/md4/md4_test.go
deleted file mode 100644
index b56edd7..0000000
--- a/cli/vendor/golang.org/x/crypto/md4/md4_test.go
+++ /dev/null
@@ -1,71 +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 md4
-
-import (
-       "fmt"
-       "io"
-       "testing"
-)
-
-type md4Test struct {
-       out string
-       in  string
-}
-
-var golden = []md4Test{
-       {"31d6cfe0d16ae931b73c59d7e0c089c0", ""},
-       {"bde52cb31de33e46245e05fbdbd6fb24", "a"},
-       {"ec388dd78999dfc7cf4632465693b6bf", "ab"},
-       {"a448017aaf21d8525fc10ae87aa6729d", "abc"},
-       {"41decd8f579255c5200f86a4bb3ba740", "abcd"},
-       {"9803f4a34e8eb14f96adba49064a0c41", "abcde"},
-       {"804e7f1c2586e50b49ac65db5b645131", "abcdef"},
-       {"752f4adfe53d1da0241b5bc216d098fc", "abcdefg"},
-       {"ad9daf8d49d81988590a6f0e745d15dd", "abcdefgh"},
-       {"1e4e28b05464316b56402b3815ed2dfd", "abcdefghi"},
-       {"dc959c6f5d6f9e04e4380777cc964b3d", "abcdefghij"},
-       {"1b5701e265778898ef7de5623bbe7cc0", "Discard medicine more than two 
years old."},
-       {"d7f087e090fe7ad4a01cb59dacc9a572", "He who has a shady past knows 
that nice guys finish last."},
-       {"a6f8fd6df617c72837592fc3570595c9", "I wouldn't marry him with a ten 
foot pole."},
-       {"c92a84a9526da8abc240c05d6b1a1ce0", "Free! Free!/A trip/to Mars/for 
900/empty jars/Burma Shave"},
-       {"f6013160c4dcb00847069fee3bb09803", "The days of the digital watch are 
numbered.  -Tom Stoppard"},
-       {"2c3bb64f50b9107ed57640fe94bec09f", "Nepal premier won't resign."},
-       {"45b7d8a32c7806f2f7f897332774d6e4", "For every action there is an 
equal and opposite government program."},
-       {"b5b4f9026b175c62d7654bdc3a1cd438", "His money is twice tainted: 
'taint yours and 'taint mine."},
-       {"caf44e80f2c20ce19b5ba1cab766e7bd", "There is no reason for any 
individual to have a computer in their home. -Ken Olsen, 1977"},
-       {"191fae6707f496aa54a6bce9f2ecf74d", "It's a tiny change to the code 
and not completely disgusting. - Bob Manchek"},
-       {"9ddc753e7a4ccee6081cd1b45b23a834", "size:  a.out:  bad magic"},
-       {"8d050f55b1cadb9323474564be08a521", "The major problem is with 
sendmail.  -Mark Horton"},
-       {"ad6e2587f74c3e3cc19146f6127fa2e3", "Give me a rock, paper and 
scissors and I will move the world.  CCFestoon"},
-       {"1d616d60a5fabe85589c3f1566ca7fca", "If the enemy is within range, 
then so are you."},
-       {"aec3326a4f496a2ced65a1963f84577f", "It's well we cannot hear the 
screams/That we create in others' dreams."},
-       {"77b4fd762d6b9245e61c50bf6ebf118b", "You remind me of a TV show, but 
that's all right: I watch it anyway."},
-       {"e8f48c726bae5e516f6ddb1a4fe62438", "C is as portable as 
Stonehedge!!"},
-       {"a3a84366e7219e887423b01f9be7166e", "Even if I could be Shakespeare, I 
think I should still choose to be Faraday. - A. Huxley"},
-       {"a6b7aa35157e984ef5d9b7f32e5fbb52", "The fugacity of a constituent in 
a mixture of gases at a given temperature is proportional to its mole fraction. 
 Lewis-Randall Rule"},
-       {"75661f0545955f8f9abeeb17845f3fd6", "How can you write a big system 
without C++?  -Paul Glick"},
-}
-
-func TestGolden(t *testing.T) {
-       for i := 0; i < len(golden); i++ {
-               g := golden[i]
-               c := New()
-               for j := 0; j < 3; j++ {
-                       if j < 2 {
-                               io.WriteString(c, g.in)
-                       } else {
-                               io.WriteString(c, g.in[0:len(g.in)/2])
-                               c.Sum(nil)
-                               io.WriteString(c, g.in[len(g.in)/2:])
-                       }
-                       s := fmt.Sprintf("%x", c.Sum(nil))
-                       if s != g.out {
-                               t.Fatalf("md4[%d](%s) = %s want %s", j, g.in, 
s, g.out)
-                       }
-                       c.Reset()
-               }
-       }
-}

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/868863aa/cli/vendor/golang.org/x/crypto/md4/md4block.go
----------------------------------------------------------------------
diff --git a/cli/vendor/golang.org/x/crypto/md4/md4block.go 
b/cli/vendor/golang.org/x/crypto/md4/md4block.go
deleted file mode 100644
index 3fed475..0000000
--- a/cli/vendor/golang.org/x/crypto/md4/md4block.go
+++ /dev/null
@@ -1,89 +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.
-
-// MD4 block step.
-// In its own file so that a faster assembly or C version
-// can be substituted easily.
-
-package md4
-
-var shift1 = []uint{3, 7, 11, 19}
-var shift2 = []uint{3, 5, 9, 13}
-var shift3 = []uint{3, 9, 11, 15}
-
-var xIndex2 = []uint{0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14, 3, 7, 11, 15}
-var xIndex3 = []uint{0, 8, 4, 12, 2, 10, 6, 14, 1, 9, 5, 13, 3, 11, 7, 15}
-
-func _Block(dig *digest, p []byte) int {
-       a := dig.s[0]
-       b := dig.s[1]
-       c := dig.s[2]
-       d := dig.s[3]
-       n := 0
-       var X [16]uint32
-       for len(p) >= _Chunk {
-               aa, bb, cc, dd := a, b, c, d
-
-               j := 0
-               for i := 0; i < 16; i++ {
-                       X[i] = uint32(p[j]) | uint32(p[j+1])<<8 | 
uint32(p[j+2])<<16 | uint32(p[j+3])<<24
-                       j += 4
-               }
-
-               // If this needs to be made faster in the future,
-               // the usual trick is to unroll each of these
-               // loops by a factor of 4; that lets you replace
-               // the shift[] lookups with constants and,
-               // with suitable variable renaming in each
-               // unrolled body, delete the a, b, c, d = d, a, b, c
-               // (or you can let the optimizer do the renaming).
-               //
-               // The index variables are uint so that % by a power
-               // of two can be optimized easily by a compiler.
-
-               // Round 1.
-               for i := uint(0); i < 16; i++ {
-                       x := i
-                       s := shift1[i%4]
-                       f := ((c ^ d) & b) ^ d
-                       a += f + X[x]
-                       a = a<<s | a>>(32-s)
-                       a, b, c, d = d, a, b, c
-               }
-
-               // Round 2.
-               for i := uint(0); i < 16; i++ {
-                       x := xIndex2[i]
-                       s := shift2[i%4]
-                       g := (b & c) | (b & d) | (c & d)
-                       a += g + X[x] + 0x5a827999
-                       a = a<<s | a>>(32-s)
-                       a, b, c, d = d, a, b, c
-               }
-
-               // Round 3.
-               for i := uint(0); i < 16; i++ {
-                       x := xIndex3[i]
-                       s := shift3[i%4]
-                       h := b ^ c ^ d
-                       a += h + X[x] + 0x6ed9eba1
-                       a = a<<s | a>>(32-s)
-                       a, b, c, d = d, a, b, c
-               }
-
-               a += aa
-               b += bb
-               c += cc
-               d += dd
-
-               p = p[_Chunk:]
-               n += _Chunk
-       }
-
-       dig.s[0] = a
-       dig.s[1] = b
-       dig.s[2] = c
-       dig.s[3] = d
-       return n
-}

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/868863aa/cli/vendor/golang.org/x/crypto/nacl/box/box.go
----------------------------------------------------------------------
diff --git a/cli/vendor/golang.org/x/crypto/nacl/box/box.go 
b/cli/vendor/golang.org/x/crypto/nacl/box/box.go
deleted file mode 100644
index ca48a6d..0000000
--- a/cli/vendor/golang.org/x/crypto/nacl/box/box.go
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright 2012 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 box authenticates and encrypts messages using public-key cryptography.
-
-Box uses Curve25519, XSalsa20 and Poly1305 to encrypt and authenticate
-messages. The length of messages is not hidden.
-
-It is the caller's responsibility to ensure the uniqueness of nonces—for
-example, by using nonce 1 for the first message, nonce 2 for the second
-message, etc. Nonces are long enough that randomly generated nonces have
-negligible risk of collision.
-
-This package is interoperable with NaCl: http://nacl.cr.yp.to/box.html.
-*/
-package box // import "golang.org/x/crypto/nacl/box"
-
-import (
-       "golang.org/x/crypto/curve25519"
-       "golang.org/x/crypto/nacl/secretbox"
-       "golang.org/x/crypto/salsa20/salsa"
-       "io"
-)
-
-// Overhead is the number of bytes of overhead when boxing a message.
-const Overhead = secretbox.Overhead
-
-// GenerateKey generates a new public/private key pair suitable for use with
-// Seal and Open.
-func GenerateKey(rand io.Reader) (publicKey, privateKey *[32]byte, err error) {
-       publicKey = new([32]byte)
-       privateKey = new([32]byte)
-       _, err = io.ReadFull(rand, privateKey[:])
-       if err != nil {
-               publicKey = nil
-               privateKey = nil
-               return
-       }
-
-       curve25519.ScalarBaseMult(publicKey, privateKey)
-       return
-}
-
-var zeros [16]byte
-
-// Precompute calculates the shared key between peersPublicKey and privateKey
-// and writes it to sharedKey. The shared key can be used with
-// OpenAfterPrecomputation and SealAfterPrecomputation to speed up processing
-// when using the same pair of keys repeatedly.
-func Precompute(sharedKey, peersPublicKey, privateKey *[32]byte) {
-       curve25519.ScalarMult(sharedKey, privateKey, peersPublicKey)
-       salsa.HSalsa20(sharedKey, &zeros, sharedKey, &salsa.Sigma)
-}
-
-// Seal appends an encrypted and authenticated copy of message to out, which
-// will be Overhead bytes longer than the original and must not overlap. The
-// nonce must be unique for each distinct message for a given pair of keys.
-func Seal(out, message []byte, nonce *[24]byte, peersPublicKey, privateKey 
*[32]byte) []byte {
-       var sharedKey [32]byte
-       Precompute(&sharedKey, peersPublicKey, privateKey)
-       return secretbox.Seal(out, message, nonce, &sharedKey)
-}
-
-// SealAfterPrecomputation performs the same actions as Seal, but takes a
-// shared key as generated by Precompute.
-func SealAfterPrecomputation(out, message []byte, nonce *[24]byte, sharedKey 
*[32]byte) []byte {
-       return secretbox.Seal(out, message, nonce, sharedKey)
-}
-
-// Open authenticates and decrypts a box produced by Seal and appends the
-// message to out, which must not overlap box. The output will be Overhead
-// bytes smaller than box.
-func Open(out, box []byte, nonce *[24]byte, peersPublicKey, privateKey 
*[32]byte) ([]byte, bool) {
-       var sharedKey [32]byte
-       Precompute(&sharedKey, peersPublicKey, privateKey)
-       return secretbox.Open(out, box, nonce, &sharedKey)
-}
-
-// OpenAfterPrecomputation performs the same actions as Open, but takes a
-// shared key as generated by Precompute.
-func OpenAfterPrecomputation(out, box []byte, nonce *[24]byte, sharedKey 
*[32]byte) ([]byte, bool) {
-       return secretbox.Open(out, box, nonce, sharedKey)
-}

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/868863aa/cli/vendor/golang.org/x/crypto/nacl/box/box_test.go
----------------------------------------------------------------------
diff --git a/cli/vendor/golang.org/x/crypto/nacl/box/box_test.go 
b/cli/vendor/golang.org/x/crypto/nacl/box/box_test.go
deleted file mode 100644
index 481ade2..0000000
--- a/cli/vendor/golang.org/x/crypto/nacl/box/box_test.go
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright 2012 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 box
-
-import (
-       "bytes"
-       "crypto/rand"
-       "encoding/hex"
-       "testing"
-
-       "golang.org/x/crypto/curve25519"
-)
-
-func TestSealOpen(t *testing.T) {
-       publicKey1, privateKey1, _ := GenerateKey(rand.Reader)
-       publicKey2, privateKey2, _ := GenerateKey(rand.Reader)
-
-       if *privateKey1 == *privateKey2 {
-               t.Fatalf("private keys are equal!")
-       }
-       if *publicKey1 == *publicKey2 {
-               t.Fatalf("public keys are equal!")
-       }
-       message := []byte("test message")
-       var nonce [24]byte
-
-       box := Seal(nil, message, &nonce, publicKey1, privateKey2)
-       opened, ok := Open(nil, box, &nonce, publicKey2, privateKey1)
-       if !ok {
-               t.Fatalf("failed to open box")
-       }
-
-       if !bytes.Equal(opened, message) {
-               t.Fatalf("got %x, want %x", opened, message)
-       }
-
-       for i := range box {
-               box[i] ^= 0x40
-               _, ok := Open(nil, box, &nonce, publicKey2, privateKey1)
-               if ok {
-                       t.Fatalf("opened box with byte %d corrupted", i)
-               }
-               box[i] ^= 0x40
-       }
-}
-
-func TestBox(t *testing.T) {
-       var privateKey1, privateKey2 [32]byte
-       for i := range privateKey1[:] {
-               privateKey1[i] = 1
-       }
-       for i := range privateKey2[:] {
-               privateKey2[i] = 2
-       }
-
-       var publicKey1 [32]byte
-       curve25519.ScalarBaseMult(&publicKey1, &privateKey1)
-       var message [64]byte
-       for i := range message[:] {
-               message[i] = 3
-       }
-
-       var nonce [24]byte
-       for i := range nonce[:] {
-               nonce[i] = 4
-       }
-
-       box := Seal(nil, message[:], &nonce, &publicKey1, &privateKey2)
-
-       // expected was generated using the C implementation of NaCl.
-       expected, _ := 
hex.DecodeString("78ea30b19d2341ebbdba54180f821eec265cf86312549bea8a37652a8bb94f07b78a73ed1708085e6ddd0e943bbdeb8755079a37eb31d86163ce241164a47629c0539f330b4914cd135b3855bc2a2dfc")
-
-       if !bytes.Equal(box, expected) {
-               t.Fatalf("box didn't match, got\n%x\n, expected\n%x", box, 
expected)
-       }
-}

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/868863aa/cli/vendor/golang.org/x/crypto/nacl/secretbox/secretbox.go
----------------------------------------------------------------------
diff --git a/cli/vendor/golang.org/x/crypto/nacl/secretbox/secretbox.go 
b/cli/vendor/golang.org/x/crypto/nacl/secretbox/secretbox.go
deleted file mode 100644
index dbf31bb..0000000
--- a/cli/vendor/golang.org/x/crypto/nacl/secretbox/secretbox.go
+++ /dev/null
@@ -1,149 +0,0 @@
-// Copyright 2012 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 secretbox encrypts and authenticates small messages.
-
-Secretbox uses XSalsa20 and Poly1305 to encrypt and authenticate messages with
-secret-key cryptography. The length of messages is not hidden.
-
-It is the caller's responsibility to ensure the uniqueness of nonces—for
-example, by using nonce 1 for the first message, nonce 2 for the second
-message, etc. Nonces are long enough that randomly generated nonces have
-negligible risk of collision.
-
-This package is interoperable with NaCl: http://nacl.cr.yp.to/secretbox.html.
-*/
-package secretbox // import "golang.org/x/crypto/nacl/secretbox"
-
-import (
-       "golang.org/x/crypto/poly1305"
-       "golang.org/x/crypto/salsa20/salsa"
-)
-
-// Overhead is the number of bytes of overhead when boxing a message.
-const Overhead = poly1305.TagSize
-
-// setup produces a sub-key and Salsa20 counter given a nonce and key.
-func setup(subKey *[32]byte, counter *[16]byte, nonce *[24]byte, key 
*[32]byte) {
-       // We use XSalsa20 for encryption so first we need to generate a
-       // key and nonce with HSalsa20.
-       var hNonce [16]byte
-       copy(hNonce[:], nonce[:])
-       salsa.HSalsa20(subKey, &hNonce, key, &salsa.Sigma)
-
-       // The final 8 bytes of the original nonce form the new nonce.
-       copy(counter[:], nonce[16:])
-}
-
-// sliceForAppend takes a slice and a requested number of bytes. It returns a
-// slice with the contents of the given slice followed by that many bytes and a
-// second slice that aliases into it and contains only the extra bytes. If the
-// original slice has sufficient capacity then no allocation is performed.
-func sliceForAppend(in []byte, n int) (head, tail []byte) {
-       if total := len(in) + n; cap(in) >= total {
-               head = in[:total]
-       } else {
-               head = make([]byte, total)
-               copy(head, in)
-       }
-       tail = head[len(in):]
-       return
-}
-
-// Seal appends an encrypted and authenticated copy of message to out, which
-// must not overlap message. The key and nonce pair must be unique for each
-// distinct message and the output will be Overhead bytes longer than message.
-func Seal(out, message []byte, nonce *[24]byte, key *[32]byte) []byte {
-       var subKey [32]byte
-       var counter [16]byte
-       setup(&subKey, &counter, nonce, key)
-
-       // The Poly1305 key is generated by encrypting 32 bytes of zeros. Since
-       // Salsa20 works with 64-byte blocks, we also generate 32 bytes of
-       // keystream as a side effect.
-       var firstBlock [64]byte
-       salsa.XORKeyStream(firstBlock[:], firstBlock[:], &counter, &subKey)
-
-       var poly1305Key [32]byte
-       copy(poly1305Key[:], firstBlock[:])
-
-       ret, out := sliceForAppend(out, len(message)+poly1305.TagSize)
-
-       // We XOR up to 32 bytes of message with the keystream generated from
-       // the first block.
-       firstMessageBlock := message
-       if len(firstMessageBlock) > 32 {
-               firstMessageBlock = firstMessageBlock[:32]
-       }
-
-       tagOut := out
-       out = out[poly1305.TagSize:]
-       for i, x := range firstMessageBlock {
-               out[i] = firstBlock[32+i] ^ x
-       }
-       message = message[len(firstMessageBlock):]
-       ciphertext := out
-       out = out[len(firstMessageBlock):]
-
-       // Now encrypt the rest.
-       counter[8] = 1
-       salsa.XORKeyStream(out, message, &counter, &subKey)
-
-       var tag [poly1305.TagSize]byte
-       poly1305.Sum(&tag, ciphertext, &poly1305Key)
-       copy(tagOut, tag[:])
-
-       return ret
-}
-
-// Open authenticates and decrypts a box produced by Seal and appends the
-// message to out, which must not overlap box. The output will be Overhead
-// bytes smaller than box.
-func Open(out []byte, box []byte, nonce *[24]byte, key *[32]byte) ([]byte, 
bool) {
-       if len(box) < Overhead {
-               return nil, false
-       }
-
-       var subKey [32]byte
-       var counter [16]byte
-       setup(&subKey, &counter, nonce, key)
-
-       // The Poly1305 key is generated by encrypting 32 bytes of zeros. Since
-       // Salsa20 works with 64-byte blocks, we also generate 32 bytes of
-       // keystream as a side effect.
-       var firstBlock [64]byte
-       salsa.XORKeyStream(firstBlock[:], firstBlock[:], &counter, &subKey)
-
-       var poly1305Key [32]byte
-       copy(poly1305Key[:], firstBlock[:])
-       var tag [poly1305.TagSize]byte
-       copy(tag[:], box)
-
-       if !poly1305.Verify(&tag, box[poly1305.TagSize:], &poly1305Key) {
-               return nil, false
-       }
-
-       ret, out := sliceForAppend(out, len(box)-Overhead)
-
-       // We XOR up to 32 bytes of box with the keystream generated from
-       // the first block.
-       box = box[Overhead:]
-       firstMessageBlock := box
-       if len(firstMessageBlock) > 32 {
-               firstMessageBlock = firstMessageBlock[:32]
-       }
-       for i, x := range firstMessageBlock {
-               out[i] = firstBlock[32+i] ^ x
-       }
-
-       box = box[len(firstMessageBlock):]
-       out = out[len(firstMessageBlock):]
-
-       // Now decrypt the rest.
-       counter[8] = 1
-       salsa.XORKeyStream(out, box, &counter, &subKey)
-
-       return ret, true
-}

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/868863aa/cli/vendor/golang.org/x/crypto/nacl/secretbox/secretbox_test.go
----------------------------------------------------------------------
diff --git a/cli/vendor/golang.org/x/crypto/nacl/secretbox/secretbox_test.go 
b/cli/vendor/golang.org/x/crypto/nacl/secretbox/secretbox_test.go
deleted file mode 100644
index 664dc15..0000000
--- a/cli/vendor/golang.org/x/crypto/nacl/secretbox/secretbox_test.go
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright 2012 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 secretbox
-
-import (
-       "bytes"
-       "crypto/rand"
-       "encoding/hex"
-       "testing"
-)
-
-func TestSealOpen(t *testing.T) {
-       var key [32]byte
-       var nonce [24]byte
-
-       rand.Reader.Read(key[:])
-       rand.Reader.Read(nonce[:])
-
-       var box, opened []byte
-
-       for msgLen := 0; msgLen < 128; msgLen += 17 {
-               message := make([]byte, msgLen)
-               rand.Reader.Read(message)
-
-               box = Seal(box[:0], message, &nonce, &key)
-               var ok bool
-               opened, ok = Open(opened[:0], box, &nonce, &key)
-               if !ok {
-                       t.Errorf("%d: failed to open box", msgLen)
-                       continue
-               }
-
-               if !bytes.Equal(opened, message) {
-                       t.Errorf("%d: got %x, expected %x", msgLen, opened, 
message)
-                       continue
-               }
-       }
-
-       for i := range box {
-               box[i] ^= 0x20
-               _, ok := Open(opened[:0], box, &nonce, &key)
-               if ok {
-                       t.Errorf("box was opened after corrupting byte %d", i)
-               }
-               box[i] ^= 0x20
-       }
-}
-
-func TestSecretBox(t *testing.T) {
-       var key [32]byte
-       var nonce [24]byte
-       var message [64]byte
-
-       for i := range key[:] {
-               key[i] = 1
-       }
-       for i := range nonce[:] {
-               nonce[i] = 2
-       }
-       for i := range message[:] {
-               message[i] = 3
-       }
-
-       box := Seal(nil, message[:], &nonce, &key)
-       // expected was generated using the C implementation of NaCl.
-       expected, _ := 
hex.DecodeString("8442bc313f4626f1359e3b50122b6ce6fe66ddfe7d39d14e637eb4fd5b45beadab55198df6ab5368439792a23c87db70acb6156dc5ef957ac04f6276cf6093b84be77ff0849cc33e34b7254d5a8f65ad")
-
-       if !bytes.Equal(box, expected) {
-               t.Fatalf("box didn't match, got\n%x\n, expected\n%x", box, 
expected)
-       }
-}
-
-func TestAppend(t *testing.T) {
-       var key [32]byte
-       var nonce [24]byte
-       var message [8]byte
-
-       out := make([]byte, 4)
-       box := Seal(out, message[:], &nonce, &key)
-       if !bytes.Equal(box[:4], out[:4]) {
-               t.Fatalf("Seal didn't correctly append")
-       }
-
-       out = make([]byte, 4, 100)
-       box = Seal(out, message[:], &nonce, &key)
-       if !bytes.Equal(box[:4], out[:4]) {
-               t.Fatalf("Seal didn't correctly append with sufficient 
capacity.")
-       }
-}

Reply via email to