@@ -62,3 +62,3 @@
 
 func (b Bookmarks) IniDump() string {
-	if len(b.Titles) < 0 {
+	if len(b.Titles) < 1 {

@@ -834,2 +834,3 @@
 	case "gemini":
-		capsule, err := gemini.Visit(u.Host, u.Port, u.Resource)
+		capsule, err := gemini.Visit(u.Host, u.Port, u.Resource, &c.Certs)
+		go saveConfig()

@@ -24,8 +24,8 @@ type Config struct {
 	Bookmarks	struct {
 		Titles, Links []string 
 	}
-	Colors    []KeyValue

@@ -43,1 +111,4 @@
 
+	// Verify that the handshake ahs completed and that
+	// the hostname on the certificate(s) from the server
+	// is the hostname we have requested

@@ -44,0 +119,4 @@
+	hostCertExists := td.Exists(host)
+	matched := false
+
+	for _, cert := range connState.PeerCertificates {

@@ -38,3 +38,3 @@
 func MakeUrl(u string) (Url, error) {
 	var out Url
-	re := regexp.MustCompile(`^((?P<scheme>gopher|telnet|http|https|gemini)://)?(?P<host>[w-.d]+)(?::(?P<port>d+)?)?(?:/(?P<type>[01345679gIhisp])?)?(?P<resource>.*)?$`)
+	re := regexp.MustCompile(`^((?P<scheme>[a-zA-Z]+)://)?(?P<host>[w-.d]+)(?::(?P<port>d+)?)?(?:/(?P<type>[01345679gIhisp])?)?(?P<resource>.*)?$`)

@@ -67,3 +63,4 @@
 		return out, fmt.Errorf("no host")
 	}
 
+	out.Scheme = strings.ToLower(out.Scheme)

@@ -93,0 +87,4 @@
+		}
+		if out.Resource == "" || out.Resource == "/" {
+			out.Mime = "1"
+		}

@@ -19,0 +56,4 @@
+	return "", fmt.Errorf("Invalid hostname, no key saved")
+}
+
+func (t *TofuDigest) Match(host string, cState *tls.ConnectionState) error {

@@ -19,0 +83,4 @@
+	return fmt.Errorf("No matching certificate was found for host %q", host)
+}
+
+func (t *TofuDigest) newCert(host string, cState *tls.ConnectionState) error {

@@ -43,1 +149,4 @@
 
+	connState := conn.ConnectionState()
+
+	// Begin TOFU screening...

@@ -229,0 +369,4 @@
+	for i, data := range hash {
+		hex[i] = []byte(fmt.Sprintf("%02X", data))
+	}
+	return fmt.Sprintf("%s", string(bytes.Join(hex, []byte(":"))))