UPSTREAM: Add AES-CBC and Secretbox encryption#14517

Merged

smarterclayton merged 2 commits intoopenshift:masterfrom

smarterclayton:encrypt2

Jun 11, 2017

Commits on Jun 8, 2017

bump(golang.org/x/crypto): add nacl, poly1305, and salsa20
smarterclayton
committed
UPSTREAM: 46916: Add AES-CBC and Secretbox encryption
smarterclayton
committed