upstream: github.com/mirleft/ocaml-x509
Upgrade to ocamlformat 0.29.0; fix csvt/sexpt streaming; reformat
- Update .ocamlformat to 0.29.0 across all 591 files
- csvt: reuse single Buffer.t for field reads (no alloc per field)
- sexpt: Obj members decoded from stream into Dict, typed Variant GADT
- Reformat all source files for 0.29.0
+19
-19
+3
-3
lib/crl.ml
+3
-3
lib/crl.ml
···
188
188
(fun crl ->
189
189
if Distinguished_name.equal (Certificate.subject super) (issuer crl) then
190
190
match validate ?allowed_hashes crl (Certificate.public_key super) with
191
-
| Ok () -> begin
192
-
try
191
+
| Ok () ->
192
+
begin try
193
193
let entry =
194
194
List.find
195
195
(fun r -> String.equal (Certificate.serial cert) r.serial)
···
200
200
| Some `Remove_from_CRL -> false
201
201
| Some _ -> true
202
202
with Not_found -> false
203
-
end
203
+
end
204
204
| Error _ -> false
205
205
else false)
206
206
crls
+9
-9
lib/private_key.ml
+9
-9
lib/private_key.ml
···
50
50
51
51
let of_string ?seed_or_data ?bits typ data =
52
52
match seed_or_data with
53
-
| None -> begin
54
-
match typ with
53
+
| None ->
54
+
begin match typ with
55
55
| `RSA -> Ok (generate ~seed:data ?bits `RSA)
56
56
| _ ->
57
57
let* data = Base64.decode data in
58
58
of_octets data typ
59
-
end
59
+
end
60
60
| Some `Seed -> Ok (generate ~seed:data ?bits typ)
61
61
| Some `Data ->
62
62
let* data = Base64.decode data in
···
84
84
| `RSA key, `RSA_PKCS1 ->
85
85
let* d = hashed () in
86
86
Ok (Crypto_pk.Rsa.PKCS1.sign ~key ~hash (`Digest d))
87
-
| `ED25519 key, `ED25519 -> begin
88
-
match data with
87
+
| `ED25519 key, `ED25519 ->
88
+
begin match data with
89
89
| `Message m -> Ok (Ed25519.sign ~key m)
90
90
| `Digest _ -> Error (`Msg "Ed25519 only suitable with raw message")
91
-
end
91
+
end
92
92
| (#ecdsa as key), `ECDSA ->
93
93
let* d = hashed () in
94
94
Ok
···
124
124
in
125
125
let f (v, (n, (e, (d, (p, (q, (dp, (dq, (q', other))))))))) =
126
126
match (v, other) with
127
-
| 0, None -> begin
128
-
match Rsa.priv ~e ~d ~n ~p ~q ~dp ~dq ~q' with
127
+
| 0, None ->
128
+
begin match Rsa.priv ~e ~d ~n ~p ~q ~dp ~dq ~q' with
129
129
| Ok p -> p
130
130
| Error (`Msg m) -> parse_error "bad RSA private key %s" m
131
-
end
131
+
end
132
132
| _ -> parse_error "multi-prime RSA keys not supported"
133
133
and g { Rsa.e; d; n; p; q; dp; dq; q' } =
134
134
(0, (n, (e, (d, (p, (q, (dp, (dq, (q', None)))))))))
+3
-3
lib/public_key.ml
+3
-3
lib/public_key.ml
···
132
132
let hashp x = x = hash in
133
133
let* d = hashed hash data in
134
134
ok_if_true (Crypto_pk.Rsa.PKCS1.verify ~hashp ~key ~signature (`Digest d))
135
-
| `ED25519 key, `ED25519 -> begin
136
-
match data with
135
+
| `ED25519 key, `ED25519 ->
136
+
begin match data with
137
137
| `Message msg -> ok_if_true (Ed25519.verify ~key signature ~msg)
138
138
| `Digest _ -> Error (`Msg "Ed25519 only suitable with raw message")
139
-
end
139
+
end
140
140
| (#ecdsa as key), `ECDSA ->
141
141
let* d = hashed hash data in
142
142
let* s = ecdsa_of_str signature in
+3
-3
lib/x509.mli
+3
-3
lib/x509.mli
···
912
912
extensions in the [signing_request] are ignored, you can pass them using:
913
913
914
914
{[
915
-
match Ext.find Extensions (info csr).extensions with
916
-
| Ok ext -> ext
917
-
| Error _ -> Extension.empty
915
+
match Ext.find Extensions (info csr).extensions with
916
+
| Ok ext -> ext
917
+
| Error _ -> Extension.empty
918
918
]} *)
919
919
end
920
920