internal/chacha20: move up from chacha20poly1305/internal/chacha20

This exposes the chacha20 stream cipher to the entire x/crypto
package, and in particular to the SSH package, which uses separate,
unauthenticated chacha20 encryption for packet lengths.

Change-Id: I0b705482128f0657c09292370f03d08b588f7fec
Reviewed-on: https://go-review.googlesource.com/87075
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
diff --git a/chacha20poly1305/chacha20poly1305_generic.go b/chacha20poly1305/chacha20poly1305_generic.go
index f7e4bfb..4ac014f 100644
--- a/chacha20poly1305/chacha20poly1305_generic.go
+++ b/chacha20poly1305/chacha20poly1305_generic.go
@@ -7,7 +7,7 @@
 import (
 	"encoding/binary"
 
-	"golang.org/x/crypto/chacha20poly1305/internal/chacha20"
+	"golang.org/x/crypto/internal/chacha20"
 	"golang.org/x/crypto/poly1305"
 )
 
diff --git a/chacha20poly1305/internal/chacha20/chacha_generic.go b/internal/chacha20/chacha_generic.go
similarity index 100%
rename from chacha20poly1305/internal/chacha20/chacha_generic.go
rename to internal/chacha20/chacha_generic.go
diff --git a/chacha20poly1305/internal/chacha20/chacha_test.go b/internal/chacha20/chacha_test.go
similarity index 100%
rename from chacha20poly1305/internal/chacha20/chacha_test.go
rename to internal/chacha20/chacha_test.go