Merge pull request #158 from avsm/base64-3

support base64.3.0.0

Author: avsm

CHANGES.md

@@ -1,3 +1,8 @@
+v1.1.1
+------
+
+* Support Base64.3.0.0 interface (@avsm)
+
 v1.1.0 2019-01-05
 -----------------
 

dns.opam

@@ -37,7 +37,7 @@ depends: [
   "re" {>="1.7.2"}
   "ipaddr" {>= "2.6.0"}
   "uri" {>= "1.7.0"}
-  "base64" {>= "2.0.0"}
+  "base64" {>= "3.0.0"}
   "hashcons"
   "result"
 ]

lib/loader.ml

@@ -274,7 +274,7 @@ let add_srv_rr pri weight port target ttl owner db =
 let add_dnskey_rr flags typ key ttl owner db =
   let flags = flags in
   let typ = typ in
-  let tmp = B64.decode key in
+  let tmp = Base64.decode_exn key in
   let dnskey = Name.hashcons_string tmp in
   add_rrset { ttl; rdata = DNSKEY [ (flags, typ, dnskey) ] } owner db
 
@@ -344,7 +344,7 @@ let add_rrsig_rr typ alg lbl orig_ttl exp_ts inc_ts tag name sign ttl owner db =
       | Some a -> a
   in
     (* TODO: Check if sign is in the future or if the sign has expired *)
-  let sign = B64.decode sign in
+  let sign = Base64.decode_exn sign in
   let rr = RRSIG [{
     rrsig_type   = typ;
     rrsig_alg    = alg;

lib/packet.ml

@@ -260,7 +260,7 @@ let rdata_to_string = function
   | DNSKEY (flags, alg, key)
     -> (sprintf "DNSKEY (%d, %s, %s)"
           flags (dnssec_alg_to_string alg)
-          (B64.encode key)
+          (Base64.encode_exn key)
     )
   | HINFO (cpu, os) -> sprintf "HINFO (%s, %s)" cpu os
   | ISDN (a, sa)
@@ -292,7 +292,7 @@ let rdata_to_string = function
   | SRV (x, y, z, n)
     -> sprintf "SRV (%d,%d,%d, %s)" x y z (Name.to_string n)
   | TXT sl -> sprintf "TXT (%s)" (String.concat "" sl)
-  | UNKNOWN (x, bs) -> sprintf "UNKNOWN (%d) '%s'" x (B64.encode bs)
+  | UNKNOWN (x, bs) -> sprintf "UNKNOWN (%d) '%s'" x (Base64.encode_exn bs)
   (* | UNSPEC bs -> sprintf "UNSPEC (%s)" bs*)
   | WKS (a, y, s) ->
     sprintf "WKS (%s, %d, %s)" (Ipaddr.V4.to_string a) (Cstruct.byte_to_int y) s
@@ -304,11 +304,11 @@ let rdata_to_string = function
       sprintf "RRSIG (%s %s %d %ld %ld %ld %d %s %s)"
         (rr_type_to_string typ)
         (dnssec_alg_to_string alg) (int_of_char lbl) orig_ttl exp_ts inc_ts
-        tag (Name.to_string name) (B64.encode sign)
+        tag (Name.to_string name) (Base64.encode_exn sign)
   | SIG  (alg, exp_ts, inc_ts, tag, name, sign) ->
       sprintf "SIG (UNUSED %s 0 0 %ld %ld %d %s %s)"
         (dnssec_alg_to_string alg) exp_ts inc_ts
-        tag (Name.to_string name) (B64.encode sign)
+        tag (Name.to_string name) (Base64.encode_exn sign)
    | DS (keytag, alg, digest_t, digest)
     -> (sprintf "DS (%d,%s,%s, '%s')" keytag
           (dnssec_alg_to_string alg) (digest_alg_to_string digest_t)