daniel/MontaukOS
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: move 0:/etc/ => 0:/os/certs/

Browse Source
This commit is contained in:
Daniel Hammer
2026-05-28 20:30:00 +02:00
parent e0778c1b2c
commit e17a8de844
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
programs/GNUmakefile
+3 -3
View File
@@ -76,7 +76,7 @@ WWWSRC := $(wildcard $(WWWDIR)/*.*)
WWWDST := $(patsubst $(WWWDIR)/%,$(BINDIR)/www/%,$(WWWSRC)) WWWDST := $(patsubst $(WWWDIR)/%,$(BINDIR)/www/%,$(WWWSRC))
# CA certificate bundle. # CA certificate bundle.
CA_CERTS := $(BINDIR)/etc/ca-certificates.crt CA_CERTS := $(BINDIR)/os/certs/ca-certificates.crt
# System config TOML files bundled into bin/config/. # System config TOML files bundled into bin/config/.
CONFIGDIR := data/config CONFIGDIR := data/config
@@ -326,9 +326,9 @@ $(BINDIR)/www/%: $(WWWDIR)/%
mkdir -p $(BINDIR)/www mkdir -p $(BINDIR)/www
cp $< $@ cp $< $@
# Copy CA certificate bundle into bin/etc/. # Copy CA certificate bundle into bin/os/certs/.
$(CA_CERTS): data/ca-certificates.crt $(CA_CERTS): data/ca-certificates.crt
mkdir -p $(BINDIR)/etc mkdir -p $(BINDIR)/os/certs
cp $< $@ cp $< $@
# Copy system config files into bin/config/. # Copy system config files into bin/config/.
programs/lib/tls/tls.cpp
+1 -1
View File
@@ -109,7 +109,7 @@ namespace tls {
TrustAnchors load_trust_anchors() { TrustAnchors load_trust_anchors() {
TrustAnchors tas = {nullptr, 0, 0}; TrustAnchors tas = {nullptr, 0, 0};
int fh = montauk::open("0:/etc/ca-certificates.crt"); int fh = montauk::open("0:/os/certs/ca-certificates.crt");
if (fh < 0) return tas; if (fh < 0) return tas;
uint64_t fsize = montauk::getsize(fh); uint64_t fsize = montauk::getsize(fh);
if (fsize == 0 || fsize > 512 * 1024) { montauk::close(fh); return tas; } if (fsize == 0 || fsize > 512 * 1024) { montauk::close(fh); return tas; }
template/docs/syscalls.md
+2 -2
View File
@@ -325,7 +325,7 @@ Provides a high-level `tls::https_fetch()` that handles socket creation, BearSSL
```cpp ```cpp
#include <tls/tls.hpp> #include <tls/tls.hpp>
// Load CA certificates (from 0:/etc/ca-certificates.crt) // Load CA certificates (from 0:/os/certs/ca-certificates.crt)
tls::TrustAnchors tas = tls::load_trust_anchors(); tls::TrustAnchors tas = tls::load_trust_anchors();
// Build HTTP request // Build HTTP request
@@ -349,7 +349,7 @@ if (n > 0) {
```cpp ```cpp
namespace tls { namespace tls {
// Load PEM CA bundle from 0:/etc/ca-certificates.crt // Load PEM CA bundle from 0:/os/certs/ca-certificates.crt
TrustAnchors load_trust_anchors(); TrustAnchors load_trust_anchors();
// High-level: DNS → socket → TLS → exchange → cleanup // High-level: DNS → socket → TLS → exchange → cleanup