Fix CVE-2017-6891 in minitasn1 code

[platform/upstream/gnutls.git] / src / certtool-cfg.h

diff --git a/src/certtool-cfg.h b/src/certtool-cfg.h
index 878ecac..606e1cf 100644 (file)
--- a/src/certtool-cfg.h
+++ b/src/certtool-cfg.h
@@ -21,65 +21,72 @@
  */
 
 #include <stdbool.h>
+#include <stdint.h>
 #include <gnutls/x509.h>
 
-void cfg_init (void);
-int template_parse (const char *template);
+void cfg_init(void);
+int template_parse(const char *template);
 
-void read_crt_set (gnutls_x509_crt_t crt, const char *input_str,
-                   const char *oid);
-void read_crq_set (gnutls_x509_crq_t crq, const char *input_str,
-                   const char *oid);
-int read_int (const char *input_str);
-const char *read_str (const char *input_str);
-int read_yesno (const char *input_str);
+void read_crt_set(gnutls_x509_crt_t crt, const char *input_str,
+                 const char *oid);
+void read_crq_set(gnutls_x509_crq_t crq, const char *input_str,
+                 const char *oid);
+int64_t read_int(const char *input_str);
+const char *read_str(const char *input_str);
+int read_yesno(const char *input_str, int def);
 
-const char *get_pass (void);
-const char *get_confirmed_pass (bool empty_ok);
-const char *get_challenge_pass (void);
-const char *get_crl_dist_point_url (void);
-void get_country_crt_set (gnutls_x509_crt_t crt);
-void get_organization_crt_set (gnutls_x509_crt_t crt);
-void get_unit_crt_set (gnutls_x509_crt_t crt);
-void get_state_crt_set (gnutls_x509_crt_t crt);
-void get_locality_crt_set (gnutls_x509_crt_t crt);
-void get_cn_crt_set (gnutls_x509_crt_t crt);
-void get_uid_crt_set (gnutls_x509_crt_t crt);
-void get_pkcs9_email_crt_set (gnutls_x509_crt_t crt);
-void get_oid_crt_set (gnutls_x509_crt_t crt);
-void get_key_purpose_set (gnutls_x509_crt_t crt);
-int get_serial (void);
-int get_days (void);
-int get_ca_status (void);
-int get_crl_number (void);
-int get_path_len (void);
-int get_crq_extensions_status (void);
-const char *get_pkcs12_key_name (void);
-int get_tls_client_status (void);
-int get_tls_server_status (void);
-int get_crl_next_update (void);
-int get_time_stamp_status (void);
-int get_ocsp_sign_status (void);
-int get_code_sign_status (void);
-int get_crl_sign_status (void);
-int get_cert_sign_status (void);
-int get_encrypt_status (int server);
-int get_sign_status (int server);
-void get_ip_addr_set (int type, void *crt);
-void get_dns_name_set (int type, void *crt);
-void get_uri_set (int type, void *crt);
-void get_email_set (int type, void *crt);
-int get_ipsec_ike_status (void);
-void get_dc_set (int type, void *crt);
-void get_ca_issuers_set (gnutls_x509_crt_t crt);
-void get_ocsp_issuer_set (gnutls_x509_crt_t crt);
+const char *get_pass(void);
+const char *get_confirmed_pass(bool empty_ok);
+const char *get_challenge_pass(void);
+void get_crl_dist_point_set(gnutls_x509_crt_t crt);
+void crt_constraints_set(gnutls_x509_crt_t crt);
+void get_country_crt_set(gnutls_x509_crt_t crt);
+void get_organization_crt_set(gnutls_x509_crt_t crt);
+void get_unit_crt_set(gnutls_x509_crt_t crt);
+void get_state_crt_set(gnutls_x509_crt_t crt);
+void get_locality_crt_set(gnutls_x509_crt_t crt);
+void get_cn_crt_set(gnutls_x509_crt_t crt);
+void get_dn_crt_set(gnutls_x509_crt_t crt);
+void get_dn_crq_set(gnutls_x509_crq_t crt);
+void get_uid_crt_set(gnutls_x509_crt_t crt);
+void get_pkcs9_email_crt_set(gnutls_x509_crt_t crt);
+void get_oid_crt_set(gnutls_x509_crt_t crt);
+void get_key_purpose_set(int type, void *crt);
+void get_serial(unsigned char* serial, size_t* serial_size);
+time_t get_expiration_date(void);
+time_t get_activation_date(void);
+int get_ca_status(void);
+void get_crl_number(unsigned char* serial, size_t* serial_size);
+int get_path_len(void);
+int get_crq_extensions_status(void);
+const char *get_pkcs12_key_name(void);
+int get_tls_client_status(void);
+int get_tls_server_status(void);
+time_t get_crl_next_update(void);
+int get_time_stamp_status(void);
+int get_ocsp_sign_status(void);
+int get_code_sign_status(void);
+int get_crl_sign_status(void);
+int get_cert_sign_status(void);
+int get_encrypt_status(int server);
+int get_sign_status(int server);
+void get_ip_addr_set(int type, void *crt);
+void get_dns_name_set(int type, void *crt);
+void get_policy_set(gnutls_x509_crt_t);
+void get_uri_set(int type, void *crt);
+void get_email_set(int type, void *crt);
+int get_ipsec_ike_status(void);
+void get_dc_set(int type, void *crt);
+void get_ca_issuers_set(gnutls_x509_crt_t crt);
+void get_ocsp_issuer_set(gnutls_x509_crt_t crt);
+void crt_unique_ids_set(gnutls_x509_crt_t crt);
 
-void get_cn_crq_set (gnutls_x509_crq_t crq);
-void get_uid_crq_set (gnutls_x509_crq_t crq);
-void get_locality_crq_set (gnutls_x509_crq_t crq);
-void get_state_crq_set (gnutls_x509_crq_t crq);
-void get_unit_crq_set (gnutls_x509_crq_t crq);
-void get_organization_crq_set (gnutls_x509_crq_t crq);
-void get_country_crq_set (gnutls_x509_crq_t crq);
-void get_oid_crq_set (gnutls_x509_crq_t crq);
-const char *get_proxy_policy (char **policy, size_t * policylen);
+void get_cn_crq_set(gnutls_x509_crq_t crq);
+void get_uid_crq_set(gnutls_x509_crq_t crq);
+void get_locality_crq_set(gnutls_x509_crq_t crq);
+void get_state_crq_set(gnutls_x509_crq_t crq);
+void get_unit_crq_set(gnutls_x509_crq_t crq);
+void get_organization_crq_set(gnutls_x509_crq_t crq);
+void get_country_crq_set(gnutls_x509_crq_t crq);
+void get_oid_crq_set(gnutls_x509_crq_t crq);
+const char *get_proxy_policy(char **policy, size_t * policylen);