3 files changed, 103 insertions, 6 deletions

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 27307981f88e..50402dc0ea35 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -336,6 +336,15 @@ config CRYPTO_CRC32C_INTEL
           gain performance compared with software implementation.
           Module will be crc32c-intel.
 
+config CRYPTO_CRC32C_SPARC64
+        tristate "CRC32c CRC algorithm (SPARC64)"
+        depends on SPARC64
+        select CRYPTO_HASH
+        select CRC32
+        help
+          CRC32c CRC algorithm implemented using sparc64 crypto instructions,
+          when available.
+
 config CRYPTO_GHASH
         tristate "GHASH digest algorithm"
         select CRYPTO_GF128MUL
@@ -354,6 +363,15 @@ config CRYPTO_MD5
         help
           MD5 message digest algorithm (RFC1321).
 
+config CRYPTO_MD5_SPARC64
+        tristate "MD5 digest algorithm (SPARC64)"
+        depends on SPARC64
+        select CRYPTO_MD5
+        select CRYPTO_HASH
+        help
+          MD5 message digest algorithm (RFC1321) implemented
+          using sparc64 crypto instructions, when available.
+
 config CRYPTO_MICHAEL_MIC
         tristate "Michael MIC keyed digest algorithm"
         select CRYPTO_HASH
@@ -433,6 +451,15 @@ config CRYPTO_SHA1_SSSE3
           using Supplemental SSE3 (SSSE3) instructions or Advanced Vector
           Extensions (AVX), when available.
 
+config CRYPTO_SHA1_SPARC64
+        tristate "SHA1 digest algorithm (SPARC64)"
+        depends on SPARC64
+        select CRYPTO_SHA1
+        select CRYPTO_HASH
+        help
+          SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2) implemented
+          using sparc64 crypto instructions, when available.
+
 config CRYPTO_SHA1_ARM
         tristate "SHA1 digest algorithm (ARM-asm)"
         depends on ARM
@@ -454,6 +481,15 @@ config CRYPTO_SHA256
           This code also includes SHA-224, a 224 bit hash with 112 bits
           of security against collision attacks.
 
+config CRYPTO_SHA256_SPARC64
+        tristate "SHA224 and SHA256 digest algorithm (SPARC64)"
+        depends on SPARC64
+        select CRYPTO_SHA256
+        select CRYPTO_HASH
+        help
+          SHA-256 secure hash standard (DFIPS 180-2) implemented
+          using sparc64 crypto instructions, when available.
+
 config CRYPTO_SHA512
         tristate "SHA384 and SHA512 digest algorithms"
         select CRYPTO_HASH
@@ -466,6 +502,15 @@ config CRYPTO_SHA512
           This code also includes SHA-384, a 384 bit hash with 192 bits
           of security against collision attacks.
 
+config CRYPTO_SHA512_SPARC64
+        tristate "SHA384 and SHA512 digest algorithm (SPARC64)"
+        depends on SPARC64
+        select CRYPTO_SHA512
+        select CRYPTO_HASH
+        help
+          SHA-512 secure hash standard (DFIPS 180-2) implemented
+          using sparc64 crypto instructions, when available.
+
 config CRYPTO_TGR192
         tristate "Tiger digest algorithms"
         select CRYPTO_HASH
@@ -599,6 +644,34 @@ config CRYPTO_AES_NI_INTEL
           ECB, CBC, LRW, PCBC, XTS. The 64 bit version has additional
           acceleration for CTR.
 
+config CRYPTO_AES_SPARC64
+        tristate "AES cipher algorithms (SPARC64)"
+        depends on SPARC64
+        select CRYPTO_CRYPTD
+        select CRYPTO_ALGAPI
+        help
+          Use SPARC64 crypto opcodes for AES algorithm.
+
+          AES cipher algorithms (FIPS-197). AES uses the Rijndael
+          algorithm.
+
+          Rijndael appears to be consistently a very good performer in
+          both hardware and software across a wide range of computing
+          environments regardless of its use in feedback or non-feedback
+          modes. Its key setup time is excellent, and its key agility is
+          good. Rijndael's very low memory requirements make it very well
+          suited for restricted-space environments, in which it also
+          demonstrates excellent performance. Rijndael's operations are
+          among the easiest to defend against power and timing attacks.
+
+          The AES specifies three key sizes: 128, 192 and 256 bits
+
+          See <http://csrc.nist.gov/encryption/aes/> for more information.
+
+          In addition to AES cipher algorithm support, the acceleration
+          for some popular block cipher mode is supported too, including
+          ECB and CBC.
+
 config CRYPTO_AES_ARM
         tristate "AES cipher algorithms (ARM-asm)"
         depends on ARM
@@ -720,6 +793,22 @@ config CRYPTO_CAMELLIA_X86_64
           See also:
           <https://info.isl.ntt.co.jp/crypt/eng/camellia/index_s.html>
 
+config CRYPTO_CAMELLIA_SPARC64
+        tristate "Camellia cipher algorithm (SPARC64)"
+        depends on SPARC64
+        depends on CRYPTO
+        select CRYPTO_ALGAPI
+        help
+          Camellia cipher algorithm module (SPARC64).
+
+          Camellia is a symmetric key block cipher developed jointly
+          at NTT and Mitsubishi Electric Corporation.
+
+          The Camellia specifies three key sizes: 128, 192 and 256 bits.
+
+          See also:
+          <https://info.isl.ntt.co.jp/crypt/eng/camellia/index_s.html>
+
 config CRYPTO_CAST5
         tristate "CAST5 (CAST-128) cipher algorithm"
         select CRYPTO_ALGAPI
@@ -771,6 +860,15 @@ config CRYPTO_DES
         help
           DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3).
 
+config CRYPTO_DES_SPARC64
+        tristate "DES and Triple DES EDE cipher algorithms (SPARC64)"
+        depends on SPARC64
+        select CRYPTO_ALGAPI
+        select CRYPTO_DES
+        help
+          DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3),
+          optimized using SPARC64 crypto opcodes.
+
 config CRYPTO_FCRYPT
         tristate "FCrypt cipher algorithm"
         select CRYPTO_ALGAPI
diff --git a/crypto/authenc.c b/crypto/authenc.c
index 5ef7ba6b6a76..d0583a4489e6 100644
--- a/crypto/authenc.c
+++ b/crypto/authenc.c
@@ -336,7 +336,7 @@ static int crypto_authenc_genicv(struct aead_request *req, u8 *iv,
                 cryptlen += ivsize;
         }
 
-        if (sg_is_last(assoc)) {
+        if (req->assoclen && sg_is_last(assoc)) {
                 authenc_ahash_fn = crypto_authenc_ahash;
                 sg_init_table(asg, 2);
                 sg_set_page(asg, sg_page(assoc), assoc->length, assoc->offset);
@@ -490,7 +490,7 @@ static int crypto_authenc_iverify(struct aead_request *req, u8 *iv,
                 cryptlen += ivsize;
         }
 
-        if (sg_is_last(assoc)) {
+        if (req->assoclen && sg_is_last(assoc)) {
                 authenc_ahash_fn = crypto_authenc_ahash;
                 sg_init_table(asg, 2);
                 sg_set_page(asg, sg_page(assoc), assoc->length, assoc->offset);
diff --git a/crypto/crypto_user.c b/crypto/crypto_user.c
index b590471abfa1..35d700a97d79 100644
--- a/crypto/crypto_user.c
+++ b/crypto/crypto_user.c
@@ -166,7 +166,7 @@ static int crypto_report_alg(struct crypto_alg *alg,
         struct crypto_user_alg *ualg;
         int err = 0;
 
-        nlh = nlmsg_put(skb, NETLINK_CB(in_skb).pid, info->nlmsg_seq,
+        nlh = nlmsg_put(skb, NETLINK_CB(in_skb).portid, info->nlmsg_seq,
                         CRYPTO_MSG_GETALG, sizeof(*ualg), info->nlmsg_flags);
         if (!nlh) {
                 err = -EMSGSIZE;
@@ -216,7 +216,7 @@ static int crypto_report(struct sk_buff *in_skb, struct nlmsghdr *in_nlh,
         if (err)
                 return err;
 
-        return nlmsg_unicast(crypto_nlsk, skb, NETLINK_CB(in_skb).pid);
+        return nlmsg_unicast(crypto_nlsk, skb, NETLINK_CB(in_skb).portid);
 }
 
 static int crypto_dump_report(struct sk_buff *skb, struct netlink_callback *cb)
@@ -500,8 +500,7 @@ static int __init crypto_user_init(void)
                 .input  = crypto_netlink_rcv,
         };
 
-        crypto_nlsk = netlink_kernel_create(&init_net, NETLINK_CRYPTO,
-                                            THIS_MODULE, &cfg);
+        crypto_nlsk = netlink_kernel_create(&init_net, NETLINK_CRYPTO, &cfg);
         if (!crypto_nlsk)
                 return -ENOMEM;