RT3548: Remove unsupported platforms

[openssl.git] / apps / ts.c

diff --git a/apps/ts.c b/apps/ts.c
index 5fa9f7fda07d91d2e547ffce1007c1b5f9332121..2a1d666406462c34598c84aa4a890b6f70cbe074 100644 (file)
--- a/apps/ts.c
+++ b/apps/ts.c
@@ -103,7 +103,7 @@ static TS_RESP *read_PKCS7(BIO *in_bio);
 static TS_RESP *create_response(CONF *conf, const char *section, char *engine,
                                char *queryfile, char *passin, char *inkey,
                                char *signer, char *chain, const char *policy);
-static ASN1_INTEGER * MS_CALLBACK serial_cb(TS_RESP_CTX *ctx, void *data);
+static ASN1_INTEGER * serial_cb(TS_RESP_CTX *ctx, void *data);
 static ASN1_INTEGER *next_serial(const char *serialfile);
 static int save_ts_serial(const char *serialfile, ASN1_INTEGER *serial);
 
@@ -116,7 +116,7 @@ static TS_VERIFY_CTX *create_verify_ctx(char *data, char *digest,
                                        char *ca_path, char *ca_file,
                                        char *untrusted);
 static X509_STORE *create_cert_store(char *ca_path, char *ca_file);
-static int MS_CALLBACK verify_cb(int ok, X509_STORE_CTX *ctx);
+static int verify_cb(int ok, X509_STORE_CTX *ctx);
 
 /* Main function definition. */
 int MAIN(int, char **);
@@ -618,7 +618,8 @@ static int create_digest(BIO *input, char *digest, const EVP_MD *md,
                        {
                        EVP_DigestUpdate(&md_ctx, buffer, length);
                        }
-               EVP_DigestFinal(&md_ctx, *md_value, NULL);
+               if (!EVP_DigestFinal(&md_ctx, *md_value, NULL))
+                       return 0;
                }
        else
                {
@@ -875,7 +876,7 @@ static TS_RESP *create_response(CONF *conf, const char *section, char *engine,
        return response;
        }
 
-static ASN1_INTEGER * MS_CALLBACK serial_cb(TS_RESP_CTX *ctx, void *data)
+static ASN1_INTEGER * serial_cb(TS_RESP_CTX *ctx, void *data)
        {
        const char *serial_file = (const char *) data;
        ASN1_INTEGER *serial = next_serial(serial_file);
@@ -1127,9 +1128,9 @@ static X509_STORE *create_cert_store(char *ca_path, char *ca_file)
        return NULL;
        }
 
-static int MS_CALLBACK verify_cb(int ok, X509_STORE_CTX *ctx)
+static int verify_cb(int ok, X509_STORE_CTX *ctx)
        {
-       /*
+       /*-
        char buf[256];
 
        if (!ok)