projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
aesv8-armx.pl: fix typo.
[openssl.git]
/
apps
/
smime.c
diff --git
a/apps/smime.c
b/apps/smime.c
index 04161540b64cce53343a531e6f5ce1b734a72e3d..c583f8a0e16205bbf5b2bf56560aaafacfe0477e 100644
(file)
--- a/
apps/smime.c
+++ b/
apps/smime.c
@@
-93,7
+93,7
@@
int MAIN(int argc, char **argv)
const char *inmode = "r", *outmode = "w";
char *infile = NULL, *outfile = NULL;
char *signerfile = NULL, *recipfile = NULL;
const char *inmode = "r", *outmode = "w";
char *infile = NULL, *outfile = NULL;
char *signerfile = NULL, *recipfile = NULL;
- STACK_OF(STRING) *sksigners = NULL, *skkeys = NULL;
+ STACK_OF(
OPENSSL_
STRING) *sksigners = NULL, *skkeys = NULL;
char *certfile = NULL, *keyfile = NULL, *contfile=NULL;
const EVP_CIPHER *cipher = NULL;
PKCS7 *p7 = NULL;
char *certfile = NULL, *keyfile = NULL, *contfile=NULL;
const EVP_CIPHER *cipher = NULL;
PKCS7 *p7 = NULL;
@@
-260,13
+260,13
@@
int MAIN(int argc, char **argv)
if (signerfile)
{
if (!sksigners)
if (signerfile)
{
if (!sksigners)
- sksigners = sk_STRING_new_null();
- sk_STRING_push(sksigners, signerfile);
+ sksigners = sk_
OPENSSL_
STRING_new_null();
+ sk_
OPENSSL_
STRING_push(sksigners, signerfile);
if (!keyfile)
keyfile = signerfile;
if (!skkeys)
if (!keyfile)
keyfile = signerfile;
if (!skkeys)
- skkeys = sk_STRING_new_null();
- sk_STRING_push(skkeys, keyfile);
+ skkeys = sk_
OPENSSL_
STRING_new_null();
+ sk_
OPENSSL_
STRING_push(skkeys, keyfile);
keyfile = NULL;
}
signerfile = *++args;
keyfile = NULL;
}
signerfile = *++args;
@@
-302,12
+302,12
@@
int MAIN(int argc, char **argv)
goto argerr;
}
if (!sksigners)
goto argerr;
}
if (!sksigners)
- sksigners = sk_STRING_new_null();
- sk_STRING_push(sksigners, signerfile);
+ sksigners = sk_
OPENSSL_
STRING_new_null();
+ sk_
OPENSSL_
STRING_push(sksigners, signerfile);
signerfile = NULL;
if (!skkeys)
signerfile = NULL;
if (!skkeys)
- skkeys = sk_STRING_new_null();
- sk_STRING_push(skkeys, keyfile);
+ skkeys = sk_
OPENSSL_
STRING_new_null();
+ sk_
OPENSSL_
STRING_push(skkeys, keyfile);
}
keyfile = *++args;
}
}
keyfile = *++args;
}
@@
-389,13
+389,13
@@
int MAIN(int argc, char **argv)
if (signerfile)
{
if (!sksigners)
if (signerfile)
{
if (!sksigners)
- sksigners = sk_STRING_new_null();
- sk_STRING_push(sksigners, signerfile);
+ sksigners = sk_
OPENSSL_
STRING_new_null();
+ sk_
OPENSSL_
STRING_push(sksigners, signerfile);
if (!skkeys)
if (!skkeys)
- skkeys = sk_STRING_new_null();
+ skkeys = sk_
OPENSSL_
STRING_new_null();
if (!keyfile)
keyfile = signerfile;
if (!keyfile)
keyfile = signerfile;
- sk_STRING_push(skkeys, keyfile);
+ sk_
OPENSSL_
STRING_push(skkeys, keyfile);
}
if (!sksigners)
{
}
if (!sksigners)
{
@@
-671,7
+671,7
@@
int MAIN(int argc, char **argv)
{
if (!(store = setup_verify(bio_err, CAfile, CApath)))
goto end;
{
if (!(store = setup_verify(bio_err, CAfile, CApath)))
goto end;
- X509_STORE_set_verify_cb
_func
(store, smime_cb);
+ X509_STORE_set_verify_cb(store, smime_cb);
if (vpm)
X509_STORE_set1_param(store, vpm);
}
if (vpm)
X509_STORE_set1_param(store, vpm);
}
@@
-707,10
+707,10
@@
int MAIN(int argc, char **argv)
}
else
flags |= PKCS7_REUSE_DIGEST;
}
else
flags |= PKCS7_REUSE_DIGEST;
- for (i = 0; i < sk_STRING_num(sksigners); i++)
+ for (i = 0; i < sk_
OPENSSL_
STRING_num(sksigners); i++)
{
{
- signerfile = sk_STRING_value(sksigners, i);
- keyfile = sk_STRING_value(skkeys, i);
+ signerfile = sk_
OPENSSL_
STRING_value(sksigners, i);
+ keyfile = sk_
OPENSSL_
STRING_value(skkeys, i);
signer = load_cert(bio_err, signerfile,FORMAT_PEM, NULL,
e, "signer certificate");
if (!signer)
signer = load_cert(bio_err, signerfile,FORMAT_PEM, NULL,
e, "signer certificate");
if (!signer)
@@
-807,9
+807,9
@@
end:
if (vpm)
X509_VERIFY_PARAM_free(vpm);
if (sksigners)
if (vpm)
X509_VERIFY_PARAM_free(vpm);
if (sksigners)
- sk_STRING_free(sksigners);
+ sk_
OPENSSL_
STRING_free(sksigners);
if (skkeys)
if (skkeys)
- sk_STRING_free(skkeys);
+ sk_
OPENSSL_
STRING_free(skkeys);
X509_STORE_free(store);
X509_free(cert);
X509_free(recip);
X509_STORE_free(store);
X509_free(cert);
X509_free(recip);