1 files changed, 8 insertions, 9 deletions

diff --git a/src/lib/libcrypto/ts/ts_asn1.c b/src/lib/libcrypto/ts/ts_asn1.c
index 49232d8073..bc89f1368a 100644
--- a/src/lib/libcrypto/ts/ts_asn1.c
+++ b/src/lib/libcrypto/ts/ts_asn1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ts_asn1.c,v 1.10 2016/11/04 18:35:30 jsing Exp $ */
+/* $OpenBSD: ts_asn1.c,v 1.11 2017/01/29 17:49:23 beck Exp $ */
 /* Written by Nils Larsch for the OpenSSL project 2004.
  */
 /* ====================================================================
@@ -541,19 +541,18 @@ ts_resp_set_tst_info(TS_RESP *a)
 
         if (a->token) {
                 if (status != 0 && status != 1) {
-                        TSerr(TS_F_TS_RESP_SET_TST_INFO, TS_R_TOKEN_PRESENT);
+                        TSerror(TS_R_TOKEN_PRESENT);
                         return 0;
                 }
                 if (a->tst_info != NULL)
                         TS_TST_INFO_free(a->tst_info);
                 a->tst_info = PKCS7_to_TS_TST_INFO(a->token);
                 if (!a->tst_info) {
-                        TSerr(TS_F_TS_RESP_SET_TST_INFO,
-                            TS_R_PKCS7_TO_TS_TST_INFO_FAILED);
+                        TSerror(TS_R_PKCS7_TO_TS_TST_INFO_FAILED);
                         return 0;
                 }
         } else if (status == 0 || status == 1) {
-                TSerr(TS_F_TS_RESP_SET_TST_INFO, TS_R_TOKEN_NOT_PRESENT);
+                TSerror(TS_R_TOKEN_NOT_PRESENT);
                 return 0;
         }
 
@@ -858,13 +857,13 @@ PKCS7_to_TS_TST_INFO(PKCS7 *token)
         const unsigned char *p;
 
         if (!PKCS7_type_is_signed(token)) {
-                TSerr(TS_F_PKCS7_TO_TS_TST_INFO, TS_R_BAD_PKCS7_TYPE);
+                TSerror(TS_R_BAD_PKCS7_TYPE);
                 return NULL;
         }
 
         /* Content must be present. */
         if (PKCS7_get_detached(token)) {
-                TSerr(TS_F_PKCS7_TO_TS_TST_INFO, TS_R_DETACHED_CONTENT);
+                TSerror(TS_R_DETACHED_CONTENT);
                 return NULL;
         }
 
@@ -872,14 +871,14 @@ PKCS7_to_TS_TST_INFO(PKCS7 *token)
         pkcs7_signed = token->d.sign;
         enveloped = pkcs7_signed->contents;
         if (OBJ_obj2nid(enveloped->type) != NID_id_smime_ct_TSTInfo) {
-                TSerr(TS_F_PKCS7_TO_TS_TST_INFO, TS_R_BAD_PKCS7_TYPE);
+                TSerror(TS_R_BAD_PKCS7_TYPE);
                 return NULL;
         }
 
         /* We have a DER encoded TST_INFO as the signed data. */
         tst_info_wrapper = enveloped->d.other;
         if (tst_info_wrapper->type != V_ASN1_OCTET_STRING) {
-                TSerr(TS_F_PKCS7_TO_TS_TST_INFO, TS_R_BAD_TYPE);
+                TSerror(TS_R_BAD_TYPE);
                 return NULL;
         }