Fix typos and add security ontology to build targets
Makefile.am
6 | 6 | SOURCES= \ | |
7 | 7 | activitystreams/activitystreams.scm \ | |
8 | 8 | activitystreams/ontology.scm \ | |
9 | + | http-signature/ontology.scm \ | |
9 | 10 | webfinger/webfinger.scm | |
10 | 11 | ||
11 | 12 | info_TEXINFOS= doc/guile-fediverse.texi |
http-signature/ontology.scm
15 | 15 | ;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | |
16 | 16 | ;;;; | |
17 | 17 | ||
18 | - | (define-module (http-signatures ontology) | |
18 | + | (define-module (http-signature ontology) | |
19 | 19 | #:use-module (activitystreams activitystreams) | |
20 | 20 | #:use-module (ice-9 match) | |
21 | 21 | #:use-module (jsonld json) | |
… | |||
28 | 28 | (comment "") (subclass-of '())) | |
29 | 29 | (make-as-type label #:uri uri #:comment comment #:subclass-of subclass-of)) | |
30 | 30 | ||
31 | - | (define* (make-as-property label domain range | |
32 | - | #:key (uri (string-append as:vocab label)) | |
31 | + | (define* (make-sec-property label domain range | |
32 | + | #:key (uri (string-append sec:vocab label)) | |
33 | 33 | (functional? #f) (subproperty-of '()) (comment "")) | |
34 | 34 | (make-as-property label domain range #:uri uri #:functional? functional? | |
35 | 35 | #:subproperty-of subproperty-of #:comment comment)) | |
36 | 36 | ||
37 | + | (define date? (@@ (activitystreams ontology) date?)) | |
38 | + | (define iri? (@@ (activitystreams ontology) iri?)) | |
39 | + | ||
37 | 40 | ;; Classes | |
38 | 41 | ||
39 | 42 | (define sec:Digest | |
… | |||
109 | 112 | (define sec:authenticationTag | |
110 | 113 | (make-sec-property | |
111 | 114 | "authenticationTag" "EncryptedMessage" string? | |
112 | - | #:coment | |
115 | + | #:comment | |
113 | 116 | "Not specified")) | |
114 | 117 | ||
115 | 118 | (define sec:creator | |
116 | 119 | (make-sec-property | |
117 | 120 | "creator" "Signature" iri? | |
118 | - | #:coment | |
121 | + | #:comment | |
119 | 122 | "Not specified")) | |
120 | 123 | ||
121 | 124 | (define sec:cipherAlgorithm | |
… | |||
292 | 295 | sec:privateKeyPem sec:publicKey sec:publicKeyPem sec:publicKeyService | |
293 | 296 | sec:revoked sec:signature sec:signatureValue sec:signatureAlgorithm)) | |
294 | 297 | ||
295 | - | (define (security-ontology (append sec-types sec-properties))) | |
298 | + | (define security-ontology (append sec-types sec-properties)) |