diff options
| author | Paul Gardiner <paul.gardiner@artifex.com> | 2018-02-01 13:19:48 +0000 |
|---|---|---|
| committer | Paul Gardiner <paul.gardiner@artifex.com> | 2018-02-02 12:38:36 +0000 |
| commit | e0b3451e473885a39ed54c8bf7a98e48a3cf5502 (patch) | |
| tree | 0a77d892ba31113d5ad486a17e82ca84f838c7d1 /include | |
| parent | 8bbe483bfd390d894bedfe82f1d4609db4260f81 (diff) | |
| download | mupdf-e0b3451e473885a39ed54c8bf7a98e48a3cf5502.tar.xz | |
Signature support: code-style and typo fixes
Diffstat (limited to 'include')
| -rw-r--r-- | include/mupdf/helpers/pkcs7-openssl.h | 6 | ||||
| -rw-r--r-- | include/mupdf/pdf/document.h | 20 |
2 files changed, 13 insertions, 13 deletions
diff --git a/include/mupdf/helpers/pkcs7-openssl.h b/include/mupdf/helpers/pkcs7-openssl.h index a6268839..6e236fd0 100644 --- a/include/mupdf/helpers/pkcs7-openssl.h +++ b/include/mupdf/helpers/pkcs7-openssl.h @@ -7,16 +7,16 @@ * stored by the operating system or within a file. */ /* Check a signature's digest against ranges of bytes drawn from a stream */ -SignatureError pkcs7_openssl_check_digest(fz_context *ctx, fz_stream *stm, char *sig, int sig_len); +enum pdf_signature_error pkcs7_openssl_check_digest(fz_context *ctx, fz_stream *stm, char *sig, int sig_len); /* Check a singature's certificate is trusted */ -SignatureError pkcs7_openssl_check_certificate(char *sig, int sig_len); +enum pdf_signature_error pkcs7_openssl_check_certificate(char *sig, int sig_len); /* Obtain the designated name information from signature's certificate */ pdf_pkcs7_designated_name *pkcs7_openssl_designated_name(fz_context *ctx, char *sig, int sig_len); /* Free the resources associated with designated name information */ -void pkcs7_opensll_drop_designated_name(fz_context *ctx, pdf_pkcs7_designated_name *dn); +void pkcs7_openssl_drop_designated_name(fz_context *ctx, pdf_pkcs7_designated_name *dn); /* Read the certificate and private key from a pfx file, holding it as an opaque structure */ pdf_pkcs7_signer *pkcs7_openssl_read_pfx(fz_context *ctx, const char *pfile, const char *pw); diff --git a/include/mupdf/pdf/document.h b/include/mupdf/pdf/document.h index 124de254..5b5963ba 100644 --- a/include/mupdf/pdf/document.h +++ b/include/mupdf/pdf/document.h @@ -535,17 +535,17 @@ void pdf_update_page(fz_context *ctx, pdf_page *page); */ int pdf_has_unsaved_changes(fz_context *ctx, pdf_document *doc); -typedef enum +enum pdf_signature_error { - SignatureError_Okay, - SignatureError_NoSignatures, - SignatureError_NoCertificate, - SignatureError_DocumentChanged, - SignatureError_SelfSigned, - SignatureError_SelfSignedInChain, - SignatureError_NotTrusted, - SignatureError_Unknown -} SignatureError; + PDF_SIGNATURE_ERROR_OKAY, + PDF_SIGNATURE_ERROR_NO_SIGNATURES, + PDF_SIGNATURE_ERROR_NO_CERTIFICATE, + PDF_SIGNATURE_ERROR_DOCUMENT_CHANGED, + PDF_SIGNATURE_ERROR_SELF_SIGNED, + PDF_SIGNATURE_ERROR_SELF_SIGNED_IN_CHAIN, + PDF_SIGNATURE_ERROR_NOT_TRUSTED, + PDF_SIGNATURE_ERROR_UNKNOWN +}; typedef struct pdf_pkcs7_designated_name_s { |