summaryrefslogtreecommitdiff
path: root/src/usr.bin/openssl/smime.c
diff options
context:
space:
mode:
authorinoguchi <>2022-01-11 14:35:14 +0000
committerinoguchi <>2022-01-11 14:35:14 +0000
commitfe27c47c1566095042721429fcd0d2d5a32c23f2 (patch)
tree38c7df15daceae4944450bc3acfa921d7ab919e4 /src/usr.bin/openssl/smime.c
parent9b83986674172e8adf5f6cb973a8ce756995132b (diff)
downloadopenbsd-fe27c47c1566095042721429fcd0d2d5a32c23f2.tar.gz
openbsd-fe27c47c1566095042721429fcd0d2d5a32c23f2.tar.bz2
openbsd-fe27c47c1566095042721429fcd0d2d5a32c23f2.zip
Remove space between '*' and pointer variable.
Diffstat (limited to 'src/usr.bin/openssl/smime.c')
-rw-r--r--src/usr.bin/openssl/smime.c20
1 files changed, 9 insertions, 11 deletions
diff --git a/src/usr.bin/openssl/smime.c b/src/usr.bin/openssl/smime.c
index 5aa04c21a6..65b4ac079f 100644
--- a/src/usr.bin/openssl/smime.c
+++ b/src/usr.bin/openssl/smime.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: smime.c,v 1.11 2022/01/11 14:23:05 inoguchi Exp $ */ 1/* $OpenBSD: smime.c,v 1.12 2022/01/11 14:35:14 inoguchi Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project. 3 * project.
4 */ 4 */
@@ -69,8 +69,8 @@
69#include <openssl/x509_vfy.h> 69#include <openssl/x509_vfy.h>
70#include <openssl/x509v3.h> 70#include <openssl/x509v3.h>
71 71
72static int save_certs(char *signerfile, STACK_OF(X509) * signers); 72static int save_certs(char *signerfile, STACK_OF(X509) *signers);
73static int smime_cb(int ok, X509_STORE_CTX * ctx); 73static int smime_cb(int ok, X509_STORE_CTX *ctx);
74 74
75#define SMIME_OP 0x10 75#define SMIME_OP 0x10
76#define SMIME_IP 0x20 76#define SMIME_IP 0x20
@@ -715,7 +715,7 @@ smime_main(int argc, char **argv)
715 X509_STORE *store = NULL; 715 X509_STORE *store = NULL;
716 X509 *cert = NULL, *recip = NULL, *signer = NULL; 716 X509 *cert = NULL, *recip = NULL, *signer = NULL;
717 EVP_PKEY *key = NULL; 717 EVP_PKEY *key = NULL;
718 STACK_OF(X509) * encerts = NULL, *other = NULL; 718 STACK_OF(X509) *encerts = NULL, *other = NULL;
719 BIO *in = NULL, *out = NULL, *indata = NULL; 719 BIO *in = NULL, *out = NULL, *indata = NULL;
720 int badarg = 0; 720 int badarg = 0;
721 char *passin = NULL; 721 char *passin = NULL;
@@ -967,7 +967,7 @@ smime_main(int argc, char **argv)
967 goto end; 967 goto end;
968 } 968 }
969 } else if (smime_config.operation == SMIME_VERIFY) { 969 } else if (smime_config.operation == SMIME_VERIFY) {
970 STACK_OF(X509) * signers; 970 STACK_OF(X509) *signers;
971 if (PKCS7_verify(p7, other, store, indata, out, smime_config.flags)) 971 if (PKCS7_verify(p7, other, store, indata, out, smime_config.flags))
972 BIO_printf(bio_err, "Verification successful\n"); 972 BIO_printf(bio_err, "Verification successful\n");
973 else { 973 else {
@@ -1029,10 +1029,11 @@ smime_main(int argc, char **argv)
1029} 1029}
1030 1030
1031static int 1031static int
1032save_certs(char *signerfile, STACK_OF(X509) * signers) 1032save_certs(char *signerfile, STACK_OF(X509) *signers)
1033{ 1033{
1034 int i; 1034 int i;
1035 BIO *tmp; 1035 BIO *tmp;
1036
1036 if (!signerfile) 1037 if (!signerfile)
1037 return 1; 1038 return 1;
1038 tmp = BIO_new_file(signerfile, "w"); 1039 tmp = BIO_new_file(signerfile, "w");
@@ -1041,14 +1042,13 @@ save_certs(char *signerfile, STACK_OF(X509) * signers)
1041 for (i = 0; i < sk_X509_num(signers); i++) 1042 for (i = 0; i < sk_X509_num(signers); i++)
1042 PEM_write_bio_X509(tmp, sk_X509_value(signers, i)); 1043 PEM_write_bio_X509(tmp, sk_X509_value(signers, i));
1043 BIO_free(tmp); 1044 BIO_free(tmp);
1045
1044 return 1; 1046 return 1;
1045} 1047}
1046 1048
1047
1048/* Minimal callback just to output policy info (if any) */ 1049/* Minimal callback just to output policy info (if any) */
1049
1050static int 1050static int
1051smime_cb(int ok, X509_STORE_CTX * ctx) 1051smime_cb(int ok, X509_STORE_CTX *ctx)
1052{ 1052{
1053 int error; 1053 int error;
1054 1054
@@ -1061,6 +1061,4 @@ smime_cb(int ok, X509_STORE_CTX * ctx)
1061 policies_print(NULL, ctx); 1061 policies_print(NULL, ctx);
1062 1062
1063 return ok; 1063 return ok;
1064
1065} 1064}
1066