More style(9), whitespace and readability fixes.

Files are identical once whitespace and newlines are removed.

1 files changed, 34 insertions, 35 deletions

diff --git a/lib/libcrypto/cms/cms_ess.c b/lib/libcrypto/cms/cms_ess.c
index bcc3e58368f..abfd170bb4c 100644
--- a/lib/libcrypto/cms/cms_ess.c
+++ b/lib/libcrypto/cms/cms_ess.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cms_ess.c,v 1.13 2019/08/10 16:42:20 jsing Exp $ */
+/* $OpenBSD: cms_ess.c,v 1.14 2019/08/10 18:15:52 jsing Exp $ */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
@@ -65,16 +65,16 @@ IMPLEMENT_ASN1_FUNCTIONS(CMS_ReceiptRequest)
 
 /* ESS services: for now just Signed Receipt related */
 
-int CMS_get1_ReceiptRequest(CMS_SignerInfo *si, CMS_ReceiptRequest **prr)
+int
+CMS_get1_ReceiptRequest(CMS_SignerInfo *si, CMS_ReceiptRequest **prr)
 {
 	ASN1_STRING *str;
 	CMS_ReceiptRequest *rr = NULL;
+
 	if (prr)
 		*prr = NULL;
 	str = CMS_signed_get0_data_by_OBJ(si,
-			                          OBJ_nid2obj
-			                          (NID_id_smime_aa_receiptRequest), -3,
-			                          V_ASN1_SEQUENCE);
+	    OBJ_nid2obj(NID_id_smime_aa_receiptRequest), -3, V_ASN1_SEQUENCE);
 	if (!str)
 		return 0;
 
@@ -85,14 +85,13 @@ int CMS_get1_ReceiptRequest(CMS_SignerInfo *si, CMS_ReceiptRequest **prr)
 		*prr = rr;
 	else
 		CMS_ReceiptRequest_free(rr);
+
 	return 1;
 }
 
-CMS_ReceiptRequest *CMS_ReceiptRequest_create0(unsigned char *id, int idlen,
-			                                   int allorfirst,
-			                                   STACK_OF(GENERAL_NAMES)
-			                                   *receiptList, STACK_OF(GENERAL_NAMES)
-			                                   *receiptsTo)
+CMS_ReceiptRequest *
+CMS_ReceiptRequest_create0(unsigned char *id, int idlen, int allorfirst,
+    STACK_OF(GENERAL_NAMES) *receiptList, STACK_OF(GENERAL_NAMES) *receiptsTo)
 {
 	CMS_ReceiptRequest *rr = NULL;
 
@@ -127,10 +126,10 @@ CMS_ReceiptRequest *CMS_ReceiptRequest_create0(unsigned char *id, int idlen,
  err:
 	CMS_ReceiptRequest_free(rr);
 	return NULL;
-
 }
 
-int CMS_add1_ReceiptRequest(CMS_SignerInfo *si, CMS_ReceiptRequest *rr)
+int
+CMS_add1_ReceiptRequest(CMS_SignerInfo *si, CMS_ReceiptRequest *rr)
 {
 	unsigned char *rrder = NULL;
 	int rrderlen, r = 0;
@@ -140,7 +139,7 @@ int CMS_add1_ReceiptRequest(CMS_SignerInfo *si, CMS_ReceiptRequest *rr)
 		goto merr;
 
 	if (!CMS_signed_add1_attr_by_NID(si, NID_id_smime_aa_receiptRequest,
-			                         V_ASN1_SEQUENCE, rrder, rrderlen))
+	    V_ASN1_SEQUENCE, rrder, rrderlen))
 		goto merr;
 
 	r = 1;
@@ -152,14 +151,12 @@ int CMS_add1_ReceiptRequest(CMS_SignerInfo *si, CMS_ReceiptRequest *rr)
 	OPENSSL_free(rrder);
 
 	return r;
-
 }
 
-void CMS_ReceiptRequest_get0_values(CMS_ReceiptRequest *rr,
-			                        ASN1_STRING **pcid,
-			                        int *pallorfirst,
-			                        STACK_OF(GENERAL_NAMES) **plist,
-			                        STACK_OF(GENERAL_NAMES) **prto)
+void
+CMS_ReceiptRequest_get0_values(CMS_ReceiptRequest *rr, ASN1_STRING **pcid,
+    int *pallorfirst, STACK_OF(GENERAL_NAMES) **plist,
+    STACK_OF(GENERAL_NAMES) **prto)
 {
 	if (pcid)
 		*pcid = rr->signedContentIdentifier;
@@ -180,40 +177,46 @@ void CMS_ReceiptRequest_get0_values(CMS_ReceiptRequest *rr,
 
 /* Digest a SignerInfo structure for msgSigDigest attribute processing */
 
-static int cms_msgSigDigest(CMS_SignerInfo *si,
-			                unsigned char *dig, unsigned int *diglen)
+static int
+cms_msgSigDigest(CMS_SignerInfo *si, unsigned char *dig, unsigned int *diglen)
 {
 	const EVP_MD *md;
+
 	md = EVP_get_digestbyobj(si->digestAlgorithm->algorithm);
 	if (md == NULL)
 		return 0;
 	if (!ASN1_item_digest(ASN1_ITEM_rptr(CMS_Attributes_Verify), md,
-			              si->signedAttrs, dig, diglen))
+	    si->signedAttrs, dig, diglen))
 		return 0;
+
 	return 1;
 }
 
 /* Add a msgSigDigest attribute to a SignerInfo */
 
-int cms_msgSigDigest_add1(CMS_SignerInfo *dest, CMS_SignerInfo *src)
+int
+cms_msgSigDigest_add1(CMS_SignerInfo *dest, CMS_SignerInfo *src)
 {
 	unsigned char dig[EVP_MAX_MD_SIZE];
 	unsigned int diglen;
+
 	if (!cms_msgSigDigest(src, dig, &diglen)) {
 		CMSerr(CMS_F_CMS_MSGSIGDIGEST_ADD1, CMS_R_MSGSIGDIGEST_ERROR);
 		return 0;
 	}
 	if (!CMS_signed_add1_attr_by_NID(dest, NID_id_smime_aa_msgSigDigest,
-			                         V_ASN1_OCTET_STRING, dig, diglen)) {
+	    V_ASN1_OCTET_STRING, dig, diglen)) {
 		CMSerr(CMS_F_CMS_MSGSIGDIGEST_ADD1, ERR_R_MALLOC_FAILURE);
 		return 0;
 	}
+
 	return 1;
 }
 
 /* Verify signed receipt after it has already passed normal CMS verify */
 
-int cms_Receipt_verify(CMS_ContentInfo *cms, CMS_ContentInfo *req_cms)
+int
+cms_Receipt_verify(CMS_ContentInfo *cms, CMS_ContentInfo *req_cms)
 {
 	int r = 0, i;
 	CMS_ReceiptRequest *rr = NULL;
@@ -274,9 +277,7 @@ int cms_Receipt_verify(CMS_ContentInfo *cms, CMS_ContentInfo *req_cms)
 	/* Get msgSigDigest value and compare */
 
 	msig = CMS_signed_get0_data_by_OBJ(si,
-			                           OBJ_nid2obj
-			                           (NID_id_smime_aa_msgSigDigest), -3,
-			                           V_ASN1_OCTET_STRING);
+	    OBJ_nid2obj(NID_id_smime_aa_msgSigDigest), -3, V_ASN1_OCTET_STRING);
 
 	if (!msig) {
 		CMSerr(CMS_F_CMS_RECEIPT_VERIFY, CMS_R_NO_MSGSIGDIGEST);
@@ -302,8 +303,7 @@ int cms_Receipt_verify(CMS_ContentInfo *cms, CMS_ContentInfo *req_cms)
 	/* Compare content types */
 
 	octype = CMS_signed_get0_data_by_OBJ(osi,
-			                             OBJ_nid2obj(NID_pkcs9_contentType),
-			                             -3, V_ASN1_OBJECT);
+	    OBJ_nid2obj(NID_pkcs9_contentType), -3, V_ASN1_OBJECT);
 	if (!octype) {
 		CMSerr(CMS_F_CMS_RECEIPT_VERIFY, CMS_R_NO_CONTENT_TYPE);
 		goto err;
@@ -324,7 +324,7 @@ int cms_Receipt_verify(CMS_ContentInfo *cms, CMS_ContentInfo *req_cms)
 	}
 
 	if (ASN1_STRING_cmp(rr->signedContentIdentifier,
-			            rct->signedContentIdentifier)) {
+	    rct->signedContentIdentifier)) {
 		CMSerr(CMS_F_CMS_RECEIPT_VERIFY, CMS_R_CONTENTIDENTIFIER_MISMATCH);
 		goto err;
 	}
@@ -335,7 +335,6 @@ int cms_Receipt_verify(CMS_ContentInfo *cms, CMS_ContentInfo *req_cms)
 	CMS_ReceiptRequest_free(rr);
 	M_ASN1_free_of(rct, CMS_Receipt);
 	return r;
-
 }
 
 /*
@@ -343,7 +342,8 @@ int cms_Receipt_verify(CMS_ContentInfo *cms, CMS_ContentInfo *req_cms)
  * SignedData ContentInfo.
  */
 
-ASN1_OCTET_STRING *cms_encode_Receipt(CMS_SignerInfo *si)
+ASN1_OCTET_STRING *
+cms_encode_Receipt(CMS_SignerInfo *si)
 {
 	CMS_Receipt rct;
 	CMS_ReceiptRequest *rr = NULL;
@@ -362,8 +362,7 @@ ASN1_OCTET_STRING *cms_encode_Receipt(CMS_SignerInfo *si)
 	/* Get original content type */
 
 	ctype = CMS_signed_get0_data_by_OBJ(si,
-			                            OBJ_nid2obj(NID_pkcs9_contentType),
-			                            -3, V_ASN1_OBJECT);
+	    OBJ_nid2obj(NID_pkcs9_contentType), -3, V_ASN1_OBJECT);
 	if (!ctype) {
 		CMSerr(CMS_F_CMS_ENCODE_RECEIPT, CMS_R_NO_CONTENT_TYPE);
 		goto err;