Skip to content

Commit d5e5328

Browse files
authored
Merge pull request #209 from bigbrett/WOLFHSM-DOC-FIXES
Wolfhsm doc fixes
2 parents 8b335c3 + 94c2e0c commit d5e5328

File tree

6 files changed

+29
-27
lines changed

6 files changed

+29
-27
lines changed

.github/workflows/build-check.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,3 +88,7 @@ jobs:
8888
run: cd wolfCrypt-JNI && export PATH=$PATH:"/home/runner/work/documentation" && make html
8989
- name: wolfcrypt-jni pdf
9090
run: cd wolfCrypt-JNI && export PATH=$PATH:"/home/runner/work/documentation" && make pdf
91+
- name: wolfHSM html
92+
run: cd wolfHSM && export PATH=$PATH:"/home/runner/work/documentation" && make html
93+
- name: wolfHSM pdf
94+
run: cd wolfHSM && export PATH=$PATH:"/home/runner/work/documentation" && make pdf

wolfHSM/Doxyfile

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ NUM_PROC_THREADS = 1
485485
# normally produced when WARNINGS is set to YES.
486486
# The default value is: NO.
487487

488-
EXTRACT_ALL = YES
488+
EXTRACT_ALL = NO
489489

490490
# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
491491
# be included in the documentation.
@@ -614,7 +614,7 @@ HIDE_COMPOUND_REFERENCE= NO
614614
# the files that are included by a file in the documentation of that file.
615615
# The default value is: YES.
616616

617-
SHOW_INCLUDE_FILES = YES
617+
SHOW_INCLUDE_FILES = NO
618618

619619
# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
620620
# grouped member an include statement to the documentation, telling the reader
@@ -693,26 +693,26 @@ STRICT_PROTO_MATCHING = NO
693693
# list. This list is created by putting \todo commands in the documentation.
694694
# The default value is: YES.
695695

696-
GENERATE_TODOLIST = YES
696+
GENERATE_TODOLIST = NO
697697

698698
# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
699699
# list. This list is created by putting \test commands in the documentation.
700700
# The default value is: YES.
701701

702-
GENERATE_TESTLIST = YES
702+
GENERATE_TESTLIST = NO
703703

704704
# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
705705
# list. This list is created by putting \bug commands in the documentation.
706706
# The default value is: YES.
707707

708-
GENERATE_BUGLIST = YES
708+
GENERATE_BUGLIST = NO
709709

710710
# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
711711
# the deprecated list. This list is created by putting \deprecated commands in
712712
# the documentation.
713713
# The default value is: YES.
714714

715-
GENERATE_DEPRECATEDLIST= YES
715+
GENERATE_DEPRECATEDLIST= NO
716716

717717
# The ENABLED_SECTIONS tag can be used to enable conditional documentation
718718
# sections, marked by \if <section_label> ... \endif and \cond <section_label>
@@ -1151,7 +1151,7 @@ USE_HTAGS = NO
11511151
# See also: Section \class.
11521152
# The default value is: YES.
11531153

1154-
VERBATIM_HEADERS = YES
1154+
VERBATIM_HEADERS = NO
11551155

11561156
#---------------------------------------------------------------------------
11571157
# Configuration options related to the alphabetical class index
@@ -2195,7 +2195,7 @@ EXPAND_ONLY_PREDEF = NO
21952195
# The default value is: YES.
21962196
# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
21972197

2198-
SEARCH_INCLUDES = YES
2198+
SEARCH_INCLUDES = NO
21992199

22002200
# The INCLUDE_PATH tag can be used to specify one or more directories that
22012201
# contain include files that are not input files but should be processed by the
@@ -2298,7 +2298,7 @@ EXTERNAL_PAGES = YES
22982298
# powerful graphs.
22992299
# The default value is: YES.
23002300

2301-
CLASS_DIAGRAMS = YES
2301+
CLASS_DIAGRAMS = NO
23022302

23032303
# You can include diagrams made with dia in doxygen documentation. Doxygen will
23042304
# then run dia to produce the diagram and insert it in the documentation. The
@@ -2362,7 +2362,7 @@ DOT_FONTPATH =
23622362
# The default value is: YES.
23632363
# This tag requires that the tag HAVE_DOT is set to YES.
23642364

2365-
CLASS_GRAPH = YES
2365+
CLASS_GRAPH = NO
23662366

23672367
# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
23682368
# graph for each documented class showing the direct and indirect implementation
@@ -2371,14 +2371,14 @@ CLASS_GRAPH = YES
23712371
# The default value is: YES.
23722372
# This tag requires that the tag HAVE_DOT is set to YES.
23732373

2374-
COLLABORATION_GRAPH = YES
2374+
COLLABORATION_GRAPH = NO
23752375

23762376
# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
23772377
# groups, showing the direct groups dependencies.
23782378
# The default value is: YES.
23792379
# This tag requires that the tag HAVE_DOT is set to YES.
23802380

2381-
GROUP_GRAPHS = YES
2381+
GROUP_GRAPHS = NO
23822382

23832383
# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
23842384
# collaboration diagrams in a style similar to the OMG's Unified Modeling
@@ -2438,7 +2438,7 @@ TEMPLATE_RELATIONS = NO
24382438
# The default value is: YES.
24392439
# This tag requires that the tag HAVE_DOT is set to YES.
24402440

2441-
INCLUDE_GRAPH = YES
2441+
INCLUDE_GRAPH = NO
24422442

24432443
# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
24442444
# set to YES then doxygen will generate a graph for each documented file showing
@@ -2447,7 +2447,7 @@ INCLUDE_GRAPH = YES
24472447
# The default value is: YES.
24482448
# This tag requires that the tag HAVE_DOT is set to YES.
24492449

2450-
INCLUDED_BY_GRAPH = YES
2450+
INCLUDED_BY_GRAPH = NO
24512451

24522452
# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
24532453
# dependency graph for every global function or class method.
@@ -2478,7 +2478,7 @@ CALLER_GRAPH = NO
24782478
# The default value is: YES.
24792479
# This tag requires that the tag HAVE_DOT is set to YES.
24802480

2481-
GRAPHICAL_HIERARCHY = YES
2481+
GRAPHICAL_HIERARCHY = NO
24822482

24832483
# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
24842484
# dependencies a directory has on other directories in a graphical way. The
@@ -2487,7 +2487,7 @@ GRAPHICAL_HIERARCHY = YES
24872487
# The default value is: YES.
24882488
# This tag requires that the tag HAVE_DOT is set to YES.
24892489

2490-
DIRECTORY_GRAPH = YES
2490+
DIRECTORY_GRAPH = NO
24912491

24922492
# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
24932493
# generated by dot. For an explanation of the image formats see the section
@@ -2610,7 +2610,7 @@ DOT_MULTI_TARGETS = NO
26102610
# The default value is: YES.
26112611
# This tag requires that the tag HAVE_DOT is set to YES.
26122612

2613-
GENERATE_LEGEND = YES
2613+
GENERATE_LEGEND = NO
26142614

26152615
# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
26162616
# files that are used to generate the various graphs.

wolfHSM/Makefile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,8 @@ html-prep: api
4949
$(Q)cp -a api/md/*8h* build/html/
5050

5151
$(Q)perl -i -pe "s/\/group_/group_/g" build/html/group* build/html/*8h*
52-
$(Q)perl -i -pe "s/\/tpm2_/tpm2_/g" build/html/group* build/html/*8h*
5352
$(Q)perl -i -pe "s/dox_comments\/header_files\///" build/html/*8h*
5453

55-
$(Q)cp src/appendix01.md build/html/appendix01.md
56-
5754
# Set input format to gfm to fix issues with converted API docs
5855
# Regexes:
5956
# 1. Indent all headings by one #
@@ -81,4 +78,3 @@ pdf-prep: api
8178
$(Q)perl -i -pe "s/(?<=md\#typedef\-)(.*)(?=\))/\$$1=~s#-#_#gr/ge" build/pdf/*.md
8279
$(Q)perl -i -pe "s/(?<=md\#enum\-)(.*)(?=\))/\$$1=~s#-#_#gr/ge" build/pdf/*.md
8380

84-
$(Q)cp src/appendix01.md build/pdf/appendix01.md

wolfHSM/mkdocs.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ nav:
1212
- "6. Server Library": chapter06.md
1313
- "7. Customizing wolfHSM": chapter07.md
1414
- "8. Porting wolfHSM": chapter08.md
15-
- "9. API Reference": appendix01.md
15+
- "9. API Reference":
16+
- Client API: wh__client_8h.md
17+
- Server API: wh__server_8h.md
1618
theme:
1719
name: null
1820
custom_dir: ../mkdocs-material/material

wolfHSM/src/chapter05.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ wh_Client_KeyErase(clientCtx, keyId);
285285

286286
When using wolfCrypt in the client application, compatible crypto operations can be executed on the wolfHSM server by passing `WOLFHSM_DEV_ID` as the `devId` argument. The wolfHSM client must be initialized before using any wolfHSM remote crypto.
287287

288-
If wolfHSM does not yet support that algorithm, the API call will return `CRYPTOCB_UNAVAILABLE`. See [supported wolfCrypt algorithms](todo) for the full list of algorithms wolfHSM supports for remote HSM execution.
288+
If wolfHSM does not yet support that algorithm, the API call will return `CRYPTOCB_UNAVAILABLE`.
289289

290290
Here is an example of how a client application would perform an `AES CBC` encryption operation on the wolfHSM server:
291291

wolfHSM/src/chapter08.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,20 @@ Official ports of wolfHSM are provided for various supported architectures, with
2828

2929
### Infineon Aurix TC3XX
3030

31-
(Port in progress)
3231
The distribution of this port is restricted by the vendor. Please contact [email protected] for access.
3332

34-
Infineon Aurix TC3xx
33+
**Infineon Aurix TC3xx**
34+
3535
- Up to 6x 300MHz TriCore application cores
3636
- 1x 100MHz ARM Cortex M3 HSM core
3737
- Crypto offload: TRNG, AES128, ECDSA, ED25519, SHA
3838

3939
### ST SPC58NN
4040

41-
(Port in progress)
4241
The distribution of this port is restricted by the vendor. Please contact [email protected] for access.
4342

44-
ST SPC58NN
43+
** ST SPC58NN**
44+
4545
- 3x 200MHz e200z4256 PowerPC application cores
4646
- 1x 100MHz e200z0 PowerPC HSM core with NVM
4747
- Crypto offload: TRNG, AES128

0 commit comments

Comments
 (0)