From e0b3451e473885a39ed54c8bf7a98e48a3cf5502 Mon Sep 17 00:00:00 2001 From: Paul Gardiner Date: Thu, 1 Feb 2018 13:19:48 +0000 Subject: Signature support: code-style and typo fixes --- source/helpers/pkcs7/pkcs7-check.c | 32 +++++++++++++++--------------- source/helpers/pkcs7/pkcs7-openssl.c | 38 ++++++++++++++++++------------------ 2 files changed, 35 insertions(+), 35 deletions(-) (limited to 'source/helpers/pkcs7') diff --git a/source/helpers/pkcs7/pkcs7-check.c b/source/helpers/pkcs7/pkcs7-check.c index 72b6af90..4c70bb2c 100644 --- a/source/helpers/pkcs7/pkcs7-check.c +++ b/source/helpers/pkcs7/pkcs7-check.c @@ -6,7 +6,7 @@ #include -static void pdf_print_designated_name(pdf_pkcs7_designated_name *name, char *buf, int buflen) +static void pdf_format_designated_name(pdf_pkcs7_designated_name *name, char *buf, int buflen) { int i, n; const char *part[] = { @@ -47,47 +47,47 @@ int pdf_check_signature(fz_context *ctx, pdf_document *doc, pdf_widget *widget, contents_len = pdf_signature_widget_contents(ctx, doc, widget, &contents); if (contents) { - SignatureError err; + enum pdf_signature_error err; bytes = pdf_signature_widget_hash_bytes(ctx, doc, widget); err = pkcs7_openssl_check_digest(ctx, bytes, contents, contents_len); - if (err == SignatureError_Okay) + if (err == PDF_SIGNATURE_ERROR_OKAY) err = pkcs7_openssl_check_certificate(contents, contents_len); switch (err) { - case SignatureError_Okay: + case PDF_SIGNATURE_ERROR_OKAY: ebuf[0] = 0; res = 1; break; - case SignatureError_NoSignatures: + case PDF_SIGNATURE_ERROR_NO_SIGNATURES: fz_strlcpy(ebuf, "No signatures", ebufsize); break; - case SignatureError_NoCertificate: + case PDF_SIGNATURE_ERROR_NO_CERTIFICATE: fz_strlcpy(ebuf, "No certificate", ebufsize); break; - case SignatureError_DocumentChanged: + case PDF_SIGNATURE_ERROR_DOCUMENT_CHANGED: fz_strlcpy(ebuf, "Document changed since signing", ebufsize); break; - case SignatureError_SelfSigned: + case PDF_SIGNATURE_ERROR_SELF_SIGNED: fz_strlcpy(ebuf, "Self-signed certificate", ebufsize); break; - case SignatureError_SelfSignedInChain: + case PDF_SIGNATURE_ERROR_SELF_SIGNED_IN_CHAIN: fz_strlcpy(ebuf, "Self-signed certificate in chain", ebufsize); break; - case SignatureError_NotTrusted: + case PDF_SIGNATURE_ERROR_NOT_TRUSTED: fz_strlcpy(ebuf, "Certificate not trusted", ebufsize); break; default: - case SignatureError_Unknown: + case PDF_SIGNATURE_ERROR_UNKNOWN: fz_strlcpy(ebuf, "Unknown error", ebufsize); break; } switch (err) { - case SignatureError_SelfSigned: - case SignatureError_SelfSignedInChain: - case SignatureError_NotTrusted: + case PDF_SIGNATURE_ERROR_SELF_SIGNED: + case PDF_SIGNATURE_ERROR_SELF_SIGNED_IN_CHAIN: + case PDF_SIGNATURE_ERROR_NOT_TRUSTED: { pdf_pkcs7_designated_name *name = pkcs7_openssl_designated_name(ctx, contents, contents_len); if (name) @@ -96,8 +96,8 @@ int pdf_check_signature(fz_context *ctx, pdf_document *doc, pdf_widget *widget, fz_strlcat(ebuf, ": ", ebufsize); len = strlen(ebuf); - pdf_print_designated_name(name, ebuf + len, ebufsize - len); - pkcs7_opensll_drop_designated_name(ctx, name); + pdf_format_designated_name(name, ebuf + len, ebufsize - len); + pkcs7_openssl_drop_designated_name(ctx, name); } } break; diff --git a/source/helpers/pkcs7/pkcs7-openssl.c b/source/helpers/pkcs7/pkcs7-openssl.c index c0ca9093..a9916f5c 100644 --- a/source/helpers/pkcs7/pkcs7-openssl.c +++ b/source/helpers/pkcs7/pkcs7-openssl.c @@ -218,11 +218,11 @@ static X509 *pk7_signer(STACK_OF(X509) *certs, PKCS7_SIGNER_INFO *si) return X509_find_by_issuer_and_serial(certs, ias->issuer, ias->serial); } -static SignatureError pk7_verify_sig(PKCS7 *p7, BIO *detached) +static enum pdf_signature_error pk7_verify_sig(PKCS7 *p7, BIO *detached) { BIO *p7bio=NULL; char readbuf[1024*4]; - int res = SignatureError_Unknown; + int res = PDF_SIGNATURE_ERROR_UNKNOWN; int i; STACK_OF(PKCS7_SIGNER_INFO) *sk; @@ -242,7 +242,7 @@ static SignatureError pk7_verify_sig(PKCS7 *p7, BIO *detached) if (sk == NULL || sk_PKCS7_SIGNER_INFO_num(sk) <= 0) { /* there are no signatures on this data */ - res = SignatureError_NoSignatures; + res = PDF_SIGNATURE_ERROR_NO_SIGNATURES; goto exit; } @@ -259,7 +259,7 @@ static SignatureError pk7_verify_sig(PKCS7 *p7, BIO *detached) rc = PKCS7_signatureVerify(p7bio, p7, si, x509); if (rc > 0) { - res = SignatureError_Okay; + res = PDF_SIGNATURE_ERROR_OKAY; } else { @@ -267,7 +267,7 @@ static SignatureError pk7_verify_sig(PKCS7 *p7, BIO *detached) switch (err) { case PKCS7_R_DIGEST_FAILURE: - res = SignatureError_DocumentChanged; + res = PDF_SIGNATURE_ERROR_DOCUMENT_CHANGED; break; default: break; @@ -282,16 +282,16 @@ exit: return res; } -static SignatureError pk7_verify_cert(X509_STORE *cert_store, PKCS7 *p7) +static enum pdf_signature_error pk7_verify_cert(X509_STORE *cert_store, PKCS7 *p7) { - int res = SignatureError_Okay; + int res = PDF_SIGNATURE_ERROR_OKAY; int i; STACK_OF(PKCS7_SIGNER_INFO) *sk; X509_STORE_CTX *ctx; ctx = X509_STORE_CTX_new(); if (!ctx) - return SignatureError_Unknown; + return PDF_SIGNATURE_ERROR_UNKNOWN; ERR_clear_error(); @@ -302,7 +302,7 @@ static SignatureError pk7_verify_cert(X509_STORE *cert_store, PKCS7 *p7) if (sk == NULL) { /* there are no signatures on this data */ - res = SignatureError_NoSignatures; + res = PDF_SIGNATURE_ERROR_NO_SIGNATURES; goto exit; } @@ -314,7 +314,7 @@ static SignatureError pk7_verify_cert(X509_STORE *cert_store, PKCS7 *p7) X509 *cert = pk7_signer(certs, si); if (cert == NULL) { - res = SignatureError_NoCertificate; + res = PDF_SIGNATURE_ERROR_NO_CERTIFICATE; goto exit; } @@ -334,13 +334,13 @@ static SignatureError pk7_verify_cert(X509_STORE *cert_store, PKCS7 *p7) if (!X509_STORE_CTX_init(ctx, cert_store, cert, certs)) { - res = SignatureError_Unknown; + res = PDF_SIGNATURE_ERROR_UNKNOWN; goto exit; } if (!X509_STORE_CTX_set_purpose(ctx, X509_PURPOSE_SMIME_SIGN)) { - res = SignatureError_Unknown; + res = PDF_SIGNATURE_ERROR_UNKNOWN; goto exit; } @@ -354,13 +354,13 @@ static SignatureError pk7_verify_cert(X509_STORE *cert_store, PKCS7 *p7) case X509_V_OK: break; case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT: - res = SignatureError_SelfSigned; + res = PDF_SIGNATURE_ERROR_SELF_SIGNED; goto exit; case X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN: - res = SignatureError_SelfSignedInChain; + res = PDF_SIGNATURE_ERROR_SELF_SIGNED_IN_CHAIN; goto exit; default: - res = SignatureError_Unknown; + res = PDF_SIGNATURE_ERROR_UNKNOWN; goto exit; } } @@ -372,12 +372,12 @@ exit: return res; } -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) { PKCS7 *pk7sig = NULL; BIO *bsig = NULL; BIO *bdata = NULL; - int res = SignatureError_Unknown; + int res = PDF_SIGNATURE_ERROR_UNKNOWN; bsig = BIO_new_mem_buf(sig, sig_len); pk7sig = d2i_PKCS7_bio(bsig, NULL); @@ -398,7 +398,7 @@ exit: return res; } -SignatureError pkcs7_openssl_check_certificate(char *sig, int sig_len) +enum pdf_signature_error pkcs7_openssl_check_certificate(char *sig, int sig_len) { PKCS7 *pk7sig = NULL; PKCS7 *pk7cert = NULL; @@ -455,7 +455,7 @@ typedef struct pdf_pkcs7_designated_name_openssl_s char buf[8192]; } pdf_pkcs7_designated_name_openssl; -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) { fz_free(ctx, dn); } -- cgit v1.2.3