This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch releases/12.8
in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git

commit bbe07277f4b2119b05c1cd74176f1f32cb3a6d52
Author: Alin Jerpelea <[email protected]>
AuthorDate: Thu Dec 19 02:54:39 2024 +0100

    crypto: migrate to SPDX identifier
    
    Most tools used for compliance and SBOM generation use SPDX identifiers
    This change brings us a step closer to an easy SBOM generation.
    
    Signed-off-by: Alin Jerpelea <[email protected]>
---
 crypto/CMakeLists.txt                              |  2 ++
 crypto/controlse/CMakeLists.txt                    |  2 ++
 crypto/controlse/Make.defs                         |  2 ++
 crypto/controlse/Makefile                          |  2 ++
 crypto/controlse/ccertificate.cxx                  |  2 ++
 crypto/controlse/ccsr.cxx                          |  2 ++
 crypto/controlse/chex_util.cxx                     |  2 ++
 crypto/controlse/cmbedtls_se05x_extension.hxx      |  2 ++
 crypto/controlse/controlse_main.cxx                |  2 ++
 crypto/controlse/cpublic_key.cxx                   |  2 ++
 crypto/controlse/csan_builder.cxx                  |  2 ++
 crypto/controlse/csecure_element.cxx               |  2 ++
 crypto/controlse/cserial_number.cxx                |  2 ++
 crypto/controlse/cstring.cxx                       |  2 ++
 crypto/libsodium/CMakeLists.txt                    |  2 ++
 crypto/libsodium/Make.defs                         |  2 ++
 crypto/libsodium/Makefile                          |  2 ++
 crypto/libtomcrypt/CMakeLists.txt                  |  2 ++
 crypto/libtomcrypt/Make.defs                       |  2 ++
 crypto/libtomcrypt/Makefile                        |  2 ++
 crypto/mbedtls/CMakeLists.txt                      |  2 ++
 crypto/mbedtls/Make.defs                           |  2 ++
 crypto/mbedtls/Makefile                            |  2 ++
 crypto/mbedtls/include/aes_alt.h                   |  2 ++
 crypto/mbedtls/include/cmac_alt.h                  |  2 ++
 crypto/mbedtls/include/dev_alt.h                   |  2 ++
 crypto/mbedtls/include/mbedtls/mbedtls_config.h    |  2 +-
 crypto/mbedtls/include/md5_alt.h                   |  2 ++
 crypto/mbedtls/include/poly1305_alt.h              |  2 ++
 crypto/mbedtls/include/ripemd160_alt.h             |  2 ++
 crypto/mbedtls/include/sha1_alt.h                  |  2 ++
 crypto/mbedtls/include/sha256_alt.h                |  2 ++
 crypto/mbedtls/include/sha512_alt.h                |  2 ++
 crypto/mbedtls/source/aes_alt.c                    |  2 ++
 crypto/mbedtls/source/bignum_alt.c                 |  2 ++
 crypto/mbedtls/source/cmac_alt.c                   |  2 ++
 crypto/mbedtls/source/dev_alt.c                    |  2 ++
 crypto/mbedtls/source/entropy_alt.c                |  2 ++
 crypto/mbedtls/source/md5_alt.c                    |  2 ++
 crypto/mbedtls/source/poly1305_alt.c               |  2 ++
 crypto/mbedtls/source/ripemd160_alt.c              |  2 ++
 crypto/mbedtls/source/sha1_alt.c                   |  2 ++
 crypto/mbedtls/source/sha256_alt.c                 |  2 ++
 crypto/mbedtls/source/sha512_alt.c                 |  2 ++
 crypto/openssl_mbedtls_wrapper/CMakeLists.txt      |  2 ++
 crypto/openssl_mbedtls_wrapper/Make.defs           |  2 ++
 crypto/openssl_mbedtls_wrapper/Makefile            |  2 ++
 .../openssl_mbedtls_wrapper/include/openssl/aes.h  |  2 ++
 .../openssl_mbedtls_wrapper/include/openssl/asn1.h |  2 ++
 .../openssl_mbedtls_wrapper/include/openssl/base.h |  2 ++
 .../openssl_mbedtls_wrapper/include/openssl/bio.h  |  2 ++
 .../openssl_mbedtls_wrapper/include/openssl/bn.h   |  2 ++
 .../include/openssl/bytestring.h                   |  2 ++
 .../include/openssl/cipher.h                       |  2 ++
 .../include/openssl/curve25519.h                   |  2 ++
 .../openssl_mbedtls_wrapper/include/openssl/des.h  |  2 ++
 .../include/openssl/digest.h                       |  2 ++
 .../openssl_mbedtls_wrapper/include/openssl/ec.h   |  2 ++
 .../include/openssl/ec_key.h                       |  2 ++
 .../include/openssl/ecdsa.h                        |  2 ++
 .../include/openssl/engine.h                       |  2 ++
 .../openssl_mbedtls_wrapper/include/openssl/err.h  |  2 ++
 .../openssl_mbedtls_wrapper/include/openssl/evp.h  |  2 ++
 .../include/openssl/ex_data.h                      |  2 ++
 .../openssl_mbedtls_wrapper/include/openssl/hkdf.h |  2 ++
 .../openssl_mbedtls_wrapper/include/openssl/hmac.h |  2 ++
 .../openssl_mbedtls_wrapper/include/openssl/md5.h  |  2 ++
 .../openssl_mbedtls_wrapper/include/openssl/mem.h  |  2 ++
 .../openssl_mbedtls_wrapper/include/openssl/nid.h  |  2 ++
 .../openssl_mbedtls_wrapper/include/openssl/obj.h  |  2 ++
 .../openssl_mbedtls_wrapper/include/openssl/pem.h  |  2 ++
 .../openssl_mbedtls_wrapper/include/openssl/rand.h |  2 ++
 .../openssl_mbedtls_wrapper/include/openssl/rsa.h  |  2 ++
 .../openssl_mbedtls_wrapper/include/openssl/sha.h  |  2 ++
 .../openssl_mbedtls_wrapper/include/openssl/ssl.h  |  3 ++-
 .../openssl_mbedtls_wrapper/include/openssl/ssl3.h |  3 ++-
 .../include/openssl/ssl_dbg.h                      |  3 ++-
 .../include/openssl/ssl_local.h                    |  3 ++-
 .../include/openssl/stack.h                        |  2 ++
 .../include/openssl/statem.h                       |  2 ++
 .../openssl_mbedtls_wrapper/include/openssl/tls1.h |  3 ++-
 .../include/openssl/types.h                        |  3 ++-
 .../openssl_mbedtls_wrapper/include/openssl/x509.h |  2 ++
 .../include/openssl/x509_local.h                   |  3 ++-
 .../include/openssl/x509_vfy.h                     |  3 ++-
 .../include/openssl/x509v3.h                       |  2 ++
 crypto/openssl_mbedtls_wrapper/mbedtls/aes.c       |  2 ++
 crypto/openssl_mbedtls_wrapper/mbedtls/asn1.c      |  2 ++
 crypto/openssl_mbedtls_wrapper/mbedtls/bn.c        |  2 ++
 .../openssl_mbedtls_wrapper/mbedtls/bytestring.c   |  2 ++
 crypto/openssl_mbedtls_wrapper/mbedtls/cipher.c    |  2 ++
 .../openssl_mbedtls_wrapper/mbedtls/curve25519.c   |  2 ++
 crypto/openssl_mbedtls_wrapper/mbedtls/digest.c    |  2 ++
 crypto/openssl_mbedtls_wrapper/mbedtls/ec.c        |  2 ++
 crypto/openssl_mbedtls_wrapper/mbedtls/ec_key.c    |  2 ++
 crypto/openssl_mbedtls_wrapper/mbedtls/ecdsa.c     |  2 ++
 crypto/openssl_mbedtls_wrapper/mbedtls/engine.c    |  2 ++
 crypto/openssl_mbedtls_wrapper/mbedtls/err.c       |  2 ++
 crypto/openssl_mbedtls_wrapper/mbedtls/evp.c       |  2 ++
 crypto/openssl_mbedtls_wrapper/mbedtls/hkdf.c      |  2 ++
 crypto/openssl_mbedtls_wrapper/mbedtls/hmac.c      |  2 ++
 crypto/openssl_mbedtls_wrapper/mbedtls/md5.c       |  2 ++
 crypto/openssl_mbedtls_wrapper/mbedtls/mem.c       |  2 ++
 crypto/openssl_mbedtls_wrapper/mbedtls/obj.c       |  2 ++
 crypto/openssl_mbedtls_wrapper/mbedtls/pbkdf.c     |  2 ++
 crypto/openssl_mbedtls_wrapper/mbedtls/rand.c      |  2 ++
 crypto/openssl_mbedtls_wrapper/mbedtls/rsa.c       |  2 ++
 crypto/openssl_mbedtls_wrapper/mbedtls/sha.c       |  2 ++
 crypto/openssl_mbedtls_wrapper/mbedtls/ssl_cert.c  |  3 ++-
 crypto/openssl_mbedtls_wrapper/mbedtls/ssl_lib.c   |  3 ++-
 .../openssl_mbedtls_wrapper/mbedtls/ssl_methods.c  |  3 ++-
 .../openssl_mbedtls_wrapper/mbedtls/ssl_methods.h  |  3 ++-
 crypto/openssl_mbedtls_wrapper/mbedtls/ssl_pm.c    |  3 ++-
 crypto/openssl_mbedtls_wrapper/mbedtls/ssl_pm.h    |  3 ++-
 crypto/openssl_mbedtls_wrapper/mbedtls/ssl_port.c  |  3 ++-
 crypto/openssl_mbedtls_wrapper/mbedtls/ssl_port.h  |  3 ++-
 crypto/openssl_mbedtls_wrapper/mbedtls/ssl_rsa.c   |  3 ++-
 crypto/openssl_mbedtls_wrapper/mbedtls/stack.c     |  3 ++-
 crypto/openssl_mbedtls_wrapper/mbedtls/statem.c    |  3 ++-
 crypto/openssl_mbedtls_wrapper/mbedtls/x509.c      |  2 ++
 crypto/openssl_mbedtls_wrapper/mbedtls/x509_vpm.c  |  3 ++-
 crypto/tinycrypt/CMakeLists.txt                    |  2 ++
 crypto/tinycrypt/Make.defs                         |  2 ++
 crypto/tinycrypt/Makefile                          |  2 ++
 crypto/tinydtls/CMakeLists.txt                     |  2 ++
 crypto/wolfssl/Make.defs                           | 22 ++++++++++++++++++++++
 crypto/wolfssl/Makefile                            | 22 ++++++++++++++++++++++
 crypto/wolfssl/user_settings.h                     | 21 +++++++++++++++++++++
 128 files changed, 314 insertions(+), 21 deletions(-)

diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index bd180bdb5..5f093c33c 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -1,6 +1,8 @@
 # 
##############################################################################
 # apps/crypto/CMakeLists.txt
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more 
contributor
 # license agreements.  See the NOTICE file distributed with this work for
 # additional information regarding copyright ownership.  The ASF licenses this
diff --git a/crypto/controlse/CMakeLists.txt b/crypto/controlse/CMakeLists.txt
index 72fb36e01..5ffa43cfd 100644
--- a/crypto/controlse/CMakeLists.txt
+++ b/crypto/controlse/CMakeLists.txt
@@ -1,6 +1,8 @@
 # 
##############################################################################
 # apps/crypto/controlse/CMakeLists.txt
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more 
contributor
 # license agreements.  See the NOTICE file distributed with this work for
 # additional information regarding copyright ownership.  The ASF licenses this
diff --git a/crypto/controlse/Make.defs b/crypto/controlse/Make.defs
index 0e1fad585..45536c468 100644
--- a/crypto/controlse/Make.defs
+++ b/crypto/controlse/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/crypto/controlse/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/crypto/controlse/Makefile b/crypto/controlse/Makefile
index c338507d1..f4ba03a40 100644
--- a/crypto/controlse/Makefile
+++ b/crypto/controlse/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/crypto/controlse/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/crypto/controlse/ccertificate.cxx 
b/crypto/controlse/ccertificate.cxx
index 5731c4ddd..4d663ea75 100644
--- a/crypto/controlse/ccertificate.cxx
+++ b/crypto/controlse/ccertificate.cxx
@@ -1,6 +1,8 @@
 //***************************************************************************
 // apps/crypto/controlse/ccertificate.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/crypto/controlse/ccsr.cxx b/crypto/controlse/ccsr.cxx
index e57f7b0d1..9c3326468 100644
--- a/crypto/controlse/ccsr.cxx
+++ b/crypto/controlse/ccsr.cxx
@@ -1,6 +1,8 @@
 //***************************************************************************
 // apps/crypto/controlse/ccsr.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/crypto/controlse/chex_util.cxx b/crypto/controlse/chex_util.cxx
index e2aebae76..1e0f7e12a 100644
--- a/crypto/controlse/chex_util.cxx
+++ b/crypto/controlse/chex_util.cxx
@@ -1,6 +1,8 @@
 //***************************************************************************
 // apps/crypto/controlse/chex_util.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/crypto/controlse/cmbedtls_se05x_extension.hxx 
b/crypto/controlse/cmbedtls_se05x_extension.hxx
index 4e8fda770..8289b124c 100644
--- a/crypto/controlse/cmbedtls_se05x_extension.hxx
+++ b/crypto/controlse/cmbedtls_se05x_extension.hxx
@@ -1,6 +1,8 @@
 //***************************************************************************
 // apps/crypto/controlse/cmbedtls_se05x_extensions.hxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/crypto/controlse/controlse_main.cxx 
b/crypto/controlse/controlse_main.cxx
index 238a85233..8c0f07cbc 100644
--- a/crypto/controlse/controlse_main.cxx
+++ b/crypto/controlse/controlse_main.cxx
@@ -1,6 +1,8 @@
 //***************************************************************************
 // apps/crypto/controlse/controlse_main.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/crypto/controlse/cpublic_key.cxx b/crypto/controlse/cpublic_key.cxx
index 10a7aad91..097ef3270 100644
--- a/crypto/controlse/cpublic_key.cxx
+++ b/crypto/controlse/cpublic_key.cxx
@@ -1,6 +1,8 @@
 //***************************************************************************
 // apps/crypto/controlse/cpublic_key.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/crypto/controlse/csan_builder.cxx 
b/crypto/controlse/csan_builder.cxx
index 60a9040ae..b25a4e5d2 100644
--- a/crypto/controlse/csan_builder.cxx
+++ b/crypto/controlse/csan_builder.cxx
@@ -1,6 +1,8 @@
 //***************************************************************************
 // apps/crypto/controlse/csan_builder.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/crypto/controlse/csecure_element.cxx 
b/crypto/controlse/csecure_element.cxx
index e6c11d894..cacdd0edd 100644
--- a/crypto/controlse/csecure_element.cxx
+++ b/crypto/controlse/csecure_element.cxx
@@ -1,6 +1,8 @@
 //***************************************************************************
 // apps/crypto/controlse/csecure_element.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/crypto/controlse/cserial_number.cxx 
b/crypto/controlse/cserial_number.cxx
index 517d1b229..219689dab 100644
--- a/crypto/controlse/cserial_number.cxx
+++ b/crypto/controlse/cserial_number.cxx
@@ -1,6 +1,8 @@
 //***************************************************************************
 // apps/crypto/controlse/cserial_number.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/crypto/controlse/cstring.cxx b/crypto/controlse/cstring.cxx
index ff7637005..dc2e9000c 100644
--- a/crypto/controlse/cstring.cxx
+++ b/crypto/controlse/cstring.cxx
@@ -1,6 +1,8 @@
 //***************************************************************************
 // apps/crypto/controlse/cstring.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/crypto/libsodium/CMakeLists.txt b/crypto/libsodium/CMakeLists.txt
index 1d1f9a004..daf7b326b 100644
--- a/crypto/libsodium/CMakeLists.txt
+++ b/crypto/libsodium/CMakeLists.txt
@@ -1,6 +1,8 @@
 # 
##############################################################################
 # apps/crypto/libsodium/CMakeLists.txt
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more 
contributor
 # license agreements.  See the NOTICE file distributed with this work for
 # additional information regarding copyright ownership.  The ASF licenses this
diff --git a/crypto/libsodium/Make.defs b/crypto/libsodium/Make.defs
index 156cc2fbd..acae50f13 100644
--- a/crypto/libsodium/Make.defs
+++ b/crypto/libsodium/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/crypto/libsodium/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/crypto/libsodium/Makefile b/crypto/libsodium/Makefile
index dfee81651..68318a717 100644
--- a/crypto/libsodium/Makefile
+++ b/crypto/libsodium/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/crypto/libsodium/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/crypto/libtomcrypt/CMakeLists.txt 
b/crypto/libtomcrypt/CMakeLists.txt
index 0811bf1d5..d3fb2a5dc 100644
--- a/crypto/libtomcrypt/CMakeLists.txt
+++ b/crypto/libtomcrypt/CMakeLists.txt
@@ -1,6 +1,8 @@
 # 
##############################################################################
 # apps/crypto/libtomcrypt/CMakeLists.txt
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more 
contributor
 # license agreements.  See the NOTICE file distributed with this work for
 # additional information regarding copyright ownership.  The ASF licenses this
diff --git a/crypto/libtomcrypt/Make.defs b/crypto/libtomcrypt/Make.defs
index a31d953f1..0fac308ff 100644
--- a/crypto/libtomcrypt/Make.defs
+++ b/crypto/libtomcrypt/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/crypto/libtomcrypt/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/crypto/libtomcrypt/Makefile b/crypto/libtomcrypt/Makefile
index 6911fe503..68219a8cf 100644
--- a/crypto/libtomcrypt/Makefile
+++ b/crypto/libtomcrypt/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/crypto/libtomcrypt/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/crypto/mbedtls/CMakeLists.txt b/crypto/mbedtls/CMakeLists.txt
index 1c93dc894..9a80ffab9 100644
--- a/crypto/mbedtls/CMakeLists.txt
+++ b/crypto/mbedtls/CMakeLists.txt
@@ -1,6 +1,8 @@
 # 
##############################################################################
 # apps/crypto/mbedtls/CMakeLists.txt
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more 
contributor
 # license agreements.  See the NOTICE file distributed with this work for
 # additional information regarding copyright ownership.  The ASF licenses this
diff --git a/crypto/mbedtls/Make.defs b/crypto/mbedtls/Make.defs
index 3cb722d52..a7c9a21ff 100644
--- a/crypto/mbedtls/Make.defs
+++ b/crypto/mbedtls/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/crypto/mbedtls/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/crypto/mbedtls/Makefile b/crypto/mbedtls/Makefile
index 574f297b8..3428aa0e9 100644
--- a/crypto/mbedtls/Makefile
+++ b/crypto/mbedtls/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/crypto/mbedtls/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/crypto/mbedtls/include/aes_alt.h b/crypto/mbedtls/include/aes_alt.h
index 590773829..0ba13cc41 100644
--- a/crypto/mbedtls/include/aes_alt.h
+++ b/crypto/mbedtls/include/aes_alt.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/mbedtls/include/aes_alt.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/mbedtls/include/cmac_alt.h 
b/crypto/mbedtls/include/cmac_alt.h
index 4d3d73b67..a6068aabc 100644
--- a/crypto/mbedtls/include/cmac_alt.h
+++ b/crypto/mbedtls/include/cmac_alt.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/mbedtls/include/cmac_alt.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/mbedtls/include/dev_alt.h b/crypto/mbedtls/include/dev_alt.h
index cc5b581d5..caed8b9eb 100644
--- a/crypto/mbedtls/include/dev_alt.h
+++ b/crypto/mbedtls/include/dev_alt.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/mbedtls/include/dev_alt.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/mbedtls/include/mbedtls/mbedtls_config.h 
b/crypto/mbedtls/include/mbedtls/mbedtls_config.h
index bf8c7b72f..f61cb60c0 100644
--- a/crypto/mbedtls/include/mbedtls/mbedtls_config.h
+++ b/crypto/mbedtls/include/mbedtls/mbedtls_config.h
@@ -1,8 +1,8 @@
 /****************************************************************************
  * apps/crypto/mbedtls/include/mbedtls/mbedtls_config.h
  *
- * Copyright The Mbed TLS Contributors
  * SPDX-License-Identifier: Apache-2.0
+ * SPDX-FileCopyrightText: Copyright The Mbed TLS Contributors
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/crypto/mbedtls/include/md5_alt.h b/crypto/mbedtls/include/md5_alt.h
index 5c1b93b9a..4c0fdb292 100644
--- a/crypto/mbedtls/include/md5_alt.h
+++ b/crypto/mbedtls/include/md5_alt.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/mbedtls/include/md5_alt.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/mbedtls/include/poly1305_alt.h 
b/crypto/mbedtls/include/poly1305_alt.h
index fa6e29a41..7f55f7073 100644
--- a/crypto/mbedtls/include/poly1305_alt.h
+++ b/crypto/mbedtls/include/poly1305_alt.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/mbedtls/include/poly1305_alt.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/mbedtls/include/ripemd160_alt.h 
b/crypto/mbedtls/include/ripemd160_alt.h
index 03ba2a4b0..8911d919f 100644
--- a/crypto/mbedtls/include/ripemd160_alt.h
+++ b/crypto/mbedtls/include/ripemd160_alt.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/mbedtls/include/ripemd160_alt.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/mbedtls/include/sha1_alt.h 
b/crypto/mbedtls/include/sha1_alt.h
index 429ebee65..dede51762 100644
--- a/crypto/mbedtls/include/sha1_alt.h
+++ b/crypto/mbedtls/include/sha1_alt.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/mbedtls/include/sha1_alt.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/mbedtls/include/sha256_alt.h 
b/crypto/mbedtls/include/sha256_alt.h
index 9e75530f0..bfbf135e8 100644
--- a/crypto/mbedtls/include/sha256_alt.h
+++ b/crypto/mbedtls/include/sha256_alt.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/mbedtls/include/sha256_alt.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/mbedtls/include/sha512_alt.h 
b/crypto/mbedtls/include/sha512_alt.h
index 663e755b6..b12adeee4 100644
--- a/crypto/mbedtls/include/sha512_alt.h
+++ b/crypto/mbedtls/include/sha512_alt.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/mbedtls/include/sha512_alt.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/mbedtls/source/aes_alt.c b/crypto/mbedtls/source/aes_alt.c
index f3e8b6e1c..23baa1959 100644
--- a/crypto/mbedtls/source/aes_alt.c
+++ b/crypto/mbedtls/source/aes_alt.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/mbedtls/source/aes_alt.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/mbedtls/source/bignum_alt.c 
b/crypto/mbedtls/source/bignum_alt.c
index fe0fe8d51..4cdddc25f 100644
--- a/crypto/mbedtls/source/bignum_alt.c
+++ b/crypto/mbedtls/source/bignum_alt.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/mbedtls/source/bignum_alt.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/mbedtls/source/cmac_alt.c b/crypto/mbedtls/source/cmac_alt.c
index 0b7ed61e9..a72ef94b0 100644
--- a/crypto/mbedtls/source/cmac_alt.c
+++ b/crypto/mbedtls/source/cmac_alt.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/mbedtls/source/cmac_alt.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/mbedtls/source/dev_alt.c b/crypto/mbedtls/source/dev_alt.c
index 9f9206445..1c5c290af 100644
--- a/crypto/mbedtls/source/dev_alt.c
+++ b/crypto/mbedtls/source/dev_alt.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/mbedtls/source/dev_alt.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/mbedtls/source/entropy_alt.c 
b/crypto/mbedtls/source/entropy_alt.c
index 950d78dbd..08323e76c 100644
--- a/crypto/mbedtls/source/entropy_alt.c
+++ b/crypto/mbedtls/source/entropy_alt.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/mbedtls/source/entropy_alt.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/mbedtls/source/md5_alt.c b/crypto/mbedtls/source/md5_alt.c
index 7518305e9..0a9886a7b 100644
--- a/crypto/mbedtls/source/md5_alt.c
+++ b/crypto/mbedtls/source/md5_alt.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/mbedtls/source/md5_alt.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/mbedtls/source/poly1305_alt.c 
b/crypto/mbedtls/source/poly1305_alt.c
index b956fc395..7c0e8110f 100644
--- a/crypto/mbedtls/source/poly1305_alt.c
+++ b/crypto/mbedtls/source/poly1305_alt.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/mbedtls/source/poly1305_alt.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/mbedtls/source/ripemd160_alt.c 
b/crypto/mbedtls/source/ripemd160_alt.c
index 46db7474b..2107a63d1 100644
--- a/crypto/mbedtls/source/ripemd160_alt.c
+++ b/crypto/mbedtls/source/ripemd160_alt.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/mbedtls/source/ripemd160_alt.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/mbedtls/source/sha1_alt.c b/crypto/mbedtls/source/sha1_alt.c
index 4d548e4c1..8c3e6b353 100644
--- a/crypto/mbedtls/source/sha1_alt.c
+++ b/crypto/mbedtls/source/sha1_alt.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/mbedtls/source/sha1_alt.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/mbedtls/source/sha256_alt.c 
b/crypto/mbedtls/source/sha256_alt.c
index 8d154cae5..7b716acb8 100644
--- a/crypto/mbedtls/source/sha256_alt.c
+++ b/crypto/mbedtls/source/sha256_alt.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/mbedtls/source/sha256_alt.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/mbedtls/source/sha512_alt.c 
b/crypto/mbedtls/source/sha512_alt.c
index 6c75fff5f..2793b8426 100644
--- a/crypto/mbedtls/source/sha512_alt.c
+++ b/crypto/mbedtls/source/sha512_alt.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/mbedtls/source/sha512_alt.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/CMakeLists.txt 
b/crypto/openssl_mbedtls_wrapper/CMakeLists.txt
index d993711b3..d16c5c6a1 100644
--- a/crypto/openssl_mbedtls_wrapper/CMakeLists.txt
+++ b/crypto/openssl_mbedtls_wrapper/CMakeLists.txt
@@ -1,6 +1,8 @@
 # 
##############################################################################
 # apps/crypto/openssl_mbedtls_wrapper/CMakeLists.txt
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more 
contributor
 # license agreements.  See the NOTICE file distributed with this work for
 # additional information regarding copyright ownership.  The ASF licenses this
diff --git a/crypto/openssl_mbedtls_wrapper/Make.defs 
b/crypto/openssl_mbedtls_wrapper/Make.defs
index 611dc7321..21f0e1cfb 100644
--- a/crypto/openssl_mbedtls_wrapper/Make.defs
+++ b/crypto/openssl_mbedtls_wrapper/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/crypto/openssl_mbedtls_wrapper/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/Makefile 
b/crypto/openssl_mbedtls_wrapper/Makefile
index b8fb81b48..25f79c63e 100644
--- a/crypto/openssl_mbedtls_wrapper/Makefile
+++ b/crypto/openssl_mbedtls_wrapper/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/crypto/openssl_mbedtls_wrapper/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/aes.h 
b/crypto/openssl_mbedtls_wrapper/include/openssl/aes.h
index a76646aab..4dd165d38 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/aes.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/aes.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/include/openssl/aes.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/asn1.h 
b/crypto/openssl_mbedtls_wrapper/include/openssl/asn1.h
index 3c0284bc9..4bacafd40 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/asn1.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/asn1.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/include/openssl/asn1.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/base.h 
b/crypto/openssl_mbedtls_wrapper/include/openssl/base.h
index b621aabe8..93ec89a55 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/base.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/base.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/include/openssl/base.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/bio.h 
b/crypto/openssl_mbedtls_wrapper/include/openssl/bio.h
index b2a55b3fb..be8acf198 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/bio.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/bio.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/include/openssl/bio.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/bn.h 
b/crypto/openssl_mbedtls_wrapper/include/openssl/bn.h
index 0080c0f02..25b2bcda8 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/bn.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/bn.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/include/openssl/bn.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/bytestring.h 
b/crypto/openssl_mbedtls_wrapper/include/openssl/bytestring.h
index 76f1272c4..b0fc67952 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/bytestring.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/bytestring.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/include/openssl/bytestring.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/cipher.h 
b/crypto/openssl_mbedtls_wrapper/include/openssl/cipher.h
index d057adb53..f7ad5c153 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/cipher.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/cipher.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/include/openssl/cipher.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/curve25519.h 
b/crypto/openssl_mbedtls_wrapper/include/openssl/curve25519.h
index e339a2a76..3c9847c67 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/curve25519.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/curve25519.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/include/openssl/curve25519.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/des.h 
b/crypto/openssl_mbedtls_wrapper/include/openssl/des.h
index 46c2f62ce..2c26a25bc 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/des.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/des.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/include/openssl/des.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/digest.h 
b/crypto/openssl_mbedtls_wrapper/include/openssl/digest.h
index 19d86a411..8dab5d380 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/digest.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/digest.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/include/openssl/digest.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/ec.h 
b/crypto/openssl_mbedtls_wrapper/include/openssl/ec.h
index 80fb6644a..fd906035e 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/ec.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/ec.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/include/openssl/ec.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/ec_key.h 
b/crypto/openssl_mbedtls_wrapper/include/openssl/ec_key.h
index dcb4042aa..2fbd13709 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/ec_key.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/ec_key.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/include/openssl/ec_key.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/ecdsa.h 
b/crypto/openssl_mbedtls_wrapper/include/openssl/ecdsa.h
index e053bb337..426680bb3 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/ecdsa.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/ecdsa.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/include/openssl/ecdsa.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/engine.h 
b/crypto/openssl_mbedtls_wrapper/include/openssl/engine.h
index dea3f35da..7972fbee7 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/engine.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/engine.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/include/openssl/engine.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/err.h 
b/crypto/openssl_mbedtls_wrapper/include/openssl/err.h
index e406d1364..f6637eca4 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/err.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/err.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/include/openssl/err.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/evp.h 
b/crypto/openssl_mbedtls_wrapper/include/openssl/evp.h
index ae5fae9cf..f65a51d88 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/evp.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/evp.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/include/openssl/evp.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/ex_data.h 
b/crypto/openssl_mbedtls_wrapper/include/openssl/ex_data.h
index a00d0b9f8..b77ba49b8 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/ex_data.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/ex_data.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/include/openssl/ex_data.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/hkdf.h 
b/crypto/openssl_mbedtls_wrapper/include/openssl/hkdf.h
index 988cff53a..1b5999358 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/hkdf.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/hkdf.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/include/openssl/hkdf.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/hmac.h 
b/crypto/openssl_mbedtls_wrapper/include/openssl/hmac.h
index 9e3aead63..b44e3626a 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/hmac.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/hmac.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/include/openssl/hmac.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/md5.h 
b/crypto/openssl_mbedtls_wrapper/include/openssl/md5.h
index 492d9a3bb..b77faf9bc 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/md5.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/md5.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/include/openssl/md5.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/mem.h 
b/crypto/openssl_mbedtls_wrapper/include/openssl/mem.h
index f1c001c57..f657068f5 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/mem.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/mem.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/include/openssl/mem.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/nid.h 
b/crypto/openssl_mbedtls_wrapper/include/openssl/nid.h
index 2aa36b077..975af6f7a 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/nid.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/nid.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/include/openssl/nid.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/obj.h 
b/crypto/openssl_mbedtls_wrapper/include/openssl/obj.h
index 2e011a486..4351c5113 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/obj.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/obj.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/include/openssl/obj.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/pem.h 
b/crypto/openssl_mbedtls_wrapper/include/openssl/pem.h
index b14a6c979..0af64792f 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/pem.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/pem.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/include/openssl/pem.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/rand.h 
b/crypto/openssl_mbedtls_wrapper/include/openssl/rand.h
index 3f14f94a2..51dc428ae 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/rand.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/rand.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/include/openssl/rand.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/rsa.h 
b/crypto/openssl_mbedtls_wrapper/include/openssl/rsa.h
index 0337b4ff9..4c5655deb 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/rsa.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/rsa.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/include/openssl/rsa.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/sha.h 
b/crypto/openssl_mbedtls_wrapper/include/openssl/sha.h
index 423d2b335..c2577319f 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/sha.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/sha.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/include/openssl/sha.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/ssl.h 
b/crypto/openssl_mbedtls_wrapper/include/openssl/ssl.h
index c8d29788e..937c1ab95 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/ssl.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/ssl.h
@@ -1,7 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/include/openssl/ssl.h
  *
- * Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+ * SPDX-License-Identifier: Apache-2.0
+ * SPDX-FileCopyrightText: 2015-2016 Espressif Systems (Shanghai) PTE LTD
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/ssl3.h 
b/crypto/openssl_mbedtls_wrapper/include/openssl/ssl3.h
index 43a809a3b..8e2806379 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/ssl3.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/ssl3.h
@@ -1,7 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/include/openssl/ssl3.h
  *
- * Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+ * SPDX-License-Identifier: Apache-2.0
+ * SPDX-FileCopyrightText: 2015-2016 Espressif Systems (Shanghai) PTE LTD
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/ssl_dbg.h 
b/crypto/openssl_mbedtls_wrapper/include/openssl/ssl_dbg.h
index 1d433e44a..84fc7ac62 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/ssl_dbg.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/ssl_dbg.h
@@ -1,7 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/include/openssl/ssl_dbg.h
  *
- * Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+ * SPDX-License-Identifier: Apache-2.0
+ * SPDX-FileCopyrightText: 2015-2016 Espressif Systems (Shanghai) PTE LTD
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/ssl_local.h 
b/crypto/openssl_mbedtls_wrapper/include/openssl/ssl_local.h
index 082be2bcc..b9295d1c9 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/ssl_local.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/ssl_local.h
@@ -1,7 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/include/openssl/ssl_local.h
  *
- * Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+ * SPDX-License-Identifier: Apache-2.0
+ * SPDX-FileCopyrightText: 2015-2016 Espressif Systems (Shanghai) PTE LTD
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/stack.h 
b/crypto/openssl_mbedtls_wrapper/include/openssl/stack.h
index 9419b22db..b92138ee0 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/stack.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/stack.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/include/openssl/stack.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/statem.h 
b/crypto/openssl_mbedtls_wrapper/include/openssl/statem.h
index bdd6dd281..c3f1e9406 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/statem.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/statem.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/include/openssl/statem.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/tls1.h 
b/crypto/openssl_mbedtls_wrapper/include/openssl/tls1.h
index 3b0468221..57fd4fa26 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/tls1.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/tls1.h
@@ -1,7 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/include/openssl/tls1.h
  *
- * Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+ * SPDX-License-Identifier: Apache-2.0
+ * SPDX-FileCopyrightText: 2015-2016 Espressif Systems (Shanghai) PTE LTD
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/types.h 
b/crypto/openssl_mbedtls_wrapper/include/openssl/types.h
index b66b2c6b7..679fb94c5 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/types.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/types.h
@@ -1,7 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/include/openssl/types.h
  *
- * Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+ * SPDX-License-Identifier: Apache-2.0
+ * SPDX-FileCopyrightText: 2015-2016 Espressif Systems (Shanghai) PTE LTD
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/x509.h 
b/crypto/openssl_mbedtls_wrapper/include/openssl/x509.h
index d7d83847e..847aaa4bc 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/x509.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/x509.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/include/openssl/x509.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/x509_local.h 
b/crypto/openssl_mbedtls_wrapper/include/openssl/x509_local.h
index ddecc6209..83799e9b7 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/x509_local.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/x509_local.h
@@ -1,7 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/include/openssl/x509_local.h
  *
- * Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+ * SPDX-License-Identifier: Apache-2.0
+ * SPDX-FileCopyrightText: 2015-2016 Espressif Systems (Shanghai) PTE LTD
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/x509_vfy.h 
b/crypto/openssl_mbedtls_wrapper/include/openssl/x509_vfy.h
index 1cda9abd7..9ecf4fc27 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/x509_vfy.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/x509_vfy.h
@@ -1,7 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/include/openssl/x509_vfy.h
  *
- * Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+ * SPDX-License-Identifier: Apache-2.0
+ * SPDX-FileCopyrightText: 2015-2016 Espressif Systems (Shanghai) PTE LTD
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/x509v3.h 
b/crypto/openssl_mbedtls_wrapper/include/openssl/x509v3.h
index e82e0231a..9f39a729a 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/x509v3.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/x509v3.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/include/openssl/x509v3.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/aes.c 
b/crypto/openssl_mbedtls_wrapper/mbedtls/aes.c
index 7cc64b634..988fec80a 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/aes.c
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/aes.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/mbedtls/aes.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/asn1.c 
b/crypto/openssl_mbedtls_wrapper/mbedtls/asn1.c
index 7d33fd680..343ccc965 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/asn1.c
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/asn1.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/mbedtls/asn1.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/bn.c 
b/crypto/openssl_mbedtls_wrapper/mbedtls/bn.c
index 3a8dfdc73..a066c0b19 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/bn.c
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/bn.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/mbedtls/bn.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/bytestring.c 
b/crypto/openssl_mbedtls_wrapper/mbedtls/bytestring.c
index c6866bafe..68dfc5e06 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/bytestring.c
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/bytestring.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/mbedtls/bytestring.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/cipher.c 
b/crypto/openssl_mbedtls_wrapper/mbedtls/cipher.c
index 8b4a202c1..3cbb25cc6 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/cipher.c
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/cipher.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/mbedtls/cipher.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/curve25519.c 
b/crypto/openssl_mbedtls_wrapper/mbedtls/curve25519.c
index db80f0bfe..eaa105a52 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/curve25519.c
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/curve25519.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/mbedtls/curve25519.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/digest.c 
b/crypto/openssl_mbedtls_wrapper/mbedtls/digest.c
index 14e85b533..41412d396 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/digest.c
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/digest.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/mbedtls/digest.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/ec.c 
b/crypto/openssl_mbedtls_wrapper/mbedtls/ec.c
index 9e07cea95..410cb2a31 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/ec.c
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/ec.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/mbedtls/ec.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/ec_key.c 
b/crypto/openssl_mbedtls_wrapper/mbedtls/ec_key.c
index c5e26b2f2..0fe4287c5 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/ec_key.c
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/ec_key.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/mbedtls/ec_key.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/ecdsa.c 
b/crypto/openssl_mbedtls_wrapper/mbedtls/ecdsa.c
index 76b1352d5..b289a41e2 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/ecdsa.c
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/ecdsa.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/mbedtls/ecdsa.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/engine.c 
b/crypto/openssl_mbedtls_wrapper/mbedtls/engine.c
index 81d736640..3d6a39868 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/engine.c
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/engine.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/mbedtls/engine.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/err.c 
b/crypto/openssl_mbedtls_wrapper/mbedtls/err.c
index 0332253d4..34dad8dc5 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/err.c
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/err.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/mbedtls/err.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/evp.c 
b/crypto/openssl_mbedtls_wrapper/mbedtls/evp.c
index 1f2b8af6c..3045c495a 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/evp.c
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/evp.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/mbedtls/evp.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/hkdf.c 
b/crypto/openssl_mbedtls_wrapper/mbedtls/hkdf.c
index 305e1a1c4..066442858 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/hkdf.c
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/hkdf.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/mbedtls/hkdf.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/hmac.c 
b/crypto/openssl_mbedtls_wrapper/mbedtls/hmac.c
index 1e962d1b5..2e21de016 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/hmac.c
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/hmac.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/mbedtls/hmac.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/md5.c 
b/crypto/openssl_mbedtls_wrapper/mbedtls/md5.c
index 7f32322ff..0d993e06a 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/md5.c
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/md5.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/mbedtls/md5.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/mem.c 
b/crypto/openssl_mbedtls_wrapper/mbedtls/mem.c
index 3d8776105..38fd65cfe 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/mem.c
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/mem.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/mbedtls/mem.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/obj.c 
b/crypto/openssl_mbedtls_wrapper/mbedtls/obj.c
index 11b7e2d8a..c529efa3d 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/obj.c
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/obj.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/mbedtls/obj.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/pbkdf.c 
b/crypto/openssl_mbedtls_wrapper/mbedtls/pbkdf.c
index b36e58a65..8cc890b79 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/pbkdf.c
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/pbkdf.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/mbedtls/pbkdf.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/rand.c 
b/crypto/openssl_mbedtls_wrapper/mbedtls/rand.c
index 7266ef7e0..213ce5eee 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/rand.c
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/rand.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/mbedtls/rand.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/rsa.c 
b/crypto/openssl_mbedtls_wrapper/mbedtls/rsa.c
index 8b9741e50..2e713d09c 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/rsa.c
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/rsa.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/mbedtls/rsa.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/sha.c 
b/crypto/openssl_mbedtls_wrapper/mbedtls/sha.c
index 4541332fb..dba8936cb 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/sha.c
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/sha.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/mbedtls/sha.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_cert.c 
b/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_cert.c
index 49f05b5da..0ac5f281c 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_cert.c
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_cert.c
@@ -1,7 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_cert.c
  *
- * Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+ * SPDX-License-Identifier: Apache-2.0
+ * SPDX-FileCopyrightText: 2015-2016 Espressif Systems (Shanghai) PTE LTD
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_lib.c 
b/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_lib.c
index 7f289247d..a4f0eea40 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_lib.c
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_lib.c
@@ -1,7 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_lib.c
  *
- * Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+ * SPDX-License-Identifier: Apache-2.0
+ * SPDX-FileCopyrightText: 2015-2016 Espressif Systems (Shanghai) PTE LTD
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_methods.c 
b/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_methods.c
index 981a20535..7abddee9f 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_methods.c
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_methods.c
@@ -1,7 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_methods.c
  *
- * Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+ * SPDX-License-Identifier: Apache-2.0
+ * SPDX-FileCopyrightText: 2015-2016 Espressif Systems (Shanghai) PTE LTD
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_methods.h 
b/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_methods.h
index 4b090f509..3c2647814 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_methods.h
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_methods.h
@@ -1,7 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_methods.h
  *
- * Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+ * SPDX-License-Identifier: Apache-2.0
+ * SPDX-FileCopyrightText: 2015-2016 Espressif Systems (Shanghai) PTE LTD
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_pm.c 
b/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_pm.c
index 39cdabb12..95bec900e 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_pm.c
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_pm.c
@@ -1,7 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_pm.c
  *
- * Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+ * SPDX-License-Identifier: Apache-2.0
+ * SPDX-FileCopyrightText: 2015-2016 Espressif Systems (Shanghai) PTE LTD
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_pm.h 
b/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_pm.h
index 6d1b0f629..22e6eda4a 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_pm.h
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_pm.h
@@ -1,7 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_pm.h
  *
- * Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+ * SPDX-License-Identifier: Apache-2.0
+ * SPDX-FileCopyrightText: 2015-2016 Espressif Systems (Shanghai) PTE LTD
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_port.c 
b/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_port.c
index b1ff4ee8b..b21d4fb3a 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_port.c
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_port.c
@@ -1,7 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_port.c
  *
- * Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+ * SPDX-License-Identifier: Apache-2.0
+ * SPDX-FileCopyrightText: 2015-2016 Espressif Systems (Shanghai) PTE LTD
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_port.h 
b/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_port.h
index 2ff053253..90bec6a6a 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_port.h
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_port.h
@@ -1,7 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_port.h
  *
- * Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+ * SPDX-License-Identifier: Apache-2.0
+ * SPDX-FileCopyrightText: 2015-2016 Espressif Systems (Shanghai) PTE LTD
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_rsa.c 
b/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_rsa.c
index 8c0e584cd..0a754317d 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_rsa.c
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_rsa.c
@@ -1,7 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_rsa.c
  *
- * Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+ * SPDX-License-Identifier: Apache-2.0
+ * SPDX-FileCopyrightText: 2015-2016 Espressif Systems (Shanghai) PTE LTD
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/stack.c 
b/crypto/openssl_mbedtls_wrapper/mbedtls/stack.c
index 0ab5e2956..aed407f8a 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/stack.c
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/stack.c
@@ -1,7 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/mbedtls/stack.c
  *
- * Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+ * SPDX-License-Identifier: Apache-2.0
+ * SPDX-FileCopyrightText: 2015-2016 Espressif Systems (Shanghai) PTE LTD
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/statem.c 
b/crypto/openssl_mbedtls_wrapper/mbedtls/statem.c
index d7b13b2e4..f7dd4ed99 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/statem.c
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/statem.c
@@ -1,7 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/mbedtls/statem.c
  *
- * Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+ * SPDX-License-Identifier: Apache-2.0
+ * SPDX-FileCopyrightText: 2015-2016 Espressif Systems (Shanghai) PTE LTD
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/x509.c 
b/crypto/openssl_mbedtls_wrapper/mbedtls/x509.c
index 787c0af7c..27f5abb1d 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/x509.c
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/x509.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/mbedtls/x509.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/x509_vpm.c 
b/crypto/openssl_mbedtls_wrapper/mbedtls/x509_vpm.c
index dfe9e7fab..5bc660d09 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/x509_vpm.c
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/x509_vpm.c
@@ -1,7 +1,8 @@
 /****************************************************************************
  * apps/crypto/openssl_mbedtls_wrapper/mbedtls/x509_vpm.c
  *
- * Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+ * SPDX-License-Identifier: Apache-2.0
+ * SPDX-FileCopyrightText: 2015-2016 Espressif Systems (Shanghai) PTE LTD
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/crypto/tinycrypt/CMakeLists.txt b/crypto/tinycrypt/CMakeLists.txt
index 88c33b976..a44ed6234 100644
--- a/crypto/tinycrypt/CMakeLists.txt
+++ b/crypto/tinycrypt/CMakeLists.txt
@@ -1,6 +1,8 @@
 # 
##############################################################################
 # apps/crypto/tinycrypt/CMakeLists.txt
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more 
contributor
 # license agreements.  See the NOTICE file distributed with this work for
 # additional information regarding copyright ownership.  The ASF licenses this
diff --git a/crypto/tinycrypt/Make.defs b/crypto/tinycrypt/Make.defs
index d9349c9b2..a743cda43 100644
--- a/crypto/tinycrypt/Make.defs
+++ b/crypto/tinycrypt/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/crypto/tinycrypt/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/crypto/tinycrypt/Makefile b/crypto/tinycrypt/Makefile
index 2faba8219..6b3930a91 100644
--- a/crypto/tinycrypt/Makefile
+++ b/crypto/tinycrypt/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/crypto/tinycrypt/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/crypto/tinydtls/CMakeLists.txt b/crypto/tinydtls/CMakeLists.txt
index 129f3750f..c0fd70007 100644
--- a/crypto/tinydtls/CMakeLists.txt
+++ b/crypto/tinydtls/CMakeLists.txt
@@ -1,6 +1,8 @@
 # 
##############################################################################
 # apps/crypto/tinydtls/CMakeLists.txt
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more 
contributor
 # license agreements.  See the NOTICE file distributed with this work for
 # additional information regarding copyright ownership.  The ASF licenses this
diff --git a/crypto/wolfssl/Make.defs b/crypto/wolfssl/Make.defs
index 594fbd38d..889778a18 100644
--- a/crypto/wolfssl/Make.defs
+++ b/crypto/wolfssl/Make.defs
@@ -1,3 +1,25 @@
+# 
##############################################################################
+# apps/crypto/wolfssl/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more 
contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may 
not
+# use this file except in compliance with the License.  You may obtain a copy 
of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# 
##############################################################################
+
 ifeq ($(CONFIG_CRYPTO_WOLFSSL),y)
 CONFIGURED_APPS += $(APPDIR)/crypto/wolfssl
 
diff --git a/crypto/wolfssl/Makefile b/crypto/wolfssl/Makefile
index f2adbb209..77bc546a5 100644
--- a/crypto/wolfssl/Makefile
+++ b/crypto/wolfssl/Makefile
@@ -1,3 +1,25 @@
+# 
##############################################################################
+# apps/crypto/wolfssl/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more 
contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may 
not
+# use this file except in compliance with the License.  You may obtain a copy 
of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# 
##############################################################################
+
 include $(APPDIR)/Make.defs
 
 # wolfSSL SSL/TLS crypto library
diff --git a/crypto/wolfssl/user_settings.h b/crypto/wolfssl/user_settings.h
index d2aa76f1f..66427efdd 100644
--- a/crypto/wolfssl/user_settings.h
+++ b/crypto/wolfssl/user_settings.h
@@ -1,3 +1,24 @@
+/****************************************************************************
+ * apps/crypto/wolfssl/user_settings.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ ****************************************************************************/
+
 #include <nuttx/config.h>
 
 /* Library */


Reply via email to