diff options
Diffstat (limited to 'src/daemon/https/x509/pkcs12.h')
-rw-r--r-- | src/daemon/https/x509/pkcs12.h | 43 |
1 files changed, 23 insertions, 20 deletions
diff --git a/src/daemon/https/x509/pkcs12.h b/src/daemon/https/x509/pkcs12.h index a9738b94..74d4d06b 100644 --- a/src/daemon/https/x509/pkcs12.h +++ b/src/daemon/https/x509/pkcs12.h | |||
@@ -81,37 +81,40 @@ extern "C" | |||
81 | int MHD_gnutls_pkcs12_init (MHD_gnutls_pkcs12_t * pkcs12); | 81 | int MHD_gnutls_pkcs12_init (MHD_gnutls_pkcs12_t * pkcs12); |
82 | void MHD_gnutls_pkcs12_deinit (MHD_gnutls_pkcs12_t pkcs12); | 82 | void MHD_gnutls_pkcs12_deinit (MHD_gnutls_pkcs12_t pkcs12); |
83 | int MHD_gnutls_pkcs12_import (MHD_gnutls_pkcs12_t pkcs12, | 83 | int MHD_gnutls_pkcs12_import (MHD_gnutls_pkcs12_t pkcs12, |
84 | const MHD_gnutls_datum_t * data, | 84 | const MHD_gnutls_datum_t * data, |
85 | MHD_gnutls_x509_crt_fmt_t format, unsigned int flags); | 85 | MHD_gnutls_x509_crt_fmt_t format, |
86 | unsigned int flags); | ||
86 | int MHD_gnutls_pkcs12_export (MHD_gnutls_pkcs12_t pkcs12, | 87 | int MHD_gnutls_pkcs12_export (MHD_gnutls_pkcs12_t pkcs12, |
87 | MHD_gnutls_x509_crt_fmt_t format, | 88 | MHD_gnutls_x509_crt_fmt_t format, |
88 | void *output_data, size_t * output_data_size); | 89 | void *output_data, size_t * output_data_size); |
89 | 90 | ||
90 | int MHD_gnutls_pkcs12_bag_decrypt (MHD_gnutls_pkcs12_bag_t bag, const char *pass); | 91 | int MHD_gnutls_pkcs12_bag_decrypt (MHD_gnutls_pkcs12_bag_t bag, |
92 | const char *pass); | ||
91 | int MHD_gnutls_pkcs12_bag_encrypt (MHD_gnutls_pkcs12_bag_t bag, | 93 | int MHD_gnutls_pkcs12_bag_encrypt (MHD_gnutls_pkcs12_bag_t bag, |
92 | const char *pass, unsigned int flags); | 94 | const char *pass, unsigned int flags); |
93 | 95 | ||
94 | int MHD_gnutls_pkcs12_bag_get_data (MHD_gnutls_pkcs12_bag_t bag, | 96 | int MHD_gnutls_pkcs12_bag_get_data (MHD_gnutls_pkcs12_bag_t bag, |
95 | int indx, MHD_gnutls_datum_t * data); | 97 | int indx, MHD_gnutls_datum_t * data); |
96 | int MHD_gnutls_pkcs12_bag_set_data (MHD_gnutls_pkcs12_bag_t bag, | 98 | int MHD_gnutls_pkcs12_bag_set_data (MHD_gnutls_pkcs12_bag_t bag, |
97 | MHD_gnutls_pkcs12_bag_type_t type, | 99 | MHD_gnutls_pkcs12_bag_type_t type, |
98 | const MHD_gnutls_datum_t * data); | 100 | const MHD_gnutls_datum_t * data); |
99 | int MHD_gnutls_pkcs12_bag_set_crl (MHD_gnutls_pkcs12_bag_t bag, | 101 | int MHD_gnutls_pkcs12_bag_set_crl (MHD_gnutls_pkcs12_bag_t bag, |
100 | MHD_gnutls_x509_crl_t crl); | 102 | MHD_gnutls_x509_crl_t crl); |
101 | int MHD_gnutls_pkcs12_bag_set_crt (MHD_gnutls_pkcs12_bag_t bag, | 103 | int MHD_gnutls_pkcs12_bag_set_crt (MHD_gnutls_pkcs12_bag_t bag, |
102 | MHD_gnutls_x509_crt_t crt); | 104 | MHD_gnutls_x509_crt_t crt); |
103 | 105 | ||
104 | int MHD_gnutls_pkcs12_bag_get_count (MHD_gnutls_pkcs12_bag_t bag); | 106 | int MHD_gnutls_pkcs12_bag_get_count (MHD_gnutls_pkcs12_bag_t bag); |
105 | 107 | ||
106 | int MHD_gnutls_pkcs12_bag_get_key_id (MHD_gnutls_pkcs12_bag_t bag, | 108 | int MHD_gnutls_pkcs12_bag_get_key_id (MHD_gnutls_pkcs12_bag_t bag, |
107 | int indx, MHD_gnutls_datum_t * id); | 109 | int indx, MHD_gnutls_datum_t * id); |
108 | int MHD_gnutls_pkcs12_bag_set_key_id (MHD_gnutls_pkcs12_bag_t bag, | 110 | int MHD_gnutls_pkcs12_bag_set_key_id (MHD_gnutls_pkcs12_bag_t bag, |
109 | int indx, const MHD_gnutls_datum_t * id); | 111 | int indx, |
112 | const MHD_gnutls_datum_t * id); | ||
110 | 113 | ||
111 | int MHD_gnutls_pkcs12_bag_get_friendly_name (MHD_gnutls_pkcs12_bag_t bag, | 114 | int MHD_gnutls_pkcs12_bag_get_friendly_name (MHD_gnutls_pkcs12_bag_t bag, |
112 | int indx, char **name); | 115 | int indx, char **name); |
113 | int MHD_gnutls_pkcs12_bag_set_friendly_name (MHD_gnutls_pkcs12_bag_t bag, | 116 | int MHD_gnutls_pkcs12_bag_set_friendly_name (MHD_gnutls_pkcs12_bag_t bag, |
114 | int indx, const char *name); | 117 | int indx, const char *name); |
115 | 118 | ||
116 | #ifdef __cplusplus | 119 | #ifdef __cplusplus |
117 | } | 120 | } |
@@ -136,10 +139,10 @@ typedef enum schema_id | |||
136 | } schema_id; | 139 | } schema_id; |
137 | 140 | ||
138 | int MHD_pkcs12_string_to_key (unsigned int id, | 141 | int MHD_pkcs12_string_to_key (unsigned int id, |
139 | const opaque * salt, | 142 | const opaque * salt, |
140 | unsigned int salt_size, | 143 | unsigned int salt_size, |
141 | unsigned int iter, | 144 | unsigned int iter, |
142 | const char *pw, | 145 | const char *pw, |
143 | unsigned int req_keylen, opaque * keybuf); | 146 | unsigned int req_keylen, opaque * keybuf); |
144 | 147 | ||
145 | #endif /* GNUTLS_PKCS12_H */ | 148 | #endif /* GNUTLS_PKCS12_H */ |