2 files changed, 107 insertions, 38 deletions

diff --git a/src/core/hle/service/ssl/ssl.cpp b/src/core/hle/service/ssl/ssl.cpp
index 67e37e0823..c9c3edf2a6 100644
--- a/src/core/hle/service/ssl/ssl.cpp
+++ b/src/core/hle/service/ssl/ssl.cpp
@@ -106,6 +106,8 @@ public:
             {33, nullptr, "ExportKeyingMaterial"},
             {34, nullptr, "SetIoTimeout"},
             {35, nullptr, "GetIoTimeout"},
+            {36, nullptr, "GetSessionTicket"}, // 20.0.0+
+            {37, nullptr, "SetSessionTicket"}, // 20.0.0+
         };
         // clang-format on
 
diff --git a/src/core/hle/service/ssl/ssl_types.h b/src/core/hle/service/ssl/ssl_types.h
index dbc3dbf64c..9a9793f4f3 100644
--- a/src/core/hle/service/ssl/ssl_types.h
+++ b/src/core/hle/service/ssl/ssl_types.h
@@ -11,7 +11,7 @@ enum class CaCertificateId : s32 {
     All = -1,
     NintendoCAG3 = 1,
     NintendoClass2CAG3 = 2,
-    NintendoRootCAG4 = 3,
+    NintendoRootCAG4 = 3,  // [16.0.0+]
     AmazonRootCA1 = 1000,
     StarfieldServicesRootCertificateAuthorityG2 = 1001,
     AddTrustExternalCARoot = 1002,
@@ -29,10 +29,10 @@ enum class CaCertificateId : s32 {
     EntrustnetCertificationAuthority2048 = 1014,
     EntrustRootCertificationAuthority = 1015,
     EntrustRootCertificationAuthorityG2 = 1016,
-    GeoTrustGlobalCA2 = 1017,
-    GeoTrustGlobalCA = 1018,
-    GeoTrustPrimaryCertificationAuthorityG3 = 1019,
-    GeoTrustPrimaryCertificationAuthority = 1020,
+    GeoTrustGlobalCA2 = 1017,  // [8.0.0+] TrustedCertStatus is EnabledNotTrusted
+    GeoTrustGlobalCA = 1018,   // [8.0.0+] TrustedCertStatus is EnabledNotTrusted
+    GeoTrustPrimaryCertificationAuthorityG3 = 1019,  // [8.0.0+] TrustedCertStatus is EnabledNotTrusted
+    GeoTrustPrimaryCertificationAuthority = 1020,    // [8.0.0+] TrustedCertStatus is EnabledNotTrusted
     GlobalSignRootCA = 1021,
     GlobalSignRootCAR2 = 1022,
     GlobalSignRootCAR3 = 1023,
@@ -40,38 +40,105 @@ enum class CaCertificateId : s32 {
     GoDaddyRootCertificateAuthorityG2 = 1025,
     StarfieldClass2CertificationAuthority = 1026,
     StarfieldRootCertificateAuthorityG2 = 1027,
-    thawtePrimaryRootCAG3 = 1028,
-    thawtePrimaryRootCA = 1029,
-    VeriSignClass3PublicPrimaryCertificationAuthorityG3 = 1030,
-    VeriSignClass3PublicPrimaryCertificationAuthorityG5 = 1031,
-    VeriSignUniversalRootCertificationAuthority = 1032,
-    DSTRootCAX3 = 1033,
-    USERTrustRsaCertificationAuthority = 1034,
-    ISRGRootX10 = 1035,
-    USERTrustEccCertificationAuthority = 1036,
-    COMODORsaCertificationAuthority = 1037,
-    COMODOEccCertificationAuthority = 1038,
-    AmazonRootCA2 = 1039,
-    AmazonRootCA3 = 1040,
-    AmazonRootCA4 = 1041,
-    DigiCertAssuredIDRootG3 = 1042,
-    DigiCertGlobalRootG3 = 1043,
-    DigiCertTrustedRootG4 = 1044,
-    EntrustRootCertificationAuthorityEC1 = 1045,
-    EntrustRootCertificationAuthorityG4 = 1046,
-    GlobalSignECCRootCAR4 = 1047,
-    GlobalSignECCRootCAR5 = 1048,
-    GlobalSignECCRootCAR6 = 1049,
-    GTSRootR1 = 1050,
-    GTSRootR2 = 1051,
-    GTSRootR3 = 1052,
-    GTSRootR4 = 1053,
-    SecurityCommunicationRootCA = 1054,
-    GlobalSignRootE4 = 1055,
-    GlobalSignRootR4 = 1056,
-    TTeleSecGlobalRootClass2 = 1057,
-    DigiCertTLSECCP384RootG5 = 1058,
-    DigiCertTLSRSA4096RootG5 = 1059,
+    thawtePrimaryRootCAG3 = 1028,  // [8.0.0+] TrustedCertStatus is EnabledNotTrusted
+    thawtePrimaryRootCA = 1029,     // [8.0.0+] TrustedCertStatus is EnabledNotTrusted
+    VeriSignClass3PublicPrimaryCertificationAuthorityG3 = 1030,  // [8.0.0+] TrustedCertStatus is EnabledNotTrusted
+    VeriSignClass3PublicPrimaryCertificationAuthorityG5 = 1031,  // [8.0.0+] TrustedCertStatus is EnabledNotTrusted
+    VeriSignUniversalRootCertificationAuthority = 1032,           // [8.0.0+] TrustedCertStatus is EnabledNotTrusted
+    DSTRootCAX3 = 1033,  // [6.0.0+]
+    USERTrustRsaCertificationAuthority = 1034,  // [10.0.3+]
+    ISRGRootX10 = 1035,  // [10.1.0+]
+    USERTrustEccCertificationAuthority = 1036,  // [10.1.0+]
+    COMODORsaCertificationAuthority = 1037,     // [10.1.0+]
+    COMODOEccCertificationAuthority = 1038,     // [10.1.0+]
+    AmazonRootCA2 = 1039,  // [11.0.0+]
+    AmazonRootCA3 = 1040,  // [11.0.0+]
+    AmazonRootCA4 = 1041,  // [11.0.0+]
+    DigiCertAssuredIDRootG3 = 1042,  // [11.0.0+]
+    DigiCertGlobalRootG3 = 1043,     // [11.0.0+]
+    DigiCertTrustedRootG4 = 1044,    // [11.0.0+]
+    EntrustRootCertificationAuthorityEC1 = 1045,  // [11.0.0+]
+    EntrustRootCertificationAuthorityG4 = 1046,   // [11.0.0+]
+    GlobalSignECCRootCAR4 = 1047,  // [11.0.0+]
+    GlobalSignECCRootCAR5 = 1048,  // [11.0.0+]
+    GlobalSignECCRootCAR6 = 1049,  // [11.0.0+]
+    GTSRootR1 = 1050,  // [11.0.0+]
+    GTSRootR2 = 1051,  // [11.0.0+]
+    GTSRootR3 = 1052,  // [11.0.0+]
+    GTSRootR4 = 1053,  // [11.0.0+]
+    SecurityCommunicationRootCA = 1054,  // [12.0.0+]
+    GlobalSignRootE4 = 1055,  // [15.0.0+]
+    GlobalSignRootR4 = 1056,  // [15.0.0+]
+    TTeleSecGlobalRootClass2 = 1057,  // [15.0.0+]
+    DigiCertTLSECCP384RootG5 = 1058,  // [16.0.0+]
+    DigiCertTLSRSA4096RootG5 = 1059,  // [16.0.0+]
+    NintendoTempRootCAG4 = 65536,     // [16.0.0+] ([19.0.0+] Removed)
+
+    // Nintendo round-robin certificates [20.0.0+]
+    NintendoRR01 = 32801,
+    NintendoRR02 = 32802,
+    NintendoRR03 = 32803,
+    NintendoRR04 = 32804,
+    NintendoRR05 = 32805,
+    NintendoRR06 = 32806,
+    NintendoRR07 = 32807,
+    NintendoRR08 = 32808,
+    NintendoRR09 = 32809,
+    NintendoRR10 = 32810,
+    NintendoRR11 = 32811,
+    NintendoRR12 = 32812,
+    NintendoRR13 = 32813,
+    NintendoRR14 = 32814,
+    NintendoRR15 = 32815,
+    NintendoRR16 = 32816,
+    NintendoRR17 = 32817,
+    NintendoRR18 = 32818,
+    NintendoRR19 = 32819,
+    NintendoRR20 = 32820,
+    NintendoRR21 = 32821,
+    NintendoRR22 = 32822,
+    NintendoRR23 = 32823,
+    NintendoRR24 = 32824,
+    NintendoRR25 = 32825,
+    NintendoRR26 = 32826,
+    NintendoRR27 = 32827,
+    NintendoRR28 = 32828,
+    NintendoRR29 = 32829,
+    NintendoRR30 = 32830,
+    NintendoRR31 = 32831,
+    NintendoRR32 = 32832,
+    NintendoRR33 = 32833,
+    NintendoRR34 = 32834,
+    NintendoRR35 = 32835,
+    NintendoRR36 = 32836,
+    NintendoRR37 = 32837,
+    NintendoRR38 = 32838,
+    NintendoRR39 = 32839,
+    NintendoRR40 = 32840,
+    NintendoRR41 = 32841,
+    NintendoRR42 = 32842,
+    NintendoRR43 = 32843,
+    NintendoRR44 = 32844,
+    NintendoRR45 = 32845,
+    NintendoRR46 = 32846,
+    NintendoRR47 = 32847,
+    NintendoRR48 = 32848,
+    NintendoRR49 = 32849,
+    NintendoRR50 = 32850,
+    NintendoRR51 = 32851,
+    NintendoRR52 = 32852,
+    NintendoRR53 = 32853,
+    NintendoRR54 = 32854,
+    NintendoRR55 = 32855,
+    NintendoRR56 = 32856,
+    NintendoRR57 = 32857,
+    NintendoRR58 = 32858,
+    NintendoRR59 = 32859,
+    NintendoRR60 = 32860,
+    NintendoRR61 = 32861,
+    NintendoRR62 = 32862,
+    NintendoRR63 = 32863,
+    NintendoRR64 = 32864,
 };
 
 enum class TrustedCertStatus : s32 {
@@ -104,4 +171,4 @@ struct CertStoreEntry {
 };
 static_assert(sizeof(CertStoreEntry) == 0x10, "CertStoreEntry has incorrect size.");
 
-} // namespace Service::SSL
+} // namespace Service::SSL
\ No newline at end of file