summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortb <>2024-06-19 08:00:53 +0000
committertb <>2024-06-19 08:00:53 +0000
commit03bc09af3c2f1234276cf962253012e9f3ec81f7 (patch)
treeafa095883567f2f6ba5da87899630d0840229be9 /src
parent680fe710dc4d18bbc793df16e3c196f4a2141e0b (diff)
downloadopenbsd-03bc09af3c2f1234276cf962253012e9f3ec81f7.tar.gz
openbsd-03bc09af3c2f1234276cf962253012e9f3ec81f7.tar.bz2
openbsd-03bc09af3c2f1234276cf962253012e9f3ec81f7.zip
x_all.c: remove a bunch of unnecessary parentheses
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/x509/x_all.c42
1 files changed, 19 insertions, 23 deletions
diff --git a/src/lib/libcrypto/x509/x_all.c b/src/lib/libcrypto/x509/x_all.c
index 45c527b418..5997714061 100644
--- a/src/lib/libcrypto/x509/x_all.c
+++ b/src/lib/libcrypto/x509/x_all.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x_all.c,v 1.31 2024/03/27 01:22:30 tb Exp $ */ 1/* $OpenBSD: x_all.c,v 1.32 2024/06/19 08:00:53 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -401,24 +401,24 @@ X509_verify(X509 *a, EVP_PKEY *r)
401{ 401{
402 if (X509_ALGOR_cmp(a->sig_alg, a->cert_info->signature)) 402 if (X509_ALGOR_cmp(a->sig_alg, a->cert_info->signature))
403 return 0; 403 return 0;
404 return (ASN1_item_verify(&X509_CINF_it, a->sig_alg, 404 return ASN1_item_verify(&X509_CINF_it, a->sig_alg,
405 a->signature, a->cert_info, r)); 405 a->signature, a->cert_info, r);
406} 406}
407LCRYPTO_ALIAS(X509_verify); 407LCRYPTO_ALIAS(X509_verify);
408 408
409int 409int
410X509_REQ_verify(X509_REQ *a, EVP_PKEY *r) 410X509_REQ_verify(X509_REQ *a, EVP_PKEY *r)
411{ 411{
412 return (ASN1_item_verify(&X509_REQ_INFO_it, 412 return ASN1_item_verify(&X509_REQ_INFO_it,
413 a->sig_alg, a->signature, a->req_info, r)); 413 a->sig_alg, a->signature, a->req_info, r);
414} 414}
415LCRYPTO_ALIAS(X509_REQ_verify); 415LCRYPTO_ALIAS(X509_REQ_verify);
416 416
417int 417int
418NETSCAPE_SPKI_verify(NETSCAPE_SPKI *a, EVP_PKEY *r) 418NETSCAPE_SPKI_verify(NETSCAPE_SPKI *a, EVP_PKEY *r)
419{ 419{
420 return (ASN1_item_verify(&NETSCAPE_SPKAC_it, 420 return ASN1_item_verify(&NETSCAPE_SPKAC_it,
421 a->sig_algor, a->signature, a->spkac, r)); 421 a->sig_algor, a->signature, a->spkac, r);
422} 422}
423LCRYPTO_ALIAS(NETSCAPE_SPKI_verify); 423LCRYPTO_ALIAS(NETSCAPE_SPKI_verify);
424 424
@@ -426,9 +426,9 @@ int
426X509_sign(X509 *x, EVP_PKEY *pkey, const EVP_MD *md) 426X509_sign(X509 *x, EVP_PKEY *pkey, const EVP_MD *md)
427{ 427{
428 x->cert_info->enc.modified = 1; 428 x->cert_info->enc.modified = 1;
429 return (ASN1_item_sign(&X509_CINF_it, 429 return ASN1_item_sign(&X509_CINF_it,
430 x->cert_info->signature, x->sig_alg, x->signature, 430 x->cert_info->signature, x->sig_alg, x->signature,
431 x->cert_info, pkey, md)); 431 x->cert_info, pkey, md);
432} 432}
433LCRYPTO_ALIAS(X509_sign); 433LCRYPTO_ALIAS(X509_sign);
434 434
@@ -445,8 +445,8 @@ LCRYPTO_ALIAS(X509_sign_ctx);
445int 445int
446X509_REQ_sign(X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md) 446X509_REQ_sign(X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md)
447{ 447{
448 return (ASN1_item_sign(&X509_REQ_INFO_it, 448 return ASN1_item_sign(&X509_REQ_INFO_it,
449 x->sig_alg, NULL, x->signature, x->req_info, pkey, md)); 449 x->sig_alg, NULL, x->signature, x->req_info, pkey, md);
450} 450}
451LCRYPTO_ALIAS(X509_REQ_sign); 451LCRYPTO_ALIAS(X509_REQ_sign);
452 452
@@ -462,8 +462,8 @@ int
462X509_CRL_sign(X509_CRL *x, EVP_PKEY *pkey, const EVP_MD *md) 462X509_CRL_sign(X509_CRL *x, EVP_PKEY *pkey, const EVP_MD *md)
463{ 463{
464 x->crl->enc.modified = 1; 464 x->crl->enc.modified = 1;
465 return(ASN1_item_sign(&X509_CRL_INFO_it, x->crl->sig_alg, 465 return ASN1_item_sign(&X509_CRL_INFO_it, x->crl->sig_alg,
466 x->sig_alg, x->signature, x->crl, pkey, md)); 466 x->sig_alg, x->signature, x->crl, pkey, md);
467} 467}
468LCRYPTO_ALIAS(X509_CRL_sign); 468LCRYPTO_ALIAS(X509_CRL_sign);
469 469
@@ -479,8 +479,8 @@ LCRYPTO_ALIAS(X509_CRL_sign_ctx);
479int 479int
480NETSCAPE_SPKI_sign(NETSCAPE_SPKI *x, EVP_PKEY *pkey, const EVP_MD *md) 480NETSCAPE_SPKI_sign(NETSCAPE_SPKI *x, EVP_PKEY *pkey, const EVP_MD *md)
481{ 481{
482 return (ASN1_item_sign(&NETSCAPE_SPKAC_it, 482 return ASN1_item_sign(&NETSCAPE_SPKAC_it,
483 x->sig_algor, NULL, x->signature, x->spkac, pkey, md)); 483 x->sig_algor, NULL, x->signature, x->spkac, pkey, md);
484} 484}
485LCRYPTO_ALIAS(NETSCAPE_SPKI_sign); 485LCRYPTO_ALIAS(NETSCAPE_SPKI_sign);
486 486
@@ -500,8 +500,7 @@ int
500X509_digest(const X509 *data, const EVP_MD *type, unsigned char *md, 500X509_digest(const X509 *data, const EVP_MD *type, unsigned char *md,
501 unsigned int *len) 501 unsigned int *len)
502{ 502{
503 return (ASN1_item_digest(&X509_it, type, (char *)data, 503 return ASN1_item_digest(&X509_it, type, (void *)data, md, len);
504 md, len));
505} 504}
506LCRYPTO_ALIAS(X509_digest); 505LCRYPTO_ALIAS(X509_digest);
507 506
@@ -509,8 +508,7 @@ int
509X509_CRL_digest(const X509_CRL *data, const EVP_MD *type, unsigned char *md, 508X509_CRL_digest(const X509_CRL *data, const EVP_MD *type, unsigned char *md,
510 unsigned int *len) 509 unsigned int *len)
511{ 510{
512 return (ASN1_item_digest(&X509_CRL_it, type, (char *)data, 511 return ASN1_item_digest(&X509_CRL_it, type, (void *)data, md, len);
513 md, len));
514} 512}
515LCRYPTO_ALIAS(X509_CRL_digest); 513LCRYPTO_ALIAS(X509_CRL_digest);
516 514
@@ -518,8 +516,7 @@ int
518X509_REQ_digest(const X509_REQ *data, const EVP_MD *type, unsigned char *md, 516X509_REQ_digest(const X509_REQ *data, const EVP_MD *type, unsigned char *md,
519 unsigned int *len) 517 unsigned int *len)
520{ 518{
521 return (ASN1_item_digest(&X509_REQ_it, type, (char *)data, 519 return ASN1_item_digest(&X509_REQ_it, type, (void *)data, md, len);
522 md, len));
523} 520}
524LCRYPTO_ALIAS(X509_REQ_digest); 521LCRYPTO_ALIAS(X509_REQ_digest);
525 522
@@ -527,8 +524,7 @@ int
527X509_NAME_digest(const X509_NAME *data, const EVP_MD *type, unsigned char *md, 524X509_NAME_digest(const X509_NAME *data, const EVP_MD *type, unsigned char *md,
528 unsigned int *len) 525 unsigned int *len)
529{ 526{
530 return (ASN1_item_digest(&X509_NAME_it, type, (char *)data, 527 return ASN1_item_digest(&X509_NAME_it, type, (void *)data, md, len);
531 md, len));
532} 528}
533LCRYPTO_ALIAS(X509_NAME_digest); 529LCRYPTO_ALIAS(X509_NAME_digest);
534 530