diff options
Diffstat (limited to 'src/daemon/https/x509/mpi.c')
-rw-r--r-- | src/daemon/https/x509/mpi.c | 56 |
1 files changed, 32 insertions, 24 deletions
diff --git a/src/daemon/https/x509/mpi.c b/src/daemon/https/x509/mpi.c index 4e3c8cd1..76995fdb 100644 --- a/src/daemon/https/x509/mpi.c +++ b/src/daemon/https/x509/mpi.c | |||
@@ -44,8 +44,9 @@ MHD__gnutls_x509_read_rsa_params (opaque * der, int dersize, mpi_t * params) | |||
44 | ASN1_TYPE spk = ASN1_TYPE_EMPTY; | 44 | ASN1_TYPE spk = ASN1_TYPE_EMPTY; |
45 | 45 | ||
46 | if ((result = | 46 | if ((result = |
47 | MHD__asn1_create_element (MHD__gnutls_getMHD__gnutls_asn (), "GNUTLS.RSAPublicKey", | 47 | MHD__asn1_create_element (MHD__gnutls_getMHD__gnutls_asn (), |
48 | &spk)) != ASN1_SUCCESS) | 48 | "GNUTLS.RSAPublicKey", |
49 | &spk)) != ASN1_SUCCESS) | ||
49 | { | 50 | { |
50 | MHD_gnutls_assert (); | 51 | MHD_gnutls_assert (); |
51 | return MHD_gtls_asn2err (result); | 52 | return MHD_gtls_asn2err (result); |
@@ -94,7 +95,7 @@ MHD__gnutls_x509_read_dsa_params (opaque * der, int dersize, mpi_t * params) | |||
94 | 95 | ||
95 | if ((result = | 96 | if ((result = |
96 | MHD__asn1_create_element (MHD__gnutls_get_pkix (), "PKIX1.Dss-Parms", | 97 | MHD__asn1_create_element (MHD__gnutls_get_pkix (), "PKIX1.Dss-Parms", |
97 | &spk)) != ASN1_SUCCESS) | 98 | &spk)) != ASN1_SUCCESS) |
98 | { | 99 | { |
99 | MHD_gnutls_assert (); | 100 | MHD_gnutls_assert (); |
100 | return MHD_gtls_asn2err (result); | 101 | return MHD_gtls_asn2err (result); |
@@ -161,8 +162,9 @@ MHD__gnutls_x509_read_der_int (opaque * der, int dersize, mpi_t * out) | |||
161 | 162 | ||
162 | /* == INTEGER */ | 163 | /* == INTEGER */ |
163 | if ((result = | 164 | if ((result = |
164 | MHD__asn1_create_element (MHD__gnutls_getMHD__gnutls_asn (), "GNUTLS.DSAPublicKey", | 165 | MHD__asn1_create_element (MHD__gnutls_getMHD__gnutls_asn (), |
165 | &spk)) != ASN1_SUCCESS) | 166 | "GNUTLS.DSAPublicKey", |
167 | &spk)) != ASN1_SUCCESS) | ||
166 | { | 168 | { |
167 | MHD_gnutls_assert (); | 169 | MHD_gnutls_assert (); |
168 | return MHD_gtls_asn2err (result); | 170 | return MHD_gtls_asn2err (result); |
@@ -206,7 +208,7 @@ MHD__gnutls_x509_read_dsa_pubkey (opaque * der, int dersize, mpi_t * params) | |||
206 | */ | 208 | */ |
207 | int | 209 | int |
208 | MHD__gnutls_x509_crt_get_mpis (MHD_gnutls_x509_crt_t cert, | 210 | MHD__gnutls_x509_crt_get_mpis (MHD_gnutls_x509_crt_t cert, |
209 | mpi_t * params, int *params_size) | 211 | mpi_t * params, int *params_size) |
210 | { | 212 | { |
211 | int result; | 213 | int result; |
212 | int pk_algorithm; | 214 | int pk_algorithm; |
@@ -220,8 +222,8 @@ MHD__gnutls_x509_crt_get_mpis (MHD_gnutls_x509_crt_t cert, | |||
220 | */ | 222 | */ |
221 | result | 223 | result |
222 | = MHD__gnutls_x509_read_value (cert->cert, | 224 | = MHD__gnutls_x509_read_value (cert->cert, |
223 | "tbsCertificate.subjectPublicKeyInfo.subjectPublicKey", | 225 | "tbsCertificate.subjectPublicKeyInfo.subjectPublicKey", |
224 | &tmp, 2); | 226 | &tmp, 2); |
225 | 227 | ||
226 | if (result < 0) | 228 | if (result < 0) |
227 | { | 229 | { |
@@ -276,7 +278,7 @@ error:MHD__gnutls_free_datum (&tmp); | |||
276 | */ | 278 | */ |
277 | int | 279 | int |
278 | MHD__gnutls_x509_write_rsa_params (mpi_t * params, | 280 | MHD__gnutls_x509_write_rsa_params (mpi_t * params, |
279 | int params_size, MHD_gnutls_datum_t * der) | 281 | int params_size, MHD_gnutls_datum_t * der) |
280 | { | 282 | { |
281 | int result; | 283 | int result; |
282 | ASN1_TYPE spk = ASN1_TYPE_EMPTY; | 284 | ASN1_TYPE spk = ASN1_TYPE_EMPTY; |
@@ -292,8 +294,9 @@ MHD__gnutls_x509_write_rsa_params (mpi_t * params, | |||
292 | } | 294 | } |
293 | 295 | ||
294 | if ((result = | 296 | if ((result = |
295 | MHD__asn1_create_element (MHD__gnutls_getMHD__gnutls_asn (), "GNUTLS.RSAPublicKey", | 297 | MHD__asn1_create_element (MHD__gnutls_getMHD__gnutls_asn (), |
296 | &spk)) != ASN1_SUCCESS) | 298 | "GNUTLS.RSAPublicKey", |
299 | &spk)) != ASN1_SUCCESS) | ||
297 | { | 300 | { |
298 | MHD_gnutls_assert (); | 301 | MHD_gnutls_assert (); |
299 | return MHD_gtls_asn2err (result); | 302 | return MHD_gtls_asn2err (result); |
@@ -334,11 +337,11 @@ cleanup:MHD__asn1_delete_structure (&spk); | |||
334 | */ | 337 | */ |
335 | int | 338 | int |
336 | MHD__gnutls_x509_write_sig_params (ASN1_TYPE dst, | 339 | MHD__gnutls_x509_write_sig_params (ASN1_TYPE dst, |
337 | const char *dst_name, | 340 | const char *dst_name, |
338 | enum MHD_GNUTLS_PublicKeyAlgorithm | 341 | enum MHD_GNUTLS_PublicKeyAlgorithm |
339 | pk_algorithm, | 342 | pk_algorithm, |
340 | enum MHD_GNUTLS_HashAlgorithm dig, | 343 | enum MHD_GNUTLS_HashAlgorithm dig, |
341 | mpi_t * params, int params_size) | 344 | mpi_t * params, int params_size) |
342 | { | 345 | { |
343 | int result; | 346 | int result; |
344 | char name[128]; | 347 | char name[128]; |
@@ -391,7 +394,7 @@ MHD__gnutls_x509_write_sig_params (ASN1_TYPE dst, | |||
391 | */ | 394 | */ |
392 | int | 395 | int |
393 | MHD__gnutls_x509_write_dsa_params (mpi_t * params, | 396 | MHD__gnutls_x509_write_dsa_params (mpi_t * params, |
394 | int params_size, MHD_gnutls_datum_t * der) | 397 | int params_size, MHD_gnutls_datum_t * der) |
395 | { | 398 | { |
396 | int result; | 399 | int result; |
397 | ASN1_TYPE spk = ASN1_TYPE_EMPTY; | 400 | ASN1_TYPE spk = ASN1_TYPE_EMPTY; |
@@ -407,8 +410,9 @@ MHD__gnutls_x509_write_dsa_params (mpi_t * params, | |||
407 | } | 410 | } |
408 | 411 | ||
409 | if ((result = | 412 | if ((result = |
410 | MHD__asn1_create_element (MHD__gnutls_getMHD__gnutls_asn (), "GNUTLS.DSAParameters", | 413 | MHD__asn1_create_element (MHD__gnutls_getMHD__gnutls_asn (), |
411 | &spk)) != ASN1_SUCCESS) | 414 | "GNUTLS.DSAParameters", |
415 | &spk)) != ASN1_SUCCESS) | ||
412 | { | 416 | { |
413 | MHD_gnutls_assert (); | 417 | MHD_gnutls_assert (); |
414 | return MHD_gtls_asn2err (result); | 418 | return MHD_gtls_asn2err (result); |
@@ -456,7 +460,8 @@ cleanup:MHD__asn1_delete_structure (&spk); | |||
456 | */ | 460 | */ |
457 | int | 461 | int |
458 | MHD__gnutls_x509_write_dsa_public_key (mpi_t * params, | 462 | MHD__gnutls_x509_write_dsa_public_key (mpi_t * params, |
459 | int params_size, MHD_gnutls_datum_t * der) | 463 | int params_size, |
464 | MHD_gnutls_datum_t * der) | ||
460 | { | 465 | { |
461 | int result; | 466 | int result; |
462 | ASN1_TYPE spk = ASN1_TYPE_EMPTY; | 467 | ASN1_TYPE spk = ASN1_TYPE_EMPTY; |
@@ -472,8 +477,9 @@ MHD__gnutls_x509_write_dsa_public_key (mpi_t * params, | |||
472 | } | 477 | } |
473 | 478 | ||
474 | if ((result = | 479 | if ((result = |
475 | MHD__asn1_create_element (MHD__gnutls_getMHD__gnutls_asn (), "GNUTLS.DSAPublicKey", | 480 | MHD__asn1_create_element (MHD__gnutls_getMHD__gnutls_asn (), |
476 | &spk)) != ASN1_SUCCESS) | 481 | "GNUTLS.DSAPublicKey", |
482 | &spk)) != ASN1_SUCCESS) | ||
477 | { | 483 | { |
478 | MHD_gnutls_assert (); | 484 | MHD_gnutls_assert (); |
479 | return MHD_gtls_asn2err (result); | 485 | return MHD_gtls_asn2err (result); |
@@ -505,7 +511,8 @@ cleanup:MHD__asn1_delete_structure (&spk); | |||
505 | * steps. | 511 | * steps. |
506 | */ | 512 | */ |
507 | int | 513 | int |
508 | MHD__gnutls_x509_read_uint (ASN1_TYPE node, const char *value, unsigned int *ret) | 514 | MHD__gnutls_x509_read_uint (ASN1_TYPE node, const char *value, |
515 | unsigned int *ret) | ||
509 | { | 516 | { |
510 | int len, result; | 517 | int len, result; |
511 | opaque *tmpstr; | 518 | opaque *tmpstr; |
@@ -557,7 +564,8 @@ MHD__gnutls_x509_read_uint (ASN1_TYPE node, const char *value, unsigned int *ret | |||
557 | /* Writes the specified integer into the specified node. | 564 | /* Writes the specified integer into the specified node. |
558 | */ | 565 | */ |
559 | int | 566 | int |
560 | MHD__gnutls_x509_write_uint32 (ASN1_TYPE node, const char *value, uint32_t num) | 567 | MHD__gnutls_x509_write_uint32 (ASN1_TYPE node, const char *value, |
568 | uint32_t num) | ||
561 | { | 569 | { |
562 | opaque tmpstr[4]; | 570 | opaque tmpstr[4]; |
563 | int result; | 571 | int result; |