aboutsummaryrefslogtreecommitdiff
path: root/src/daemon/https/x509/extensions.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/daemon/https/x509/extensions.c')
-rw-r--r--src/daemon/https/x509/extensions.c25
1 files changed, 15 insertions, 10 deletions
diff --git a/src/daemon/https/x509/extensions.c b/src/daemon/https/x509/extensions.c
index 8bf36000..3b8bf494 100644
--- a/src/daemon/https/x509/extensions.c
+++ b/src/daemon/https/x509/extensions.c
@@ -46,8 +46,9 @@
46 */ 46 */
47int 47int
48MHD__gnutls_x509_crt_get_extension (MHD_gnutls_x509_crt_t cert, 48MHD__gnutls_x509_crt_get_extension (MHD_gnutls_x509_crt_t cert,
49 const char *extension_id, int indx, 49 const char *extension_id, int indx,
50 MHD_gnutls_datum_t * ret, unsigned int *_critical) 50 MHD_gnutls_datum_t * ret,
51 unsigned int *_critical)
51{ 52{
52 int k, result, len; 53 int k, result, len;
53 char name[MAX_NAME_SIZE], name2[MAX_NAME_SIZE]; 54 char name[MAX_NAME_SIZE], name2[MAX_NAME_SIZE];
@@ -136,7 +137,8 @@ MHD__gnutls_x509_crt_get_extension (MHD_gnutls_x509_crt_t cert,
136 MHD_gtls_str_cpy (name2, sizeof (name2), name); 137 MHD_gtls_str_cpy (name2, sizeof (name2), name);
137 MHD_gtls_str_cat (name2, sizeof (name2), ".extnValue"); 138 MHD_gtls_str_cat (name2, sizeof (name2), ".extnValue");
138 139
139 result = MHD__gnutls_x509_read_value (cert->cert, name2, &value, 0); 140 result =
141 MHD__gnutls_x509_read_value (cert->cert, name2, &value, 0);
140 if (result < 0) 142 if (result < 0)
141 { 143 {
142 MHD_gnutls_assert (); 144 MHD_gnutls_assert ();
@@ -177,7 +179,8 @@ MHD__gnutls_x509_crt_get_extension (MHD_gnutls_x509_crt_t cert,
177 */ 179 */
178int 180int
179MHD__gnutls_x509_crt_get_extension_oid (MHD_gnutls_x509_crt_t cert, 181MHD__gnutls_x509_crt_get_extension_oid (MHD_gnutls_x509_crt_t cert,
180 int indx, void *oid, size_t * sizeof_oid) 182 int indx, void *oid,
183 size_t * sizeof_oid)
181{ 184{
182 int k, result, len; 185 int k, result, len;
183 char name[MAX_NAME_SIZE], name2[MAX_NAME_SIZE]; 186 char name[MAX_NAME_SIZE], name2[MAX_NAME_SIZE];
@@ -264,7 +267,7 @@ MHD__gnutls_x509_crt_get_extension_oid (MHD_gnutls_x509_crt_t cert,
264 */ 267 */
265int 268int
266MHD__gnutls_x509_ext_extract_keyUsage (uint16_t * keyUsage, 269MHD__gnutls_x509_ext_extract_keyUsage (uint16_t * keyUsage,
267 opaque * extnValue, int extnValueLen) 270 opaque * extnValue, int extnValueLen)
268{ 271{
269 ASN1_TYPE ext = ASN1_TYPE_EMPTY; 272 ASN1_TYPE ext = ASN1_TYPE_EMPTY;
270 int len, result; 273 int len, result;
@@ -309,16 +312,17 @@ MHD__gnutls_x509_ext_extract_keyUsage (uint16_t * keyUsage,
309 */ 312 */
310int 313int
311MHD__gnutls_x509_ext_extract_basicConstraints (int *CA, 314MHD__gnutls_x509_ext_extract_basicConstraints (int *CA,
312 int *pathLenConstraint, 315 int *pathLenConstraint,
313 opaque * extnValue, 316 opaque * extnValue,
314 int extnValueLen) 317 int extnValueLen)
315{ 318{
316 ASN1_TYPE ext = ASN1_TYPE_EMPTY; 319 ASN1_TYPE ext = ASN1_TYPE_EMPTY;
317 char str[128]; 320 char str[128];
318 int len, result; 321 int len, result;
319 322
320 if ((result = MHD__asn1_create_element 323 if ((result = MHD__asn1_create_element
321 (MHD__gnutls_get_pkix (), "PKIX1.BasicConstraints", &ext)) != ASN1_SUCCESS) 324 (MHD__gnutls_get_pkix (), "PKIX1.BasicConstraints",
325 &ext)) != ASN1_SUCCESS)
322 { 326 {
323 MHD_gnutls_assert (); 327 MHD_gnutls_assert ();
324 return MHD_gtls_asn2err (result); 328 return MHD_gtls_asn2err (result);
@@ -335,7 +339,8 @@ MHD__gnutls_x509_ext_extract_basicConstraints (int *CA,
335 if (pathLenConstraint) 339 if (pathLenConstraint)
336 { 340 {
337 result = MHD__gnutls_x509_read_uint (ext, "pathLenConstraint", 341 result = MHD__gnutls_x509_read_uint (ext, "pathLenConstraint",
338 (unsigned int*) pathLenConstraint); 342 (unsigned int *)
343 pathLenConstraint);
339 if (result == GNUTLS_E_ASN1_ELEMENT_NOT_FOUND) 344 if (result == GNUTLS_E_ASN1_ELEMENT_NOT_FOUND)
340 *pathLenConstraint = -1; 345 *pathLenConstraint = -1;
341 else if (result != GNUTLS_E_SUCCESS) 346 else if (result != GNUTLS_E_SUCCESS)