Remove fipscanister build functionality from makefiles.

[openssl.git] / crypto / ts / ts.h

diff --git a/crypto/ts/ts.h b/crypto/ts/ts.h
index befdf4191d7d022b6f5272c29f0a58fc9ed393ea..c2448e3c3be8c899f19d1983f5bfb1c3a5e15896 100644 (file)
--- a/crypto/ts/ts.h
+++ b/crypto/ts/ts.h
@@ -59,35 +59,33 @@
 #ifndef HEADER_TS_H
 #define HEADER_TS_H
 
+#include <openssl/opensslconf.h>
 #include <openssl/symhacks.h>
-#ifndef NO_BUFFER
+#ifndef OPENSSL_NO_BUFFER
 #include <openssl/buffer.h>
 #endif
-#ifndef NO_EVP
+#ifndef OPENSSL_NO_EVP
 #include <openssl/evp.h>
 #endif
-#ifndef NO_BIO
+#ifndef OPENSSL_NO_BIO
 #include <openssl/bio.h>
 #endif
 #include <openssl/stack.h>
 #include <openssl/asn1.h>
 #include <openssl/safestack.h>
 
-#ifndef NO_RSA
+#ifndef OPENSSL_NO_RSA
 #include <openssl/rsa.h>
 #endif
 
-#ifndef NO_DSA
+#ifndef OPENSSL_NO_DSA
 #include <openssl/dsa.h>
 #endif
 
-#ifndef NO_DH
+#ifndef OPENSSL_NO_DH
 #include <openssl/dh.h>
 #endif
 
-#include <openssl/evp.h>
-
-
 #ifdef  __cplusplus
 extern "C" {
 #endif
@@ -372,7 +370,7 @@ ESS_SIGNING_CERT *ESS_SIGNING_CERT_dup(ESS_SIGNING_CERT *a);
 void ERR_load_TS_strings(void);
 
 int TS_REQ_set_version(TS_REQ *a, long version);
-long TS_REQ_get_version(TS_REQ *a);
+long TS_REQ_get_version(const TS_REQ *a);
 
 int TS_REQ_set_msg_imprint(TS_REQ *a, TS_MSG_IMPRINT *msg_imprint);
 TS_MSG_IMPRINT *TS_REQ_get_msg_imprint(TS_REQ *a);
@@ -386,11 +384,11 @@ ASN1_OCTET_STRING *TS_MSG_IMPRINT_get_msg(TS_MSG_IMPRINT *a);
 int TS_REQ_set_policy_id(TS_REQ *a, ASN1_OBJECT *policy);
 ASN1_OBJECT *TS_REQ_get_policy_id(TS_REQ *a);
 
-int TS_REQ_set_nonce(TS_REQ *a, ASN1_INTEGER *nonce);
-ASN1_INTEGER *TS_REQ_get_nonce(TS_REQ *a);
+int TS_REQ_set_nonce(TS_REQ *a, const ASN1_INTEGER *nonce);
+const ASN1_INTEGER *TS_REQ_get_nonce(const TS_REQ *a);
 
 int TS_REQ_set_cert_req(TS_REQ *a, int cert_req);
-int TS_REQ_get_cert_req(TS_REQ *a);
+int TS_REQ_get_cert_req(const TS_REQ *a);
 
 STACK_OF(X509_EXTENSION) *TS_REQ_get_exts(TS_REQ *a);
 void TS_REQ_ext_free(TS_REQ *a);
@@ -418,7 +416,7 @@ PKCS7 *TS_RESP_get_token(TS_RESP *a);
 TS_TST_INFO *TS_RESP_get_tst_info(TS_RESP *a);
 
 int TS_TST_INFO_set_version(TS_TST_INFO *a, long version);
-long TS_TST_INFO_get_version(TS_TST_INFO *a);
+long TS_TST_INFO_get_version(const TS_TST_INFO *a);
 
 int TS_TST_INFO_set_policy_id(TS_TST_INFO *a, ASN1_OBJECT *policy_id);
 ASN1_OBJECT *TS_TST_INFO_get_policy_id(TS_TST_INFO *a);
@@ -426,29 +424,29 @@ ASN1_OBJECT *TS_TST_INFO_get_policy_id(TS_TST_INFO *a);
 int TS_TST_INFO_set_msg_imprint(TS_TST_INFO *a, TS_MSG_IMPRINT *msg_imprint);
 TS_MSG_IMPRINT *TS_TST_INFO_get_msg_imprint(TS_TST_INFO *a);
 
-int TS_TST_INFO_set_serial(TS_TST_INFO *a, ASN1_INTEGER *serial);
-ASN1_INTEGER *TS_TST_INFO_get_serial(TS_TST_INFO *a);
+int TS_TST_INFO_set_serial(TS_TST_INFO *a, const ASN1_INTEGER *serial);
+const ASN1_INTEGER *TS_TST_INFO_get_serial(const TS_TST_INFO *a);
 
-int TS_TST_INFO_set_time(TS_TST_INFO *a, ASN1_GENERALIZEDTIME *gtime);
-ASN1_GENERALIZEDTIME *TS_TST_INFO_get_time(TS_TST_INFO *a);
+int TS_TST_INFO_set_time(TS_TST_INFO *a, const ASN1_GENERALIZEDTIME *gtime);
+const ASN1_GENERALIZEDTIME *TS_TST_INFO_get_time(const TS_TST_INFO *a);
 
 int TS_TST_INFO_set_accuracy(TS_TST_INFO *a, TS_ACCURACY *accuracy);
 TS_ACCURACY *TS_TST_INFO_get_accuracy(TS_TST_INFO *a);
 
-int TS_ACCURACY_set_seconds(TS_ACCURACY *a, ASN1_INTEGER *seconds);
-ASN1_INTEGER *TS_ACCURACY_get_seconds(TS_ACCURACY *a);
+int TS_ACCURACY_set_seconds(TS_ACCURACY *a, const ASN1_INTEGER *seconds);
+const ASN1_INTEGER *TS_ACCURACY_get_seconds(const TS_ACCURACY *a);
 
-int TS_ACCURACY_set_millis(TS_ACCURACY *a, ASN1_INTEGER *millis);
-ASN1_INTEGER *TS_ACCURACY_get_millis(TS_ACCURACY *a);
+int TS_ACCURACY_set_millis(TS_ACCURACY *a, const ASN1_INTEGER *millis);
+const ASN1_INTEGER *TS_ACCURACY_get_millis(const TS_ACCURACY *a);
 
-int TS_ACCURACY_set_micros(TS_ACCURACY *a, ASN1_INTEGER *micros);
-ASN1_INTEGER *TS_ACCURACY_get_micros(TS_ACCURACY *a);
+int TS_ACCURACY_set_micros(TS_ACCURACY *a, const ASN1_INTEGER *micros);
+const ASN1_INTEGER *TS_ACCURACY_get_micros(const TS_ACCURACY *a);
 
 int TS_TST_INFO_set_ordering(TS_TST_INFO *a, int ordering);
-int TS_TST_INFO_get_ordering(TS_TST_INFO *a);
+int TS_TST_INFO_get_ordering(const TS_TST_INFO *a);
 
-int TS_TST_INFO_set_nonce(TS_TST_INFO *a, ASN1_INTEGER *nonce);
-ASN1_INTEGER *TS_TST_INFO_get_nonce(TS_TST_INFO *a);
+int TS_TST_INFO_set_nonce(TS_TST_INFO *a, const ASN1_INTEGER *nonce);
+const ASN1_INTEGER *TS_TST_INFO_get_nonce(const TS_TST_INFO *a);
 
 int TS_TST_INFO_set_tsa(TS_TST_INFO *a, GENERAL_NAME *tsa);
 GENERAL_NAME *TS_TST_INFO_get_tsa(TS_TST_INFO *a);
@@ -719,10 +717,10 @@ int TS_TST_INFO_print_bio(BIO *bio, TS_TST_INFO *a);
 
 /* Common utility functions defined in ts/ts_lib.c */
 
-int TS_ASN1_INTEGER_print_bio(BIO *bio, ASN1_INTEGER *num);
-int TS_OBJ_print_bio(BIO *bio, ASN1_OBJECT *obj);
-int TS_ext_print_bio(BIO *bio, STACK_OF(X509_EXTENSION) *extensions);
-int TS_X509_ALGOR_print_bio(BIO *bio, X509_ALGOR *alg);
+int TS_ASN1_INTEGER_print_bio(BIO *bio, const ASN1_INTEGER *num);
+int TS_OBJ_print_bio(BIO *bio, const ASN1_OBJECT *obj);
+int TS_ext_print_bio(BIO *bio, const STACK_OF(X509_EXTENSION) *extensions);
+int TS_X509_ALGOR_print_bio(BIO *bio, const X509_ALGOR *alg);
 int TS_MSG_IMPRINT_print_bio(BIO *bio, TS_MSG_IMPRINT *msg);
 
 /* Function declarations for handling configuration options,
@@ -771,6 +769,7 @@ void ERR_load_TS_strings(void);
 #define TS_F_ESS_ADD_SIGNING_CERT                       112
 #define TS_F_ESS_CERT_ID_NEW_INIT                       113
 #define TS_F_ESS_SIGNING_CERT_NEW_INIT                  114
+#define TS_F_INT_TS_RESP_VERIFY_TOKEN                   149
 #define TS_F_PKCS7_TO_TS_TST_INFO                       148
 #define TS_F_TS_ACCURACY_SET_MICROS                     115
 #define TS_F_TS_ACCURACY_SET_MILLIS                     116
@@ -801,6 +800,7 @@ void ERR_load_TS_strings(void);
 #define TS_F_TS_RESP_GET_POLICY                                 133
 #define TS_F_TS_RESP_SET_GENTIME_WITH_PRECISION                 134
 #define TS_F_TS_RESP_SET_STATUS_INFO                    135
+#define TS_F_TS_RESP_SET_TST_INFO                       150
 #define TS_F_TS_RESP_SIGN                               136
 #define TS_F_TS_RESP_VERIFY_SIGNATURE                   106
 #define TS_F_TS_RESP_VERIFY_TOKEN                       107