Merge illumos-gate
commitb98df3ce4b0382119a5d723bad127c0ec19db111
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Sun, 3 Mar 2019 22:03:20 +0000 (3 17:03 -0500)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Sun, 3 Mar 2019 22:03:20 +0000 (3 17:03 -0500)
tree07a2ed29bb8f31d9335b4529e24c01ecf1de7e9a
parentc257b9fe0312b732a4a31e31b41179d19b3f0eb5
parentfb2612809ed5f2cb9109db768e63d61f6659f71b
Merge illumos-gate
usr/src/lib/pkcs11/libsoftcrypto/Makefile.com
usr/src/lib/pkcs11/libsoftcrypto/amd64/Makefile
usr/src/lib/pkcs11/pkcs11_softtoken/Makefile.com
usr/src/lib/pkcs11/pkcs11_softtoken/common/softAESCrypt.c
usr/src/lib/pkcs11/pkcs11_softtoken/common/softDecryptUtil.c
usr/src/lib/pkcs11/pkcs11_softtoken/common/softKeystore.c
usr/src/lib/pkcs11/pkcs11_softtoken/common/softSlotToken.c
usr/src/test/crypto-tests/tests/modes/aes/Makefile.subdirs
usr/src/uts/common/crypto/io/aes.c
usr/src/uts/common/crypto/io/crypto.c
usr/src/uts/common/crypto/io/dprov.c