projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add -show_chain option to print out verified chain.
[openssl.git]
/
apps
/
ts.c
diff --git
a/apps/ts.c
b/apps/ts.c
index 74e7e932b3abbd257745a6e8d8dcef73b04f254d..ae7604cc698c63457d565e8e320cc41c5e22a85d 100644
(file)
--- a/
apps/ts.c
+++ b/
apps/ts.c
@@
-165,6
+165,9
@@
int MAIN(int argc, char **argv)
BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
}
BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
}
+ if (!load_config(bio_err, NULL))
+ goto cleanup;
+
for (argc--, argv++; argc > 0; argc--, argv++)
{
if (strcmp(*argv, "-config") == 0)
for (argc--, argv++; argc > 0; argc--, argv++)
{
if (strcmp(*argv, "-config") == 0)
@@
-615,7
+618,8
@@
static int create_digest(BIO *input, char *digest, const EVP_MD *md,
{
EVP_DigestUpdate(&md_ctx, buffer, length);
}
{
EVP_DigestUpdate(&md_ctx, buffer, length);
}
- EVP_DigestFinal(&md_ctx, *md_value, NULL);
+ if (!EVP_DigestFinal(&md_ctx, *md_value, NULL))
+ return 0;
}
else
{
}
else
{
@@
-646,7
+650,7
@@
static ASN1_INTEGER *create_nonce(int bits)
/* Generating random byte sequence. */
if (len > (int)sizeof(buf)) goto err;
/* Generating random byte sequence. */
if (len > (int)sizeof(buf)) goto err;
- if (
!RAND_bytes(buf, len)
) goto err;
+ if (
RAND_bytes(buf, len) <= 0
) goto err;
/* Find the first non-zero byte and creating ASN1_INTEGER object. */
for (i = 0; i < len && !buf[i]; ++i);
/* Find the first non-zero byte and creating ASN1_INTEGER object. */
for (i = 0; i < len && !buf[i]; ++i);
@@
-1080,7
+1084,7
@@
static X509_STORE *create_cert_store(char *ca_path, char *ca_file)
cert_ctx = X509_STORE_new();
/* Setting the callback for certificate chain verification. */
cert_ctx = X509_STORE_new();
/* Setting the callback for certificate chain verification. */
- X509_STORE_set_verify_cb
_func
(cert_ctx, verify_cb);
+ X509_STORE_set_verify_cb(cert_ctx, verify_cb);
/* Adding a trusted certificate directory source. */
if (ca_path)
/* Adding a trusted certificate directory source. */
if (ca_path)