projects / packages / heartbeat.git / blame
| Commit | Line | Data |
|---|---|---|
| 5008ad9d | 1 | --- Heartbeat-3-0-7e3a82377fa8/lib/plugins/quorum/quorumd.c~ 2011-06-17 12:32:43.000000000 +0200 |
| 2 | +++ Heartbeat-3-0-7e3a82377fa8/lib/plugins/quorum/quorumd.c 2011-10-24 23:07:51.000000000 +0200 | |
| 3 | @@ -351,11 +351,12 @@ | |
| 4 | verify_certificate (gnutls_session session) | |
| 5 | { | |
| 6 | unsigned int cert_list_size; | |
| 7 | + unsigned int * status; | |
| 8 | const gnutls_datum *cert_list; | |
| 9 | int ret; | |
| 10 | gnutls_x509_crt cert; | |
| 11 | ||
| 12 | - ret = gnutls_certificate_verify_peers (session); | |
| 13 | + ret = gnutls_certificate_verify_peersi2 (session,status); | |
| 14 | ||
| 15 | if (ret < 0) | |
| 16 | { | |
| 17 | --- Heartbeat-3-0-7e3a82377fa8/membership/quorumd/quorumdtest.c~ 2011-06-17 12:32:43.000000000 +0200 | |
| 18 | +++ Heartbeat-3-0-7e3a82377fa8/membership/quorumd/quorumdtest.c 2011-10-24 23:06:46.000000000 +0200 | |
| 19 | @@ -160,11 +160,12 @@ | |
| 20 | verify_certificate (gnutls_session session) | |
| 21 | { | |
| 22 | unsigned int cert_list_size; | |
| 23 | + unsigned int * status; | |
| 24 | const gnutls_datum *cert_list; | |
| 25 | int ret; | |
| 26 | gnutls_x509_crt cert; | |
| 27 | ||
| 28 | - ret = gnutls_certificate_verify_peers (session); | |
| 29 | + ret = gnutls_certificate_verify_peers2 (session,status); | |
| 30 | ||
| 31 | if (ret < 0) | |
| 32 | { | |
| 33 | --- Heartbeat-3-0-7e3a82377fa8/membership/quorumd/quorumd.c~ 2011-06-17 12:32:43.000000000 +0200 | |
| 34 | +++ Heartbeat-3-0-7e3a82377fa8/membership/quorumd/quorumd.c 2011-10-24 23:05:21.000000000 +0200 | |
| 35 | @@ -473,13 +473,14 @@ | |
| 36 | verify_certificate (gnutls_session session, char* CN) | |
| 37 | { | |
| 38 | unsigned int cert_list_size; | |
| 39 | + unsigned int * status; | |
| 40 | const gnutls_datum *cert_list; | |
| 41 | int ret; | |
| 42 | char dn[MAX_DN_LEN]; | |
| 43 | size_t dn_len = MAX_DN_LEN; | |
| 44 | gnutls_x509_crt cert; | |
| 45 | ||
| 46 | - ret = gnutls_certificate_verify_peers(session); | |
| 47 | + ret = gnutls_certificate_verify_peers2(session,status); | |
| 48 | ||
| 49 | if (ret < 0) | |
| 50 | { | |
| e6d22468 JB |
51 | --- Heartbeat-3-0-STABLE-3.0.6/lib/plugins/quorum/quorumd.c.orig 2015-12-19 16:58:59.832244393 +0100 |
| 52 | +++ Heartbeat-3-0-STABLE-3.0.6/lib/plugins/quorum/quorumd.c 2015-12-19 18:28:21.428686050 +0100 | |
| 53 | @@ -327,11 +327,10 @@ | |
| 54 | { | |
| 55 | int ret; | |
| 56 | gnutls_session session; | |
| 57 | - const int cert_type_priority[2] = { GNUTLS_CRT_X509,0}; | |
| 58 | ||
| 59 | gnutls_init (&session, GNUTLS_CLIENT); | |
| 60 | gnutls_set_default_priority (session); | |
| 61 | - gnutls_certificate_type_set_priority (session, cert_type_priority); | |
| 62 | + gnutls_priority_set_direct(session, "NORMAL", NULL); | |
| 63 | gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, xcred); | |
| 64 | gnutls_transport_set_ptr (session, (gnutls_transport_ptr) GINT_TO_POINTER(sd)); | |
| 65 | ret = gnutls_handshake (session); | |
| 66 | --- Heartbeat-3-0-STABLE-3.0.6/membership/quorumd/quorumdtest.c.orig 2015-12-19 16:58:59.832244393 +0100 | |
| 67 | +++ Heartbeat-3-0-STABLE-3.0.6/membership/quorumd/quorumdtest.c 2015-12-19 18:22:04.308701882 +0100 | |
| 68 | @@ -136,11 +136,10 @@ | |
| 69 | { | |
| 70 | int ret; | |
| 71 | gnutls_session session; | |
| 72 | - const int cert_type_priority[2] = { GNUTLS_CRT_X509,0}; | |
| 73 | ||
| 74 | gnutls_init (&session, GNUTLS_CLIENT); | |
| 75 | gnutls_set_default_priority (session); | |
| 76 | - gnutls_certificate_type_set_priority (session, cert_type_priority); | |
| 77 | + gnutls_priority_set_direct(session, "NORMAL", NULL); | |
| 78 | gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, xcred); | |
| 79 | gnutls_transport_set_ptr (session, (gnutls_transport_ptr) GINT_TO_POINTER(sd)); | |
| 80 | ret = gnutls_handshake (session); |