Skip to content

Commit

Permalink
Fix compilation error in SM2 with qat_contig_mem
Browse files Browse the repository at this point in the history 
Signed-off-by: Yogaraj Alamenda <[email protected]>
  • Loading branch information
@Yogaraj-Alamenda
Yogaraj-Alamenda committed Mar 26, 2024
1 parent 9be30e0 commit 65c5fba
Show file tree
Hide file tree
Showing 21 changed files with 8 additions and 125 deletions.
6 changes: 6 additions & 0 deletions e_qat.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,12 @@
# include "cpa.h"
# include "cpa_types.h"
# include "cpa_cy_common.h"
# ifdef USE_QAT_CONTIG_MEM
# include "qae_mem_utils.h"
# endif
# ifdef USE_USDM_MEM
# include "qat_hw_usdm_inf.h"
# endif
# endif

# ifdef QAT_SW
Expand Down
6 changes: 0 additions & 6 deletions qat_events.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,6 @@

/* QAT includes */
#ifdef QAT_HW
# ifdef USE_QAT_CONTIG_MEM
# include "qae_mem_utils.h"
# endif
# ifdef USE_USDM_MEM
# include "qat_hw_usdm_inf.h"
# endif
# include "cpa.h"
# include "cpa_types.h"
#endif
Expand Down
6 changes: 0 additions & 6 deletions qat_fork.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,6 @@

/* QAT includes */
#ifdef QAT_HW
# ifdef USE_QAT_CONTIG_MEM
# include "qae_mem_utils.h"
# endif
# ifdef USE_USDM_MEM
# include "qat_hw_usdm_inf.h"
# endif
# include "cpa.h"
# include "cpa_types.h"

Expand Down
6 changes: 0 additions & 6 deletions qat_hw_asym_common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,6 @@
#include "cpa_cy_ln.h"

#include "qat_hw_asym_common.h"
#ifdef USE_QAT_CONTIG_MEM
# include "qae_mem_utils.h"
#endif
#ifdef USE_USDM_MEM
# include "qat_hw_usdm_inf.h"
#endif
#include "qat_utils.h"
#include "e_qat.h"
#include "qat_hw_callback.h"
Expand Down
6 changes: 0 additions & 6 deletions qat_hw_callback.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,6 @@
#include <openssl/err.h>

/* QAT includes */
#ifdef USE_QAT_CONTIG_MEM
# include "qae_mem_utils.h"
#endif
#ifdef USE_USDM_MEM
# include "qat_hw_usdm_inf.h"
#endif
#include "cpa.h"
#include "cpa_types.h"
#include "icp_sal_poll.h"
Expand Down
7 changes: 0 additions & 7 deletions qat_hw_chachapoly.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,6 @@
#include "qat_evp.h"
#include "qat_hw_chachapoly.h"

#ifdef USE_QAT_CONTIG_MEM
# include "qae_mem_utils.h"
#endif
#ifdef USE_USDM_MEM
# include "qat_hw_usdm_inf.h"
#endif

#ifdef QAT_HW_INTREE
# define ENABLE_QAT_HW_CHACHAPOLY
#endif
Expand Down
6 changes: 0 additions & 6 deletions qat_hw_ciphers.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,6 @@
#endif
#include <pthread.h>
#include <signal.h>
#ifdef USE_QAT_CONTIG_MEM
# include "qae_mem_utils.h"
#endif
#ifdef USE_USDM_MEM
# include "qat_hw_usdm_inf.h"
#endif

#include "qat_utils.h"
#include "e_qat.h"
Expand Down
6 changes: 0 additions & 6 deletions qat_hw_dh.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,6 @@
#include <pthread.h>
#include <signal.h>
#include "qat_hw_dh.h"
#ifdef USE_QAT_CONTIG_MEM
# include "qae_mem_utils.h"
#endif
#ifdef USE_USDM_MEM
# include "qat_hw_usdm_inf.h"
#endif
#include <openssl/err.h>
#include <openssl/bn.h>
#include "qat_hw_asym_common.h"
Expand Down
6 changes: 0 additions & 6 deletions qat_hw_dsa.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,6 @@
#include "qat_hw_callback.h"
#include "qat_hw_polling.h"
#include "qat_events.h"
#ifdef USE_QAT_CONTIG_MEM
# include "qae_mem_utils.h"
#endif
#ifdef USE_USDM_MEM
# include "qat_hw_usdm_inf.h"
#endif
#ifdef ENABLE_QAT_FIPS
# include "qat_prov_cmvp.h"
#endif
Expand Down
6 changes: 0 additions & 6 deletions qat_hw_ec.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,6 @@
#include "qat_hw_polling.h"
#include "qat_events.h"
#include "qat_hw_asym_common.h"
#ifdef USE_QAT_CONTIG_MEM
# include "qae_mem_utils.h"
#endif
#ifdef USE_USDM_MEM
# include "qat_hw_usdm_inf.h"
#endif
#include "qat_utils.h"
#include "qat_hw_ec.h"
#include "qat_evp.h"
Expand Down
6 changes: 0 additions & 6 deletions qat_hw_gcm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,6 @@
#include <string.h>
#include <pthread.h>
#include <signal.h>
#ifdef USE_QAT_CONTIG_MEM
# include "qae_mem_utils.h"
#endif
#ifdef USE_USDM_MEM
# include "qat_hw_usdm_inf.h"
#endif
#include "e_qat.h"
#include "qat_utils.h"
#include "qat_hw_callback.h"
Expand Down
7 changes: 0 additions & 7 deletions qat_hw_hkdf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,6 @@
#include "qat_events.h"
#include "qat_hw_hkdf.h"

#ifdef USE_QAT_CONTIG_MEM
# include "qae_mem_utils.h"
#endif
#ifdef USE_USDM_MEM
# include "qat_hw_usdm_inf.h"
#endif

#ifdef ENABLE_QAT_FIPS
# include "qat_prov_cmvp.h"
#endif
Expand Down
6 changes: 0 additions & 6 deletions qat_hw_init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,6 @@
#include <openssl/crypto.h>

/* QAT includes */
#ifdef USE_QAT_CONTIG_MEM
# include "qae_mem_utils.h"
#endif
#ifdef USE_USDM_MEM
# include "qat_hw_usdm_inf.h"
#endif
#include "cpa.h"
#include "cpa_cy_im.h"
#include "cpa_cy_common.h"
Expand Down
6 changes: 0 additions & 6 deletions qat_hw_polling.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,6 @@

/* QAT includes */
#ifdef QAT_HW
# ifdef USE_QAT_CONTIG_MEM
# include "qae_mem_utils.h"
# endif
# ifdef USE_USDM_MEM
# include "qat_hw_usdm_inf.h"
# endif
# include "cpa.h"
# include "cpa_cy_im.h"
# include "cpa_types.h"
Expand Down
7 changes: 0 additions & 7 deletions qat_hw_prf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,6 @@

#include "qat_hw_prf.h"

#ifdef USE_QAT_CONTIG_MEM
# include "qae_mem_utils.h"
#endif
#ifdef USE_USDM_MEM
# include "qat_hw_usdm_inf.h"
#endif

#ifdef ENABLE_QAT_FIPS
# include "qat_prov_cmvp.h"
#endif
Expand Down
6 changes: 0 additions & 6 deletions qat_hw_rsa.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,6 @@
#include <string.h>
#include <unistd.h>
#include <signal.h>
#ifdef USE_QAT_CONTIG_MEM
# include "qae_mem_utils.h"
#endif
#ifdef USE_USDM_MEM
# include "qat_hw_usdm_inf.h"
#endif
#include "qat_utils.h"
#include "e_qat.h"
#include "qat_hw_callback.h"
Expand Down
8 changes: 1 addition & 7 deletions qat_hw_rsa_crt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,8 @@
#include <openssl/err.h>
#include <string.h>
#include <unistd.h>
#ifdef USE_QAT_CONTIG_MEM
# include "qae_mem_utils.h"
#endif
#ifdef USE_USDM_MEM
# include "qat_hw_usdm_inf.h"
#endif
#include "qat_utils.h"
# include "e_qat.h"
#include "e_qat.h"
#include "qat_hw_callback.h"
#include "qat_hw_polling.h"
#include "qat_events.h"
Expand Down
6 changes: 0 additions & 6 deletions qat_hw_sha3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,6 @@
#include <string.h>
#include <pthread.h>
#include <signal.h>
#ifdef USE_QAT_CONTIG_MEM
# include "qae_mem_utils.h"
#endif
#ifdef USE_USDM_MEM
# include "qat_hw_usdm_inf.h"
#endif
#include "e_qat.h"
#include "qat_utils.h"
#include "qat_hw_callback.h"
Expand Down
7 changes: 0 additions & 7 deletions qat_hw_sm2.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,6 @@
# include "qat_hw_callback.h"
# include "qat_hw_polling.h"
# include "qat_hw_asym_common.h"
# ifdef USE_USDM_MEM
# include "qat_hw_usdm_inf.h"
# endif
# if defined(QAT_OPENSSL_3)|| defined(QAT_OPENSSL_PROVIDER)
# include "qat_prov_sign_sm2.h"
# endif
Expand All @@ -78,10 +75,6 @@
# include "cpa_cy_ecsm2.h"
# endif
# include "cpa_dev.h"
# ifdef USE_QAT_CONTIG_MEM
# include "qae_mem_utils.h"
# endif
# include "qae_mem.h"

/* The default user id as specified in GM/T 0009-2012 */
# define SM2_DEFAULT_USERID "1234567812345678"
Expand Down
7 changes: 1 addition & 6 deletions qat_hw_sm3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,7 @@
#include <string.h>
#include <pthread.h>
#include <signal.h>
#ifdef USE_QAT_CONTIG_MEM
# include "qae_mem_utils.h"
#endif
#ifdef USE_USDM_MEM
# include "qat_hw_usdm_inf.h"
#endif

#include "e_qat.h"
#include "qat_utils.h"
#include "qat_hw_callback.h"
Expand Down
6 changes: 0 additions & 6 deletions qat_hw_sm4_cbc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,6 @@

#include <pthread.h>
#include <signal.h>
#ifdef USE_QAT_CONTIG_MEM
# include "qae_mem_utils.h"
#endif
#ifdef USE_USDM_MEM
# include "qat_hw_usdm_inf.h"
#endif

#include "qat_utils.h"
#include "e_qat.h"
Expand Down

0 comments on commit 65c5fba

Please sign in to comment.