update Intel copyright years to 2014

[dpdk.git] / examples / dpdk_qat / crypto.c

diff --git a/examples/dpdk_qat/crypto.c b/examples/dpdk_qat/crypto.c
index 99680be..9321862 100644 (file)
--- a/examples/dpdk_qat/crypto.c
+++ b/examples/dpdk_qat/crypto.c
@@ -1,36 +1,34 @@
 /*-
  *   BSD LICENSE
  * 
- *   Copyright(c) 2010-2012 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   All rights reserved.
  * 
- *   Redistribution and use in source and binary forms, with or without 
- *   modification, are permitted provided that the following conditions 
+ *   Redistribution and use in source and binary forms, with or without
+ *   modification, are permitted provided that the following conditions
  *   are met:
  * 
- *     * Redistributions of source code must retain the above copyright 
+ *     * Redistributions of source code must retain the above copyright
  *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright 
- *       notice, this list of conditions and the following disclaimer in 
- *       the documentation and/or other materials provided with the 
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in
+ *       the documentation and/or other materials provided with the
  *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its 
- *       contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Intel Corporation nor the names of its
+ *       contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
  * 
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- *  version: DPDK.L.1.2.3-3
  */
 
 #include <stdio.h>
@@ -73,10 +71,6 @@
 
 #include "crypto.h"
 
-#define NUM_HMAC       (10)
-#define NUM_CRYPTO     (7)
-
-
 /* CIPHER KEY LENGTHS */
 #define KEY_SIZE_64_IN_BYTES   (64 / 8)
 #define KEY_SIZE_56_IN_BYTES   (56 / 8)
@@ -204,7 +198,7 @@ struct glob_keys g_crypto_hash_keys = {
  * +18 takes this to the next cache line.
  */
 
-#define CRYPTO_OFFSET_TO_OPDATA        (ETHER_MAX_LEN+18)
+#define CRYPTO_OFFSET_TO_OPDATA                (ETHER_MAX_LEN+18)
 
 /*
  * Default number of requests to place on the hardware ring before kicking the
@@ -561,6 +555,10 @@ initCySymSession(const int pkt_cipher_alg,
                return CPA_STATUS_SUCCESS;
        }
 
+       /* Set flags for digest operations */
+       sessionSetupData.digestIsAppended = CPA_FALSE;
+       sessionSetupData.verifyDigest = CPA_TRUE;
+
        /* Get the session context size based on the crypto and/or hash operations*/
        status = cpaCySymDpSessionCtxGetSize(cyInstanceHandle, &sessionSetupData,
                        &sessionCtxSizeInBytes);
@@ -577,7 +575,7 @@ initCySymSession(const int pkt_cipher_alg,
        }
 
        status = cpaCySymDpInitSession(cyInstanceHandle, &sessionSetupData,
-                       CPA_TRUE,CPA_FALSE, *ppSessionCtx);
+                       *ppSessionCtx);
        if (CPA_STATUS_SUCCESS != status) {
                printf("Crypto: cpaCySymDpInitSession failed with status %"PRId32"\n", status);
                return CPA_STATUS_FAIL;
@@ -618,11 +616,11 @@ initSessionDataTables(struct qa_core_conf *qaCoreConf,uint32_t lcore_id)
 int
 crypto_init(void)
 {
-       if (CPA_STATUS_SUCCESS != icp_sal_userStart("SSL")) {
+       if (CPA_STATUS_SUCCESS != icp_sal_userStartMultiProcess("SSL",CPA_FALSE)) {
                printf("Crypto: Could not start sal for user space\n");
                return CPA_STATUS_FAIL;
        }
-       printf("Crypto: icp_sal_userStart(\"SSL\")\n");
+       printf("Crypto: icp_sal_userStartMultiProcess(\"SSL\",CPA_FALSE)\n");
        return 0;
 }
 
@@ -759,6 +757,9 @@ crypto_encrypt(struct rte_mbuf *rte_buff, enum cipher_alg c, enum hash_alg h)
                                        + CRYPTO_OFFSET_TO_OPDATA);
        uint32_t lcore_id;
 
+       if (unlikely(c >= NUM_CRYPTO || h >= NUM_HMAC))
+               return CRYPTO_RESULT_FAIL;
+
        lcore_id = rte_lcore_id();
 
        bzero(opData, sizeof(CpaCySymDpOpData));
@@ -831,6 +832,9 @@ crypto_decrypt(struct rte_mbuf *rte_buff, enum cipher_alg c, enum hash_alg h)
                        + CRYPTO_OFFSET_TO_OPDATA);
        uint32_t lcore_id;
 
+       if (unlikely(c >= NUM_CRYPTO || h >= NUM_HMAC))
+               return CRYPTO_RESULT_FAIL;
+
        lcore_id = rte_lcore_id();
 
        bzero(opData, sizeof(CpaCySymDpOpData));