diff options
| author | John-Mark Bell <jmb@netsurf-browser.org> | 2022-05-27 20:32:07 +0100 |
|---|---|---|
| committer | John-Mark Bell <jmb@netsurf-browser.org> | 2022-05-27 20:32:07 +0100 |
| commit | 230aa1736ff7e2aa77a5fc4fce55f5b048f9a9e4 (patch) | |
| tree | d080044fd9f7953aea8581ae7d97208313ab6df9 | |
| parent | eb94b0696c637e4c7295a6771ffad17b62d8a49a (diff) | |
| download | netsurf-230aa1736ff7e2aa77a5fc4fce55f5b048f9a9e4.tar.gz netsurf-230aa1736ff7e2aa77a5fc4fce55f5b048f9a9e4.tar.bz2 | |
RISC OS: use OS CertData resource, if present
| -rw-r--r-- | frontends/riscos/gui.c | 2 | ||||
| -rw-r--r-- | frontends/riscos/scripts/Run | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/frontends/riscos/gui.c b/frontends/riscos/gui.c index 6b8f1a56b..22f6f257c 100644 --- a/frontends/riscos/gui.c +++ b/frontends/riscos/gui.c @@ -306,7 +306,7 @@ set_colour_from_wimp(struct nsoption_s *opts, static nserror set_defaults(struct nsoption_s *defaults) { /* Set defaults for absent option strings */ - nsoption_setnull_charp(ca_bundle, strdup("NetSurf:Resources.ca-bundle")); + nsoption_setnull_charp(ca_bundle, strdup("<NetSurf$CABundle>")); nsoption_setnull_charp(cookie_file, strdup("NetSurf:Cookies")); nsoption_setnull_charp(cookie_jar, strdup(CHOICES_PREFIX "Cookies")); diff --git a/frontends/riscos/scripts/Run b/frontends/riscos/scripts/Run index 4a51d7838..94aa933b0 100644 --- a/frontends/riscos/scripts/Run +++ b/frontends/riscos/scripts/Run @@ -43,6 +43,9 @@ If "<InetDBase$Path>" = "" Then Error Internet resources can not be found If "<Unicode$Path>" = "" Then Error NetSurf requires the !Unicode resource. This can be found, along with the Iconv module, at http://www.netsurf-browser.org/projects/iconv/ If "<Inet$MimeMappings>" = "" Then Set Inet$MimeMappings InetDBase:MimeMap +| Use OS copy of root CA bundle, if present +IfThere InetDBase:CertData Then Set NetSurf$CABundle InetDBase:CertData Else Set NetSurf$CABundle NetSurf:Resources.ca-bundle + | Define this alias for clarity | Syntax: NetSurfRMLoad <Path to module> Set Alias$NetSurfRMLoad IfThere %%*0 Then RMLoad %%*0 |