Clena up the code a bit more

FreeRTOS · Nov 15, 2023 · e6f3e20 · e6f3e20
1 parent 87df8a0
commit e6f3e20
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 93 deletions.
diff --git a/examples/evkbmimxrt1060/bootloader/signing_pub_key.c b/examples/evkbmimxrt1060/bootloader/signing_pub_key.c
@@ -1,38 +1,45 @@
-/* Autogenerated by imgtool.py, do not edit. */
-const unsigned char rsa_pub_key[] = {
-    0x30, 0x82, 0x01, 0x0a, 0x02, 0x82, 0x01, 0x01,
-    0x00, 0xbc, 0x84, 0xfa, 0x41, 0x04, 0xc8, 0x06,
-    0x42, 0x97, 0x88, 0x49, 0x1a, 0x71, 0x8e, 0x69,
-    0x80, 0xe6, 0x09, 0x1c, 0xf7, 0x0e, 0x56, 0xf5,
-    0x69, 0x40, 0x92, 0x58, 0xfb, 0x05, 0x49, 0x17,
-    0x88, 0xbe, 0x92, 0x69, 0x8d, 0x8d, 0x76, 0x9f,
-    0x3f, 0xd1, 0x95, 0x9e, 0x13, 0xd9, 0x12, 0x91,
-    0x21, 0x65, 0x26, 0x30, 0x0f, 0x4a, 0xe1, 0xa1,
-    0x2c, 0x07, 0x98, 0xe8, 0x6c, 0x77, 0x5e, 0xa0,
-    0x84, 0xaa, 0x6f, 0xf3, 0x8c, 0x5e, 0x7c, 0x7c,
-    0x73, 0xbc, 0x1f, 0xf9, 0xff, 0xba, 0x08, 0x68,
-    0x43, 0x26, 0xc5, 0xce, 0x23, 0x24, 0x8c, 0xdc,
-    0xbd, 0xc1, 0x46, 0xe5, 0xad, 0xb9, 0x1a, 0x63,
-    0xa1, 0xf2, 0x01, 0xbc, 0xbc, 0x18, 0xd1, 0xdf,
-    0xd2, 0x2d, 0x76, 0x0b, 0xa9, 0x3f, 0xdf, 0x7c,
-    0x92, 0xa2, 0xc0, 0x90, 0x0d, 0x53, 0x3c, 0x52,
-    0x2a, 0xde, 0x00, 0xdd, 0x38, 0x9a, 0xbf, 0x7a,
-    0x6e, 0xcd, 0x69, 0x20, 0x32, 0x14, 0x74, 0xb8,
-    0xef, 0x8b, 0x46, 0x93, 0x70, 0xc8, 0xef, 0xb7,
-    0x1c, 0x84, 0xdf, 0xf4, 0xa7, 0x41, 0x2b, 0x69,
-    0x43, 0x06, 0xcd, 0xf5, 0x97, 0xef, 0xc3, 0x6f,
-    0xb5, 0x0b, 0x3b, 0x16, 0xdd, 0xe6, 0x7e, 0x33,
-    0x9c, 0xf3, 0xf2, 0x8f, 0xc7, 0x43, 0x95, 0x80,
-    0x9c, 0xb8, 0x16, 0xee, 0xfe, 0x21, 0x92, 0x0d,
-    0x22, 0xae, 0xfa, 0xdc, 0x03, 0xee, 0x6a, 0xe2,
-    0x94, 0xe2, 0xec, 0x0a, 0x87, 0xb8, 0x8e, 0x2f,
-    0x6e, 0x61, 0xe8, 0xcb, 0xf5, 0x78, 0x7c, 0x55,
-    0xff, 0xba, 0xdb, 0x45, 0xd1, 0x80, 0xa6, 0xb2,
-    0x21, 0x42, 0xd7, 0x99, 0xb6, 0x51, 0x47, 0x63,
-    0x6a, 0x38, 0x9e, 0x24, 0xdb, 0x0a, 0x25, 0xf2,
-    0x87, 0x72, 0x69, 0x01, 0xb6, 0xd6, 0x31, 0xb3,
-    0xb6, 0xfe, 0x63, 0x4f, 0x7d, 0xa5, 0xe2, 0x20,
-    0xc6, 0xac, 0x19, 0x38, 0xc8, 0x9b, 0x14, 0x48,
-    0x9d, 0x02, 0x03, 0x01, 0x00, 0x01,
-};
-const unsigned int rsa_pub_key_len = 270;
+/*
+ * Copyright (C) 2017 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * http://www.FreeRTOS.org
+ * http://aws.amazon.com/freertos
+ *
+ * 1 tab == 4 spaces!
+ */
+
+#include "mcuboot_config.h"
+
+#if defined( MCUBOOT_SIGN_RSA )
+
+#error Please use MCUBoot imgtool.py to generate an RSA signing key \
+    and replace this file with the output of the tool.
+
+const unsigned char rsa_pub_key[] = { 0x00 };
+const unsigned int rsa_pub_key_len = 0;
+
+#elif defined( MCUBOOT_SIGN_EC256 )
+
+#error Please use MCUBoot imgtool.py to generate an EC signing key \
+    and replace this file with the output of the tool.
+
+const unsigned char ecdsa_pub_key[] = { 0x00 };
+const unsigned int ecdsa_pub_key_len = 0;
+
+#endif /* if defined( MCUBOOT_SIGN_RSA ) */
diff --git a/examples/evkbmimxrt1060/pubsub/include/demo_config.h b/examples/evkbmimxrt1060/pubsub/include/demo_config.h
@@ -184,59 +184,6 @@
     "YyRIHN8wfdVoOw==\n"                                                 \
     "-----END CERTIFICATE-----\n"
 
-
-#define democonfigCLIENT_CERT                                        \
-"-----BEGIN CERTIFICATE-----\n"                                      \
-"MIIDWTCCAkGgAwIBAgIUagogBlAFrSVCRmy/R4cTG0sKUY8wDQYJKoZIhvcNAQEL\n" \
-"BQAwTTFLMEkGA1UECwxCQW1hem9uIFdlYiBTZXJ2aWNlcyBPPUFtYXpvbi5jb20g\n" \
-"SW5jLiBMPVNlYXR0bGUgU1Q9V2FzaGluZ3RvbiBDPVVTMB4XDTIzMDQyMDAwMDkx\n" \
-"OFoXDTQ5MTIzMTIzNTk1OVowHjEcMBoGA1UEAwwTQVdTIElvVCBDZXJ0aWZpY2F0\n" \
-"ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKuOqGqQQA9n2YiWWnuI\n" \
-"9wh+4MOVoKvQzDROPDyMCI0RE64oNbVkJorvXT7hkfTnTHDycH+HFdW23GoF3DYM\n" \
-"pC3erfZYJx8lTa8aMD54b7c/R4CKIUpul/DXHxydMsQkms2JsBrNHJe0M2Ncy7Mj\n" \
-"Ls93/3X3SZH3Y3KRsHjIfKwXykAiXO8xESpMqrR17Ds1nX9YSpaV/GVwXNMW9q4Z\n" \
-"OEabACB/9Abe/X8Cbx9NO9MVFUUBo4f0yDOozKLtySrZDA3pCut65d9AzL7nYFES\n" \
-"7Huz3XNKJmaxkbLJAt+mOBeHvAz0sgSGXq49ZD4GQv3B+M+QfB/gdf9sCPh1Shr6\n" \
-"9c8CAwEAAaNgMF4wHwYDVR0jBBgwFoAUIW/2XOdttQYIm/6ny5PMa+LkWWcwHQYD\n" \
-"VR0OBBYEFIII+RWqm/Bvwcmm19dcO2Ft8i98MAwGA1UdEwEB/wQCMAAwDgYDVR0P\n" \
-"AQH/BAQDAgeAMA0GCSqGSIb3DQEBCwUAA4IBAQA6LQZwf5aMwvW5eX2jwZ5AFXKT\n" \
-"ZgeSwsCl85aa1Kd2ypkJvBFMGWzZFsBVOQ3FOkTWzSskBon37idHhTSaWHWoVlTL\n" \
-"9HbGR1/hCLecyT8u9+gyQvMHFlJIBn8diyxCC1M+bRsIrlQvfDPmoAJtiYIHY5Ny\n" \
-"KYACwIair5/DJuFaMpvnp2OZTtrLhmC7JDMLOX/z+2CpUNh0SpvRZKTv0TDYCjI/\n" \
-"h0szC+J9CJjqkrwGo5WrPy2KKXBkpjYHM1pOOlrzan90+gBtvBwhucCM1mso2CoC\n" \
-"hqPTGfFeM8Pro/YPdpnFAmOgJVp3ADV/c6PO+YoogKRtHvw2mfjY+W1cDlP3\n"     \
-"-----END CERTIFICATE-----\n"
-
-
-#define democonfigPRIVATE_KEY                                        \
-"-----BEGIN RSA PRIVATE KEY-----\n"                                  \
-"MIIEpQIBAAKCAQEAq46oapBAD2fZiJZae4j3CH7gw5Wgq9DMNE48PIwIjRETrig1\n" \
-"tWQmiu9dPuGR9OdMcPJwf4cV1bbcagXcNgykLd6t9lgnHyVNrxowPnhvtz9HgIoh\n" \
-"Sm6X8NcfHJ0yxCSazYmwGs0cl7QzY1zLsyMuz3f/dfdJkfdjcpGweMh8rBfKQCJc\n" \
-"7zERKkyqtHXsOzWdf1hKlpX8ZXBc0xb2rhk4RpsAIH/0Bt79fwJvH0070xUVRQGj\n" \
-"h/TIM6jMou3JKtkMDekK63rl30DMvudgURLse7Pdc0omZrGRsskC36Y4F4e8DPSy\n" \
-"BIZerj1kPgZC/cH4z5B8H+B1/2wI+HVKGvr1zwIDAQABAoIBAQCehLbBoIBQu9iZ\n" \
-"CLSaqTf5taLhlgRcPhYxzoiCObI9BqZ0qdrWvK+QeRRj4fIHpSFQy/N/IsbeLpUD\n" \
-"sl6D4rJhX/zGPzYG5WUegshJMOepHuNmtjuElyP1+hBZVDdwXZJckPkUCqp80pkZ\n" \
-"GsltwPij43E9Az4LjddqKYwyTq5EJEKV1XOMOuJrsrhNaQXj5nR4NAhBWCwlWlqc\n" \
-"N3MF/fMnkNWxLDxszhLOqhzDGdRFG0hd2lakOrrJE0ni5nFvImaJltpVfUEaiNz6\n" \
-"ApOvqnbZkc7OUkjo0AkHbKF3Rms4UK2FSdGAAClGD/pwQTexLPOcWM4/ChIWTXz0\n" \
-"tqBO0xbBAoGBAOR7uysqgwI8UY2ghHQjve/zwTMpwcmLFoyO8G1Az+XTZ4cpJpPS\n" \
-"ahx4JEYyVWNRNmzGd8kNByJfFlTn1jA8+UNkZ4e3sUEkqIVi1X5T1OFC1loHTm3p\n" \
-"659JKdclHC4a/wUFJT5qLMcQZl9MQCT8H9r/i5J8Vl2WAa+XxuW+E8CnAoGBAMA3\n" \
-"3TyvXPJoksdx/aoF3N2XmBqqf2w0gRQhx+DHF1TT8Wq4MvvBW1RmgbcqzASLnJ5X\n" \
-"8EITou1CRnY3cloNH92UbiJOhilnx0YLoYrtXyjqd8gKur0oimqCa/Je1kIzVvVE\n" \
-"jcLv0qUz6RxhcuL2rEJVJkyDFn56kF2p2jfmhN6ZAoGBAJfKh68GwCB1GC0B7d0G\n" \
-"fcHy63BlFmQh7ioVMC809qkVyFqoAQQFrw8Y1eh4ufeQVZrwQ1YjPJEeIMTpfIdx\n" \
-"ipu2EX29kJnZk8eBwJn7cZrxf1wyLG2jETEyNwTCl7UdpDyejX6opPTetVQsYRTx\n" \
-"Fuy0BvKbffkQljAkojOxEohTAoGABcrpMOX8ABYkrjwCL/iDQm5KGCuhMWqXpTqr\n" \
-"Ylu9mUHV2ah5aNrX3MBGEnYIte5bJu5xgBxFYa8InpFnMc2Jc00A0KnbIy5MdBDv\n" \
-"qlci8gG24GFqZT7uhO0vQZuYC2Cusy+Asio2B+J7mO5a3voeENWuFMoyiFc7OIdg\n" \
-"2yRoRqkCgYEAyibvs/asjQvizuq6lKareyZUjDuSm46qP3J4ZXOfikfo4hRNUg6j\n" \
-"z55hEHAxmUlAYQ2Osc7Muvgu+TkSyQjzGtFq2YYaRFKxBolgvjUkfO0pittRYp9z\n" \
-"SchJH+g761pKSO4maBLHZ2Y86Ok/DPVmR+/bWpawgmf52nVL8NSl66s=\n"         \
-"-----END RSA PRIVATE KEY-----\n"
-
 /**
  * @brief An option to disable Server Name Indication.
  *

diff --git a/examples/evkbmimxrt1060/pubsub/main.c b/examples/evkbmimxrt1060/pubsub/main.c
@@ -40,8 +40,6 @@
 /* FreeRTOS+TCP Includes */
 #include "FreeRTOS_IP.h"
 
-//#include "enet_ethernetif.h"
-
 #include "fsl_phyksz8081.h"
 #include "fsl_enet_mdio.h"
 #include "fsl_gpio.h"