Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AES block with gcm #664

Draft
wants to merge 14 commits into
base: main
Choose a base branch
from
Draft

AES block with gcm #664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0c4a299
first aes-gcm sync from OT
Nitsirks Dec 9, 2024
0bcf3a2
syn of caliptra prim from OT for aes-gcm integration
Nitsirks Dec 9, 2024
6f0cc6e
sync tlul files from OT for aes-gcm integration
Nitsirks Dec 9, 2024
c23271d
syncing csrng block from OT for update to aes for aes-gcm
Nitsirks Dec 9, 2024
f0da666
script updates for aes-gcm addition
Nitsirks Dec 9, 2024
b0b357e
fix for lc ctrl that caused enum definition issues between RTL and TB…
Nitsirks Dec 9, 2024
81740a5
updating caliptra top with aes integrated to ahb bus
Nitsirks Dec 9, 2024
5d7ceff
addition of aes as a keyvault read client and dest_valid bit
Nitsirks Dec 9, 2024
1b4ff03
Smoke test for aes gcm
Nitsirks Dec 14, 2024
6a9db2a
Merge branch 'main' into user/dev/michnorris/aes_gcm_integ
Nitsirks Dec 14, 2024
aef6195
file list updates
Nitsirks Dec 14, 2024
ebe1fa6
fixing PR issues
Nitsirks Dec 16, 2024
43ea31a
sync latest rev from OT
Nitsirks Dec 16, 2024
8398544
connecting kv fsm to keymgr interface
Nitsirks Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/scripts/license_header_check.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ exclude_dir='{uvmf*,.git,cmark,caliptra_reg_html,caliptra_top_reg_html,sha256,sh
exclude_suffix='*.{tcl,txt,js,htm,html,json,vf,yml,woff,rsp,rdl,bashrc,waiver,cfg,hex,rc,exe,pdf,png,hvp,svg,log}'
exclude_regs='*_reg*.{sv,rdl}'
exclude_csr='*_csr*.*'
exclude_file='{sglint_waivers,pr_hash,pr_timestamp,.git,.git-comodules,.gitignore,.gitmodules,spyglass_lint.policy,ascent.ctl,clp_mapfile,readme.md,README.md,SECURITY.md,c_sample.c,test_dilithium5,riscv_rev_info}'
exclude_file='{sglint_waivers,pr_hash,pr_timestamp,.git,.git-comodules,.gitignore,.gitmodules,spyglass_lint.policy,ascent.ctl,clp_mapfile,readme.md,README.md,SECURITY.md,c_sample.c,test_dilithium5,riscv_rev_info,tlul_rev_info,aes_rev_info}'
apache_patn='Licensed under the Apache License\|Apache License, Version 2\.0 (the \"License\")'

# Recursive find through repository with some major exclusions
Expand Down
52 changes: 48 additions & 4 deletions src/aes/config/aes.vf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
+incdir+${CALIPTRA_ROOT}/src/entropy_src/rtl
+incdir+${CALIPTRA_ROOT}/src/integration/rtl
+incdir+${CALIPTRA_ROOT}/src/libs/rtl
+incdir+${CALIPTRA_ROOT}/src/edn/rtl
+incdir+${CALIPTRA_ROOT}/src/caliptra_prim/rtl
+incdir+${CALIPTRA_ROOT}/src/lc_ctrl/rtl
+incdir+${CALIPTRA_ROOT}/src/edn/rtl
+incdir+${CALIPTRA_ROOT}/src/caliptra_prim_generic/rtl
+incdir+${CALIPTRA_ROOT}/src/aes/rtl
+incdir+${CALIPTRA_ROOT}/src/tlul/rtl
${CALIPTRA_ROOT}/src/entropy_src/rtl/entropy_src_main_sm_pkg.sv
${CALIPTRA_ROOT}/src/entropy_src/rtl/entropy_src_ack_sm_pkg.sv
${CALIPTRA_ROOT}/src/entropy_src/rtl/entropy_src_reg_pkg.sv
Expand All @@ -23,18 +24,21 @@ ${CALIPTRA_ROOT}/src/libs/rtl/caliptra_icg.sv
${CALIPTRA_ROOT}/src/libs/rtl/clk_gate.sv
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_2ff_sync.sv
${CALIPTRA_ROOT}/src/libs/rtl/skidbuffer.v
${CALIPTRA_ROOT}/src/edn/rtl/edn_pkg.sv
${CALIPTRA_ROOT}/src/libs/rtl/ahb_to_reg_adapter.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_util_pkg.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_alert_pkg.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_subreg_pkg.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_mubi_pkg.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_cipher_pkg.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_pkg.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_sparse_fsm_pkg.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_trivium_pkg.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_secded_pkg.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/keymgr_pkg.sv
${CALIPTRA_ROOT}/src/lc_ctrl/rtl/lc_ctrl_reg_pkg.sv
${CALIPTRA_ROOT}/src/lc_ctrl/rtl/lc_ctrl_state_pkg.sv
${CALIPTRA_ROOT}/src/lc_ctrl/rtl/lc_ctrl_pkg.sv
${CALIPTRA_ROOT}/src/edn/rtl/edn_pkg.sv
${CALIPTRA_ROOT}/src/libs/rtl/ahb_to_reg_adapter.sv
${CALIPTRA_ROOT}/src/caliptra_prim_generic/rtl/caliptra_prim_generic_flop_en.sv
${CALIPTRA_ROOT}/src/caliptra_prim_generic/rtl/caliptra_prim_generic_flop.sv
${CALIPTRA_ROOT}/src/caliptra_prim_generic/rtl/caliptra_prim_generic_buf.sv
Expand Down Expand Up @@ -69,9 +73,28 @@ ${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_arbiter_ppc.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_sum_tree.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_subreg_ext.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_edge_detector.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_trivium.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_subreg_shadow.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_sync_reqack_data.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_sync_reqack.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_secded_inv_39_32_enc.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_secded_inv_39_32_dec.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_secded_inv_64_57_enc.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_secded_inv_64_57_dec.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_gf_mult.sv
${CALIPTRA_ROOT}/src/aes/rtl/aes_reg_pkg.sv
${CALIPTRA_ROOT}/src/aes/rtl/aes_pkg.sv
${CALIPTRA_ROOT}/src/aes/rtl/aes_sbox_canright_pkg.sv
${CALIPTRA_ROOT}/src/tlul/rtl/tlul_pkg.sv
${CALIPTRA_ROOT}/src/tlul/rtl/tlul_adapter_vh.sv
${CALIPTRA_ROOT}/src/tlul/rtl/tlul_adapter_reg.sv
${CALIPTRA_ROOT}/src/tlul/rtl/tlul_cmd_intg_gen.sv
${CALIPTRA_ROOT}/src/tlul/rtl/tlul_cmd_intg_chk.sv
${CALIPTRA_ROOT}/src/tlul/rtl/tlul_rsp_intg_gen.sv
${CALIPTRA_ROOT}/src/tlul/rtl/tlul_rsp_intg_chk.sv
${CALIPTRA_ROOT}/src/tlul/rtl/tlul_data_integ_dec.sv
${CALIPTRA_ROOT}/src/tlul/rtl/tlul_data_integ_enc.sv
${CALIPTRA_ROOT}/src/tlul/rtl/tlul_err.sv
${CALIPTRA_ROOT}/src/aes/rtl/aes_sbox_canright.sv
${CALIPTRA_ROOT}/src/aes/rtl/aes_sbox_canright_masked.sv
${CALIPTRA_ROOT}/src/aes/rtl/aes_cipher_core.sv
Expand All @@ -89,4 +112,25 @@ ${CALIPTRA_ROOT}/src/aes/rtl/aes_shift_rows.sv
${CALIPTRA_ROOT}/src/aes/rtl/aes_mix_single_column.sv
${CALIPTRA_ROOT}/src/aes/rtl/aes_cipher_control.sv
${CALIPTRA_ROOT}/src/aes/rtl/aes_prng_masking.sv
${CALIPTRA_ROOT}/src/aes/rtl/aes_key_expand.sv
${CALIPTRA_ROOT}/src/aes/rtl/aes_key_expand.sv
${CALIPTRA_ROOT}/src/aes/rtl/aes_control.sv
${CALIPTRA_ROOT}/src/aes/rtl/aes_control_fsm.sv
${CALIPTRA_ROOT}/src/aes/rtl/aes_control_fsm_n.sv
${CALIPTRA_ROOT}/src/aes/rtl/aes_control_fsm_p.sv
${CALIPTRA_ROOT}/src/aes/rtl/aes_core.sv
${CALIPTRA_ROOT}/src/aes/rtl/aes_ctr.sv
${CALIPTRA_ROOT}/src/aes/rtl/aes_ctr_fsm.sv
${CALIPTRA_ROOT}/src/aes/rtl/aes_ctr_fsm_n.sv
${CALIPTRA_ROOT}/src/aes/rtl/aes_ctr_fsm_p.sv
${CALIPTRA_ROOT}/src/aes/rtl/aes_ctrl_gcm_reg_shadowed.sv
${CALIPTRA_ROOT}/src/aes/rtl/aes_ctrl_reg_shadowed.sv
${CALIPTRA_ROOT}/src/aes/rtl/aes_ghash.sv
${CALIPTRA_ROOT}/src/aes/rtl/aes_prng_clearing.sv
${CALIPTRA_ROOT}/src/aes/rtl/aes_reduced_round.sv
${CALIPTRA_ROOT}/src/aes/rtl/aes_reg_status.sv
${CALIPTRA_ROOT}/src/aes/rtl/aes_reg_top.sv
${CALIPTRA_ROOT}/src/aes/rtl/aes_wrap.sv
${CALIPTRA_ROOT}/src/aes/rtl/aes.sv
${CALIPTRA_ROOT}/src/aes/rtl/aes_clp_reg_pkg.sv
${CALIPTRA_ROOT}/src/aes/rtl/aes_clp_reg.sv
${CALIPTRA_ROOT}/src/aes/rtl/aes_clp_wrapper.sv
18 changes: 15 additions & 3 deletions src/aes/config/aes_pkg.vf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
+incdir+${CALIPTRA_ROOT}/src/entropy_src/rtl
+incdir+${CALIPTRA_ROOT}/src/integration/rtl
+incdir+${CALIPTRA_ROOT}/src/libs/rtl
+incdir+${CALIPTRA_ROOT}/src/edn/rtl
+incdir+${CALIPTRA_ROOT}/src/caliptra_prim/rtl
+incdir+${CALIPTRA_ROOT}/src/lc_ctrl/rtl
+incdir+${CALIPTRA_ROOT}/src/edn/rtl
+incdir+${CALIPTRA_ROOT}/src/caliptra_prim_generic/rtl
+incdir+${CALIPTRA_ROOT}/src/aes/rtl
${CALIPTRA_ROOT}/src/entropy_src/rtl/entropy_src_main_sm_pkg.sv
Expand All @@ -23,18 +23,21 @@ ${CALIPTRA_ROOT}/src/libs/rtl/caliptra_icg.sv
${CALIPTRA_ROOT}/src/libs/rtl/clk_gate.sv
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_2ff_sync.sv
${CALIPTRA_ROOT}/src/libs/rtl/skidbuffer.v
${CALIPTRA_ROOT}/src/edn/rtl/edn_pkg.sv
${CALIPTRA_ROOT}/src/libs/rtl/ahb_to_reg_adapter.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_util_pkg.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_alert_pkg.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_subreg_pkg.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_mubi_pkg.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_cipher_pkg.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_pkg.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_sparse_fsm_pkg.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_trivium_pkg.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_secded_pkg.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/keymgr_pkg.sv
${CALIPTRA_ROOT}/src/lc_ctrl/rtl/lc_ctrl_reg_pkg.sv
${CALIPTRA_ROOT}/src/lc_ctrl/rtl/lc_ctrl_state_pkg.sv
${CALIPTRA_ROOT}/src/lc_ctrl/rtl/lc_ctrl_pkg.sv
${CALIPTRA_ROOT}/src/edn/rtl/edn_pkg.sv
${CALIPTRA_ROOT}/src/libs/rtl/ahb_to_reg_adapter.sv
${CALIPTRA_ROOT}/src/caliptra_prim_generic/rtl/caliptra_prim_generic_flop_en.sv
${CALIPTRA_ROOT}/src/caliptra_prim_generic/rtl/caliptra_prim_generic_flop.sv
${CALIPTRA_ROOT}/src/caliptra_prim_generic/rtl/caliptra_prim_generic_buf.sv
Expand Down Expand Up @@ -69,6 +72,15 @@ ${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_arbiter_ppc.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_sum_tree.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_subreg_ext.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_edge_detector.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_trivium.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_subreg_shadow.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_sync_reqack_data.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_sync_reqack.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_secded_inv_39_32_enc.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_secded_inv_39_32_dec.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_secded_inv_64_57_enc.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_secded_inv_64_57_dec.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_gf_mult.sv
${CALIPTRA_ROOT}/src/aes/rtl/aes_reg_pkg.sv
${CALIPTRA_ROOT}/src/aes/rtl/aes_pkg.sv
${CALIPTRA_ROOT}/src/aes/rtl/aes_sbox_canright_pkg.sv
22 changes: 22 additions & 0 deletions src/aes/config/compile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ provides: [aes]
schema_version: 2.4.0
requires:
- aes_pkg
- tlul_pkg
targets:
rtl:
directories: [$COMPILE_ROOT/rtl]
Expand All @@ -38,6 +39,27 @@ targets:
- $COMPILE_ROOT/rtl/aes_cipher_control.sv
- $COMPILE_ROOT/rtl/aes_prng_masking.sv
- $COMPILE_ROOT/rtl/aes_key_expand.sv
- $COMPILE_ROOT/rtl/aes_control.sv
- $COMPILE_ROOT/rtl/aes_control_fsm.sv
- $COMPILE_ROOT/rtl/aes_control_fsm_n.sv
- $COMPILE_ROOT/rtl/aes_control_fsm_p.sv
- $COMPILE_ROOT/rtl/aes_core.sv
- $COMPILE_ROOT/rtl/aes_ctr.sv
- $COMPILE_ROOT/rtl/aes_ctr_fsm.sv
- $COMPILE_ROOT/rtl/aes_ctr_fsm_n.sv
- $COMPILE_ROOT/rtl/aes_ctr_fsm_p.sv
- $COMPILE_ROOT/rtl/aes_ctrl_gcm_reg_shadowed.sv
- $COMPILE_ROOT/rtl/aes_ctrl_reg_shadowed.sv
- $COMPILE_ROOT/rtl/aes_ghash.sv
- $COMPILE_ROOT/rtl/aes_prng_clearing.sv
- $COMPILE_ROOT/rtl/aes_reduced_round.sv
- $COMPILE_ROOT/rtl/aes_reg_status.sv
- $COMPILE_ROOT/rtl/aes_reg_top.sv
- $COMPILE_ROOT/rtl/aes_wrap.sv
- $COMPILE_ROOT/rtl/aes.sv
- $COMPILE_ROOT/rtl/aes_clp_reg_pkg.sv
- $COMPILE_ROOT/rtl/aes_clp_reg.sv
- $COMPILE_ROOT/rtl/aes_clp_wrapper.sv
tops: [aes_cipher_core]
rtl_lint:
directories: []
Expand Down
Loading
Loading