diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libssl/src/ssl/t1_lib.c | 35 | ||||
| -rw-r--r-- | src/lib/libssl/t1_lib.c | 35 |
2 files changed, 38 insertions, 32 deletions
diff --git a/src/lib/libssl/src/ssl/t1_lib.c b/src/lib/libssl/src/ssl/t1_lib.c index d82573fdb6..0966e78b4d 100644 --- a/src/lib/libssl/src/ssl/t1_lib.c +++ b/src/lib/libssl/src/ssl/t1_lib.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: t1_lib.c,v 1.51 2014/07/13 16:03:10 beck Exp $ */ | 1 | /* $OpenBSD: t1_lib.c,v 1.52 2014/07/13 16:33:01 jsing Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -346,28 +346,31 @@ tls1_ec_nid2curve_id(int nid) | |||
| 346 | } | 346 | } |
| 347 | } | 347 | } |
| 348 | 348 | ||
| 349 | 349 | /* | |
| 350 | /* List of supported signature algorithms and hashes. Should make this | 350 | * List of supported signature algorithms and hashes. Should make this |
| 351 | * customisable at some point, for now include everything we support. | 351 | * customisable at some point, for now include everything we support. |
| 352 | */ | 352 | */ |
| 353 | 353 | ||
| 354 | #define tlsext_sigalg_rsa(md) md, TLSEXT_signature_rsa, | 354 | static unsigned char tls12_sigalgs[] = { |
| 355 | TLSEXT_hash_sha512, TLSEXT_signature_rsa, | ||
| 356 | TLSEXT_hash_sha512, TLSEXT_signature_dsa, | ||
| 357 | TLSEXT_hash_sha512, TLSEXT_signature_ecdsa, | ||
| 355 | 358 | ||
| 356 | #define tlsext_sigalg_dsa(md) md, TLSEXT_signature_dsa, | 359 | TLSEXT_hash_sha384, TLSEXT_signature_rsa, |
| 360 | TLSEXT_hash_sha384, TLSEXT_signature_dsa, | ||
| 361 | TLSEXT_hash_sha384, TLSEXT_signature_ecdsa, | ||
| 357 | 362 | ||
| 358 | #define tlsext_sigalg_ecdsa(md) md, TLSEXT_signature_ecdsa, | 363 | TLSEXT_hash_sha256, TLSEXT_signature_rsa, |
| 364 | TLSEXT_hash_sha256, TLSEXT_signature_dsa, | ||
| 365 | TLSEXT_hash_sha256, TLSEXT_signature_ecdsa, | ||
| 359 | 366 | ||
| 360 | #define tlsext_sigalg(md) \ | 367 | TLSEXT_hash_sha224, TLSEXT_signature_rsa, |
| 361 | tlsext_sigalg_rsa(md) \ | 368 | TLSEXT_hash_sha224, TLSEXT_signature_dsa, |
| 362 | tlsext_sigalg_dsa(md) \ | 369 | TLSEXT_hash_sha224, TLSEXT_signature_ecdsa, |
| 363 | tlsext_sigalg_ecdsa(md) | ||
| 364 | 370 | ||
| 365 | static unsigned char tls12_sigalgs[] = { | 371 | TLSEXT_hash_sha1, TLSEXT_signature_rsa, |
| 366 | tlsext_sigalg(TLSEXT_hash_sha512) | 372 | TLSEXT_hash_sha1, TLSEXT_signature_dsa, |
| 367 | tlsext_sigalg(TLSEXT_hash_sha384) | 373 | TLSEXT_hash_sha1, TLSEXT_signature_ecdsa, |
| 368 | tlsext_sigalg(TLSEXT_hash_sha256) | ||
| 369 | tlsext_sigalg(TLSEXT_hash_sha224) | ||
| 370 | tlsext_sigalg(TLSEXT_hash_sha1) | ||
| 371 | }; | 374 | }; |
| 372 | 375 | ||
| 373 | int | 376 | int |
diff --git a/src/lib/libssl/t1_lib.c b/src/lib/libssl/t1_lib.c index d82573fdb6..0966e78b4d 100644 --- a/src/lib/libssl/t1_lib.c +++ b/src/lib/libssl/t1_lib.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: t1_lib.c,v 1.51 2014/07/13 16:03:10 beck Exp $ */ | 1 | /* $OpenBSD: t1_lib.c,v 1.52 2014/07/13 16:33:01 jsing Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -346,28 +346,31 @@ tls1_ec_nid2curve_id(int nid) | |||
| 346 | } | 346 | } |
| 347 | } | 347 | } |
| 348 | 348 | ||
| 349 | 349 | /* | |
| 350 | /* List of supported signature algorithms and hashes. Should make this | 350 | * List of supported signature algorithms and hashes. Should make this |
| 351 | * customisable at some point, for now include everything we support. | 351 | * customisable at some point, for now include everything we support. |
| 352 | */ | 352 | */ |
| 353 | 353 | ||
| 354 | #define tlsext_sigalg_rsa(md) md, TLSEXT_signature_rsa, | 354 | static unsigned char tls12_sigalgs[] = { |
| 355 | TLSEXT_hash_sha512, TLSEXT_signature_rsa, | ||
| 356 | TLSEXT_hash_sha512, TLSEXT_signature_dsa, | ||
| 357 | TLSEXT_hash_sha512, TLSEXT_signature_ecdsa, | ||
| 355 | 358 | ||
| 356 | #define tlsext_sigalg_dsa(md) md, TLSEXT_signature_dsa, | 359 | TLSEXT_hash_sha384, TLSEXT_signature_rsa, |
| 360 | TLSEXT_hash_sha384, TLSEXT_signature_dsa, | ||
| 361 | TLSEXT_hash_sha384, TLSEXT_signature_ecdsa, | ||
| 357 | 362 | ||
| 358 | #define tlsext_sigalg_ecdsa(md) md, TLSEXT_signature_ecdsa, | 363 | TLSEXT_hash_sha256, TLSEXT_signature_rsa, |
| 364 | TLSEXT_hash_sha256, TLSEXT_signature_dsa, | ||
| 365 | TLSEXT_hash_sha256, TLSEXT_signature_ecdsa, | ||
| 359 | 366 | ||
| 360 | #define tlsext_sigalg(md) \ | 367 | TLSEXT_hash_sha224, TLSEXT_signature_rsa, |
| 361 | tlsext_sigalg_rsa(md) \ | 368 | TLSEXT_hash_sha224, TLSEXT_signature_dsa, |
| 362 | tlsext_sigalg_dsa(md) \ | 369 | TLSEXT_hash_sha224, TLSEXT_signature_ecdsa, |
| 363 | tlsext_sigalg_ecdsa(md) | ||
| 364 | 370 | ||
| 365 | static unsigned char tls12_sigalgs[] = { | 371 | TLSEXT_hash_sha1, TLSEXT_signature_rsa, |
| 366 | tlsext_sigalg(TLSEXT_hash_sha512) | 372 | TLSEXT_hash_sha1, TLSEXT_signature_dsa, |
| 367 | tlsext_sigalg(TLSEXT_hash_sha384) | 373 | TLSEXT_hash_sha1, TLSEXT_signature_ecdsa, |
| 368 | tlsext_sigalg(TLSEXT_hash_sha256) | ||
| 369 | tlsext_sigalg(TLSEXT_hash_sha224) | ||
| 370 | tlsext_sigalg(TLSEXT_hash_sha1) | ||
| 371 | }; | 374 | }; |
| 372 | 375 | ||
| 373 | int | 376 | int |