Merge branch 'feature/https_and_wss_support_certificate_verify' into …

…'master' feat(ESPAT-2072): Added the support for certificate configuration in websocket See merge request application/esp-at!1614
espressif · Sep 24, 2024 · 04796db · 04796db
2 parents 97ff011 + 18255f6
commit 04796db
Show file tree

Hide file tree

Showing 21 changed files with 157 additions and 6 deletions.
diff --git a/components/at/lib/VERSION b/components/at/lib/VERSION
@@ -1,6 +1,6 @@
-ESP32:   9c3f527
-ESP32C3: 9c3f527
-ESP32C2: 9c3f527
-ESP32C5: 9c3f527
-ESP32C6: 9c3f527
-ESP32S2: 9c3f527
+ESP32:   2dd43f3
+ESP32C3: 2dd43f3
+ESP32C2: 2dd43f3
+ESP32C5: 2dd43f3
+ESP32C6: 2dd43f3
+ESP32S2: 2dd43f3
diff --git a/components/at/lib/libesp32_at_core.a b/components/at/lib/libesp32_at_core.a
diff --git a/components/at/lib/libesp32_at_core_silence.a b/components/at/lib/libesp32_at_core_silence.a
diff --git a/components/at/lib/libesp32c2_at_core.a b/components/at/lib/libesp32c2_at_core.a
diff --git a/components/at/lib/libesp32c2_at_core_silence.a b/components/at/lib/libesp32c2_at_core_silence.a
diff --git a/components/at/lib/libesp32c3_at_core.a b/components/at/lib/libesp32c3_at_core.a
diff --git a/components/at/lib/libesp32c3_at_core_silence.a b/components/at/lib/libesp32c3_at_core_silence.a
diff --git a/components/at/lib/libesp32c5_at_core.a b/components/at/lib/libesp32c5_at_core.a
diff --git a/components/at/lib/libesp32c5_at_core_silence.a b/components/at/lib/libesp32c5_at_core_silence.a
diff --git a/components/at/lib/libesp32c6_at_core.a b/components/at/lib/libesp32c6_at_core.a
diff --git a/components/at/lib/libesp32c6_at_core_silence.a b/components/at/lib/libesp32c6_at_core_silence.a
diff --git a/components/at/lib/libesp32s2_at_core.a b/components/at/lib/libesp32s2_at_core.a
diff --git a/components/at/lib/libesp32s2_at_core_silence.a b/components/at/lib/libesp32s2_at_core_silence.a
diff --git a/components/customized_partitions/at_customized_config_dependency.txt b/components/customized_partitions/at_customized_config_dependency.txt
@@ -12,5 +12,8 @@ AT_EAP_COMMAND_SUPPORT=y wpa2_ca
 AT_MQTT_BROKER_AUTH_CLIENT=y mqtt_cert
 AT_MQTT_BROKER_AUTH_CLIENT=y mqtt_key
 AT_MQTT_CLIENT_AUTH_BROKER=y mqtt_ca
+AT_WSS_SERVER_AUTH_CLIENT=y wss_cert
+AT_WSS_SERVER_AUTH_CLIENT=y wss_key
+AT_WSS_CLIENT_AUTH_SERVER=y wss_ca
 AT_CUSTOMIZED_PARTITION_TABLE_SUPPORT=y factory_param
 AT_CUSTOMIZED_PARTITION_TABLE_SUPPORT=y mfg_nvs
diff --git a/components/customized_partitions/raw_data/wss_ca/wss_ca_00.crt b/components/customized_partitions/raw_data/wss_ca/wss_ca_00.crt
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDNjCCAh6gAwIBAgIUelwnPikNHqHVs6nvMRcxr6f3494wDQYJKoZIhvcNAQEL
+BQAwNjELMAkGA1UEBhMCQ04xFTATBgNVBAoMDEVTUFJFU1NJRiBBVDEQMA4GA1UE
+AwwHUm9vdCBDQTAeFw0yNDA5MTkwOTMzMzlaFw0zNDA5MTcwOTMzMzlaMDYxCzAJ
+BgNVBAYTAkNOMRUwEwYDVQQKDAxFU1BSRVNTSUYgQVQxEDAOBgNVBAMMB1Jvb3Qg
+Q0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9bAAe6bIhDWusc4Zl
+t3lzHPcqy9TtLKk9fpKVLsNg3ttqbxBE6LLSIyxDqlBXr2k2tzXCqflAXxne4/vU
+h2A/f4PaV0S6qA/hX0/KN+Vzmx7ACd9s7Y997VKILq1PIeztkgHLgm8xanJEoCwY
+e4tBYm0AMbtTJrvEHMiycf63siBg3Ql7fhLCLK1c/yPhbpDCItgN8gJ4MkO5fbl8
+Pbgs8ublE5V9AFUenubJBklY2Y9XPnXsBO2LyxWs/HU3jUE67eEH52Fa+UUP9c1c
+aOdvd9p7jdVh3UCNoi6Zhoiq4/j/QVK/VYR9pTYDepUuUDP/lyUkp4udORAW9/l6
+CDd9AgMBAAGjPDA6MAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQDAgGmMB0GA1UdDgQW
+BBQ2tC03EPS1qlRzNzwzCWeE9kTzhjANBgkqhkiG9w0BAQsFAAOCAQEABjrs/LHM
+iFodfPy2lnH2RsYvrtKPiKSzSoWIRRZDzOD+6k2MGRHUzJPgVZVe7/jIPs9LvwBJ
+2myTRbSDhIGbxxxslETUr5ILV6CKvOMsNyxxd/vCmVaX6zckwZdEM2VXubYiURgd
+F2qNYJC8UD/uXONPg1hsEjgGiS/nBYgHQD9/swCaodirB0qhAsWdanDnOOwRO2Go
++mSmt+UNntJ84xNsgdmz16UPNbBY+g4EsTGzdVA+EOXh4OKHPIWiggn9RXqhpAUJ
+3kr+tNrwy+Cuvwjp07dyH/5KhVoP4MMuwuWHOBKDL1qdIYnvDBugvQOfEHvgm/p+
+HnVmMqNyMC4s4w==
+-----END CERTIFICATE-----
diff --git a/components/customized_partitions/raw_data/wss_ca/wss_ca_01.crt b/components/customized_partitions/raw_data/wss_ca/wss_ca_01.crt
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDNjCCAh6gAwIBAgIUJr9Tfy1IE0XtRs1OlQbk4TbVS0gwDQYJKoZIhvcNAQEL
+BQAwNjELMAkGA1UEBhMCQ04xFTATBgNVBAoMDEVTUFJFU1NJRiBBVDEQMA4GA1UE
+AwwHUm9vdCBDQTAeFw0yNDA5MjAwNzIwMTdaFw0zNDA5MTgwNzIwMTdaMDYxCzAJ
+BgNVBAYTAkNOMRUwEwYDVQQKDAxFU1BSRVNTSUYgQVQxEDAOBgNVBAMMB1Jvb3Qg
+Q0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC584yFqRLcPcFAkg3K
+JhbOFDSnAy8WRAWlkWcSjeDhggOB0XsHUTRRog8SpAkSNWjd+cet+ShwX4q4xzK3
+9ezdikdff5Uck43Jesq5kJJeU2FikM1pZSXhDp9CbaIKUEBYPxxzHpN2gwQnpsam
+DSmU5kMxWqz7ApFB7OvuoF1X0CvDivy/tbROqbmsRiKxXrP6LXW/iU8GexSc79IP
+cKy+P2074GMvvLyoptMaMTJDpNlC4b4eQd7LJqX9YDuayyeDj5Qa4V4clINUgE7E
+oETMs/DsJhNzfl51tBY8aekPzX01HFX6yHsJfxCYd+ytnLvJkaFISQAsoUWizJvq
+MKn7AgMBAAGjPDA6MAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQDAgGmMB0GA1UdDgQW
+BBRSowxSgKQaXfJX9D8I7REYLLCFnDANBgkqhkiG9w0BAQsFAAOCAQEAEuDUIJ3p
+JK3Y06/6ZlIlydEf4xFzgQbypwsiuXLJtUWIWSW+tLM6h+ZavC4zZquhpEenGivA
+xBHzZRLnoNir49dEu7iRuaPXgDTqAIKABp5pijqfBOER0CtEZ3RJN0CDp/uFvNVj
+DgmQEbln3GgZOGmlZq7HCt8qjjh4EtgUF9xuvHRWe6r7XeLdWizmJpgbGVpzQsU4
+ZjwhFNk26cNnDgymH+XUYXWxWgWdW9FuW3xPdYPy00OuuMW7BBKC1zTAPNYVzcY5
+Qf3q7DdlQ843D+4Se08WxlAgN9uERDnIeLNQg2D4sCEBF03LrFZTySIWzdfebpie
+AT3Fmt79fS8U0w==
+-----END CERTIFICATE-----
diff --git a/components/customized_partitions/raw_data/wss_cert/wss_client_00.crt b/components/customized_partitions/raw_data/wss_cert/wss_client_00.crt
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDVTCCAj2gAwIBAgIUU9SUFafUqdi1wY7MKsCiQLhgtYowDQYJKoZIhvcNAQEL
+BQAwNjELMAkGA1UEBhMCQ04xFTATBgNVBAoMDEVTUFJFU1NJRiBBVDEQMA4GA1UE
+AwwHUm9vdCBDQTAeFw0yNDA5MTkwOTMzNDBaFw0zNDA5MTcwOTMzNDBaMDQxCzAJ
+BgNVBAYTAkNOMRUwEwYDVQQKDAxFU1BSRVNTSUYgQVQxDjAMBgNVBAMMBUwxIENB
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6fEH9zc8k5J0T6/FHAg0
+TtnkLLeRUHAC5z7ktGj+Uh89+0TPKmOaZwZgt1OzKlNViiBsjQ2HDD4Sx6SsmDjt
+PKaYeQQMqmT1rr/i8zZ0aM9aBmLf4NSlxYjPIKcE+jwBKtTVRJbdRWhf5warwTYS
+TaFWgOwJuT+sgLjI+EOSC1IrBgOzPeKSKMx9lRE2FbZuIsSDgRt7hhzYtmEszCUT
+UFufmCEREY1FUADoVO1CGh0CA88qjCFrwHKNGeOi7aPyvhQg7YySm+9jxSAQM5ja
+6nQ1Zih2zXDILeuYQ+EypOTRmRnjms3GWDNHH85jc+L3dFHyx1sHpfFQV2G/cj9k
+mwIDAQABo10wWzAMBgNVHRMEBTADAQH/MAsGA1UdDwQEAwIBpjAdBgNVHQ4EFgQU
+ygBw5k6+8VsTzpE6MxzFC62tjdUwHwYDVR0jBBgwFoAUXTyezavll0oizeGS1iZU
+EH465u8wDQYJKoZIhvcNAQELBQADggEBAFFT8lFpO2BbIVXIZ/jUaGHJDMSOxDa/
+qc+AyVgt9yMC7PcsPbT1Kknh8p5j4N7Q24IXMZLVxQn5+UvW4jmLW17qkSDGmLw9
+7/v8AHX1TG+O20XnfDu76DsYehGaLcHHbN4xtBxRegjQiTbS1DHHwgn1n8q9AZQ4
+VZsDJ26FXk8tU0mqeczSoy7n01O8fV2TyaP3lrVOg42bjv8CprqFI5GDdlGVGSrb
+Je2gyfWJWuZAv5gJijjoSfXCMaWorciuUxQLZ3+6UkEbRzb3W+WnzZGYzr0wQ8v1
+5nuzX682byeXrKLKwGf7aatyY/KNIKvpM2A1TBlcPt1mqQb0pb+hIlo=
+-----END CERTIFICATE-----
diff --git a/components/customized_partitions/raw_data/wss_cert/wss_client_01.crt b/components/customized_partitions/raw_data/wss_cert/wss_client_01.crt
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDVTCCAj2gAwIBAgIUMdO6g/swC7QyVKSCRf6KBRrxyCIwDQYJKoZIhvcNAQEL
+BQAwNjELMAkGA1UEBhMCQ04xFTATBgNVBAoMDEVTUFJFU1NJRiBBVDEQMA4GA1UE
+AwwHUm9vdCBDQTAeFw0yNDA5MjAwNzIwMTdaFw0zNDA5MTgwNzIwMTdaMDQxCzAJ
+BgNVBAYTAkNOMRUwEwYDVQQKDAxFU1BSRVNTSUYgQVQxDjAMBgNVBAMMBUwxIENB
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqR0jZ9O0jjSyH+AlpO93
+TTIYiM2ubHOaAgMxGGGrhs56UZG4pUaXi8RZyuDcoqhMzaSvclWE1U9X92zLyHhW
+LdmVhA9beuyOShB5bRJFDcYaXi+mqdPUJfmxOTw+WmKaCtKIC4mt2rx2LIPKYQAd
+CtgF2z7h/vo7RH30xAfwBarXdxu/Jfo0AUfdYcs3hQubXPUeNW4QA1iRAV7XPtFz
+gPqmbuom/6u8xxotlsuryg7+5+rINZ2le+Pp9JDeUNq5TQET6cdQFN/LjaDsrr30
+F0ytqPoqfMF8fc0/qAdOc35H7umrns3zXEcvMqYWEqWdd1ZucoaX7OKnNsusbXd6
+jQIDAQABo10wWzAMBgNVHRMEBTADAQH/MAsGA1UdDwQEAwIBpjAdBgNVHQ4EFgQU
+LOtkBR+qeP3dsC0pYpxz2r7iM1gwHwYDVR0jBBgwFoAU3/3LzSJtxUowyAY8Ce3N
+mUOhtKYwDQYJKoZIhvcNAQELBQADggEBACYPB1tgwlIck/Z2UeaHIzs7G05UJVwa
+PJnGGmgtFzezT4uFgYF/3AVdUuswZymHBTCbQMLTAS2CxDz5P8Wp0pWr3m42B0IE
+tnT9SFVzIdxDJy/ltaJEM+vA3kGc8zMChQTp0vG/13P8Z8czfVdS/UGA5OAviLGa
+UPRlQ59Yt/ne4jyfaNyDioU6K3MSf7bH4yArto4jtkVaoAZYi3AyAytmsh3B2PN/
+5Dl+RgAfYAb4+HhijHApaGSc3V49XgrxDcFISGr4mOmX1PIlCf4EcEI6+7k05loI
+ppe+gHNHHTI2ur5KpiGuQm34f507NM85RgmvMcaiHUHFoQN/bl22360=
+-----END CERTIFICATE-----
diff --git a/components/customized_partitions/raw_data/wss_key/wss_client_00.key b/components/customized_partitions/raw_data/wss_key/wss_client_00.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDp8Qf3NzyTknRP
+r8UcCDRO2eQst5FQcALnPuS0aP5SHz37RM8qY5pnBmC3U7MqU1WKIGyNDYcMPhLH
+pKyYOO08pph5BAyqZPWuv+LzNnRoz1oGYt/g1KXFiM8gpwT6PAEq1NVElt1FaF/n
+BqvBNhJNoVaA7Am5P6yAuMj4Q5ILUisGA7M94pIozH2VETYVtm4ixIOBG3uGHNi2
+YSzMJRNQW5+YIRERjUVQAOhU7UIaHQIDzyqMIWvAco0Z46Lto/K+FCDtjJKb72PF
+IBAzmNrqdDVmKHbNcMgt65hD4TKk5NGZGeOazcZYM0cfzmNz4vd0UfLHWwel8VBX
+Yb9yP2SbAgMBAAECggEACRmWseCwCK85limom+auXsf73qRJWg86gkEgecbunsZO
+VsWwlUutI3UVoAdmd3gEYoM+Xt2u19t/a8zxDKNf9ewmxnrjs87S/gFVHWJDBvXU
+KfBJz7IV4UOgGdagy13vBkMRcmZKNykZgMSo8o5dLnlM3fj1GZYQDwgOzKhOgU8D
+dvuT4b0PY5aBeSGYk0NidOd2UQAvmAAIpBn7FWrpaQHkc5V7+cpW8kwQTLj2Yggl
+puAiK91idBl1FI2si7GDmoaMt13fx5zrIKpvCjqmUgzgVGCyE+62rJa1nice8ViC
+vbEsgarV+vvLdZtE9uVRYO7fTzIZE8ORO/A//aujwQKBgQD25DvWlkAYkrlY4jCM
+pMDtBO2yHjFVsPfG8A6CBsfON3XoNh6QQlzL3hNH9izE9LQmCVaTqJSN/Y9Acjxa
+TUX7VdcQ/LcmNrA2hABMwPuRQRWVsxjWsRKyH4hAHtxSECd4Tm5xHojus7Jielka
+0SfKYCtIgmopBMyGEe705Di+OwKBgQDykn21PnUZ0hRMmh/MX3m+M1KoMj8WMP67
+BtSp/9LhHY7ZiQlj6wgPZQfGtYggzZbMJxufzDnCDdbM8qnTyVF0r0cUe39y7mh9
+asyseJIDoIb4DuK8H1RQK1BJaTdhCx5J6DHVKDnNhK2xiP6k9nQNDFJd22MQKjXG
+k6CPsBOtIQKBgHxohb6b97BqPvuK/uvgGVdWJHCcxj9n7XNRg/4BbK19ROy+WKhY
+yGnyfcTFR8n3hM+l5PqC+FiUbJsM9VyLk7gSiU0GC0Q2SpUt7vi+RgXrxfSpStrk
+X4diXEXzRxITEdCNtRlLSbT+1+THwh7BRku0KhtfnB8PTABDCSZd2joBAoGBAMuK
+wJDk573S2dWtPiFvu+gtiJ46C1XDpvuor6o2T+01sDg5FPgSr6C7VdsXWDKuUGre
+Jf/gjlaW5jbzKC3eL8uJiEtXlYoLIwKaK0RNp7gDaz2awAa7AzSCI8x1zVJQ0gmS
+HL6QEnCxdE4UdhhV9Os9+59mB6n4wUbveTsYtGoBAoGBAKxn3jCZ0T8CtL5EVeRk
+uh1Zb+Fjl1ecOpdnYPlPJsnhdmoAGwwXqZihQIVaMBTeXLWXDbyKt/pmQ0Bb7PMm
+mn9HsFwG06o9M/HBTzg6IFpzZzk433aXZiIUaeM0zAAdhyJROi5BjAExLkp311QA
+vgfMLXH1Th7PHrSW+ufZYfF0
+-----END PRIVATE KEY-----
diff --git a/components/customized_partitions/raw_data/wss_key/wss_client_01.key b/components/customized_partitions/raw_data/wss_key/wss_client_01.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCpHSNn07SONLIf
+4CWk73dNMhiIza5sc5oCAzEYYauGznpRkbilRpeLxFnK4NyiqEzNpK9yVYTVT1f3
+bMvIeFYt2ZWED1t67I5KEHltEkUNxhpeL6ap09Ql+bE5PD5aYpoK0ogLia3avHYs
+g8phAB0K2AXbPuH++jtEffTEB/AFqtd3G78l+jQBR91hyzeFC5tc9R41bhADWJEB
+Xtc+0XOA+qZu6ib/q7zHGi2Wy6vKDv7n6sg1naV74+n0kN5Q2rlNARPpx1AU38uN
+oOyuvfQXTK2o+ip8wXx9zT+oB05zfkfu6auezfNcRy8yphYSpZ13Vm5yhpfs4qc2
+y6xtd3qNAgMBAAECggEAHGKp7fQ8tu7U5CFLKEVShMhPEm1VpNn9hG91Nuaz8/9l
+zBm1wLYZ20mkmbdHCV1O8Oh+02XT0zsLZJokFVzPeEgwfrdWL0qT8o4T15Esuoxh
+IiSE6LYHwq0HyHfabnDk8sKWN7uPDSs7earQVho/BbIvP3btV484Uf2DT0EW0lhu
+ECZaD7MbT5J1bowCC64qrXMYOtZXWu3NTDfY4SVYLPW1Vr5VNJXH57GzEuZnrKQ4
+DEwSgja8/SCboWIzwgz/jXsKlsgpHWAXSMMnwZo3A82nkal8w2rnCAbK0MIuKNbe
+G1dECpKXhmtCSjPS06aPHzScwRNy+RKqrTMmQxt90QKBgQDT5ydR9eOevdvL/o7y
+8luBYRGpTstpdfHPrEtSrROwNejUTr/338ihAb/JARNsLmHvSuj4mbi4jASXVw/G
+uy8x6DqIYt/S1Y4c2Z0NDhMte5tSwVs645f+6R8OtSQxbaRY0yQLvFo4ErWn6vNZ
+ZLjvwjDHP4IfGEx0qJguC6mfsQKBgQDMTnOLxaqWkvdPq3NQ65skcqnZE+Lw/mtO
+Ms90vo7tB9m+zJicokCjwbtZrHaFLeRT+xgBapwPtvDD2iZSSehBWcQAPD8+y6nA
+mljo48dqU+HqXtlMa/I25iGkdwhZzbZaIem489bRB3gEamN6IJhZ6O8UrFMr7sg6
+Fk6Maj77nQKBgQCbFJHPRvBl7bcdbVh67uoPHtZJHXR64ymsfgDGKgq9rEaQkm2l
+3+45/0i3t4TaaHueICmuPvpUfYyiocHXBIj+smGcDRiXeVk/PffVZRad89dx0jaN
+O6GymjPzlJg/YGml5Ch+OkOgw/iUQrwEEVXTikAeohj93s+dlQGCuWBTkQKBgC2p
++zlqXM562rv73jJf9rUWy8+xGjAzLVi1EplNXjSsZIa4xAN+YGQ5kN5iJbtunnIG
+1T67zVXV1cpwn9AUpMy2e5Bx5tDqRG7AEM882f1x8jSoLnleRyzuEubnk/4+dFuA
+6PRly8W8nZ6fCMzrLCIsZgOA4LYZELeq9LN9q8YhAoGAK+8RcPb18HCQXpFS3quo
+BIqypgbA1ya0wv4lavltdFb/GtMGHIsUX2agJV43A1f4ThpOrWLY9U1LWlNPtv2c
+fBaG7MSLt7RCvSeJWeIsB6bUHKY/VwudojXeGKnCtqtrkwWVwcRWKWlUcsSE4ZzL
+hNxq4nv5uJISP4FOEGhdx28=
+-----END PRIVATE KEY-----
diff --git a/main/Kconfig b/main/Kconfig
@@ -162,6 +162,18 @@ config AT_WS_COMMAND_SUPPORT
     default "n"
     depends on AT_ENABLE
 
+menu "AT WebSocket authentication method"
+    depends on AT_WS_COMMAND_SUPPORT
+
+config AT_WSS_SERVER_AUTH_CLIENT
+    bool "Server authenticates clients"
+    default y
+
+config AT_WSS_CLIENT_AUTH_SERVER
+    bool "Client authenticates server"
+    default y
+endmenu
+
 config AT_BLE_COMMAND_SUPPORT
     bool "AT ble command support."
     default "y" if !IDF_TARGET_ESP32C2