From 1ae7eda504d0ceeafeabcee6132aa869d740beb3 Mon Sep 17 00:00:00 2001 From: Andras Fekete Date: Tue, 30 Jul 2024 15:00:25 -0400 Subject: [PATCH 1/3] Clean up more warnings --- wolfHSM/Doxyfile | 7 ++++--- wolfMQTT/Doxyfile | 4 ++-- wolfMQTT/Doxyfile-ja | 4 ++-- wolfTPM/Doxyfile | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/wolfHSM/Doxyfile b/wolfHSM/Doxyfile index d054c308..dae536d2 100644 --- a/wolfHSM/Doxyfile +++ b/wolfHSM/Doxyfile @@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8 # title of most generated pages and in a few other places. # The default value is: My Project. -PROJECT_NAME = "wolfHSM" +PROJECT_NAME = wolfHSM # The PROJECT_NUMBER tag can be used to enter a project or revision number. This # could be handy for archiving the generated documentation or if some version @@ -865,8 +865,9 @@ WARN_LOGFILE = # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING # Note: If this tag is empty the current directory is searched. -INPUT = README.md wolfhsm/wh_client.h wolfhsm/wh_server.h - +INPUT = README.md \ + wolfhsm/wh_client.h \ + wolfhsm/wh_server.h # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses diff --git a/wolfMQTT/Doxyfile b/wolfMQTT/Doxyfile index a50aeea0..a74bd285 100644 --- a/wolfMQTT/Doxyfile +++ b/wolfMQTT/Doxyfile @@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8 # title of most generated pages and in a few other places. # The default value is: My Project. -PROJECT_NAME = "wolfMQTT" +PROJECT_NAME = wolfMQTT # The PROJECT_NUMBER tag can be used to enter a project or revision number. This # could be handy for archiving the generated documentation or if some version @@ -868,7 +868,7 @@ WARN_LOGFILE = INPUT = ./wolfmqtt/wolfmqtt/mqtt_client.h \ ./wolfmqtt/wolfmqtt/mqtt_packet.h \ ./wolfmqtt/wolfmqtt/mqtt_socket.h \ - ./wolfmqtt/wolfmqtt/mqtt_types.h + ./wolfmqtt/wolfmqtt/mqtt_types.h # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses diff --git a/wolfMQTT/Doxyfile-ja b/wolfMQTT/Doxyfile-ja index 857f2616..57a080d7 100644 --- a/wolfMQTT/Doxyfile-ja +++ b/wolfMQTT/Doxyfile-ja @@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8 # title of most generated pages and in a few other places. # The default value is: My Project. -PROJECT_NAME = "wolfMQTT" +PROJECT_NAME = wolfMQTT # The PROJECT_NUMBER tag can be used to enter a project or revision number. This # could be handy for archiving the generated documentation or if some version @@ -868,7 +868,7 @@ WARN_LOGFILE = INPUT = ./header-ja/mqtt_client.h \ ./header-ja/mqtt_packet.h \ ./header-ja/mqtt_socket.h \ - ./header-ja/mqtt_types.h + ./header-ja/mqtt_types.h # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses diff --git a/wolfTPM/Doxyfile b/wolfTPM/Doxyfile index b94acf0c..6aaa8b5b 100644 --- a/wolfTPM/Doxyfile +++ b/wolfTPM/Doxyfile @@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8 # title of most generated pages and in a few other places. # The default value is: My Project. -PROJECT_NAME = "wolfTPM2" +PROJECT_NAME = wolfTPM2 # The PROJECT_NUMBER tag can be used to enter a project or revision number. This # could be handy for archiving the generated documentation or if some version From 9d07d297d550889583cd02052ccc47141adeeb76 Mon Sep 17 00:00:00 2001 From: Andras Fekete Date: Tue, 30 Jul 2024 15:21:10 -0400 Subject: [PATCH 2/3] fix warning about multiple definitions of 'clean' --- common/common.am | 4 ++-- wolfSSL/Makefile | 8 +------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/common/common.am b/common/common.am index 1fe7d63f..ca2a0dbe 100644 --- a/common/common.am +++ b/common/common.am @@ -82,6 +82,6 @@ lintcheck: .PHONY: test test: lintcheck linkcheck +CLEAN_FILES = $(PDF) build $(HTML) clean: - rm -f $(PDF) - rm -rf build $(HTML) + rm -rf $(CLEAN_FILES) diff --git a/wolfSSL/Makefile b/wolfSSL/Makefile index 944489ec..f06bd45d 100644 --- a/wolfSSL/Makefile +++ b/wolfSSL/Makefile @@ -2,6 +2,7 @@ .DEFAULT_GOAL := all all: pdf html +CLEAN_FILES += api wolfssl SOURCES = chapter01.md \ chapter02.md \ @@ -95,10 +96,3 @@ pdf-prep: api $(Q)cat build/pdf/group__ASN.md build/pdf/group__Base__Encoding.md build/pdf/group__Compression.md build/pdf/group__Error.md build/pdf/group__IoTSafe.md build/pdf/group__Keys.md build/pdf/group__Logging.md build/pdf/group__Math.md build/pdf/group__Random.md build/pdf/group__Signature.md build/pdf/group__wolfCrypt.md build/pdf/group__DES.md build/pdf/group__AES.md build/pdf/group__ARC4.md build/pdf/group__BLAKE2.md build/pdf/group__Camellia.md build/pdf/group__ChaCha.md build/pdf/group__ChaCha20Poly1305.md build/pdf/group__Crypto.md build/pdf/group__Curve25519.md build/pdf/group__Curve448.md build/pdf/group__DSA.md build/pdf/group__Diffie-Hellman.md build/pdf/group__ECC.md build/pdf/group__ED25519.md build/pdf/group__ED448.md build/pdf/group__PSA.md build/pdf/group__SipHash.md >> build/pdf/appendix02.md $(Q)cat build/pdf/aes_8h.md build/pdf/arc4_8h.md build/pdf/asn_8h.md build/pdf/asn__public_8h.md build/pdf/blake2_8h.md build/pdf/bn_8h.md build/pdf/camellia_8h.md build/pdf/chacha20__poly1305_8h.md build/pdf/chacha_8h.md build/pdf/cmac_8h.md build/pdf/coding_8h.md build/pdf/compress_8h.md build/pdf/cryptocb_8h.md build/pdf/curve25519_8h.md build/pdf/curve448_8h.md build/pdf/des3_8h.md build/pdf/dh_8h.md build/pdf/doxygen__groups_8h.md build/pdf/doxygen__pages_8h.md build/pdf/dsa_8h.md build/pdf/ecc_8h.md build/pdf/eccsi_8h.md build/pdf/ed25519_8h.md build/pdf/ed448_8h.md build/pdf/error-crypt_8h.md build/pdf/evp_8h.md build/pdf/hash_8h.md build/pdf/hmac_8h.md build/pdf/iotsafe_8h.md build/pdf/logging_8h.md build/pdf/md2_8h.md build/pdf/md4_8h.md build/pdf/md5_8h.md build/pdf/memory_8h.md build/pdf/pem_8h.md build/pdf/pkcs11_8h.md build/pdf/pkcs7_8h.md build/pdf/poly1305_8h.md build/pdf/psa_8h.md build/pdf/pwdbased_8h.md build/pdf/quic_8h.md build/pdf/random_8h.md build/pdf/ripemd_8h.md build/pdf/rsa_8h.md build/pdf/sakke_8h.md build/pdf/sha256_8h.md build/pdf/sha512_8h.md build/pdf/sha_8h.md build/pdf/signature_8h.md build/pdf/siphash_8h.md build/pdf/srp_8h.md build/pdf/ssl_8h.md build/pdf/tfm_8h.md build/pdf/types_8h.md build/pdf/wc__encrypt_8h.md build/pdf/wc__port_8h.md build/pdf/wolfio_8h.md >> build/pdf/appendix03.md - -clean: - rm -f $(PDF) - rm -rf build - rm -rf $(HTML) - rm -rf api - rm -rf wolfssl From 93ed5eb21547ca3e8a5fd6689ab6f1900a0bc756 Mon Sep 17 00:00:00 2001 From: Andras Fekete Date: Tue, 30 Jul 2024 18:14:45 -0400 Subject: [PATCH 3/3] Change Project_Name --- wolfTPM/Doxyfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wolfTPM/Doxyfile b/wolfTPM/Doxyfile index 6aaa8b5b..989ad1ab 100644 --- a/wolfTPM/Doxyfile +++ b/wolfTPM/Doxyfile @@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8 # title of most generated pages and in a few other places. # The default value is: My Project. -PROJECT_NAME = wolfTPM2 +PROJECT_NAME = wolfTPM # The PROJECT_NUMBER tag can be used to enter a project or revision number. This # could be handy for archiving the generated documentation or if some version