author | jenny.yung@oracle.com <jenny.yung@oracle.com> |
Wed, 02 Dec 2015 16:35:50 -0800 | |
changeset 5143 | 9b4a483bf8d9 |
parent 4903 | 6b60e63145ed |
child 5216 | fdd262355907 |
permissions | -rw-r--r-- |
4903
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
1 |
Source: |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
2 |
Internal |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
3 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
4 |
Info: |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
5 |
This patch makes the changes necessary to remove all usage of elliptical curve |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
6 |
code in this library. |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
7 |
|
5143
9b4a483bf8d9
22242767 Upgrade GnuTLS to 3.4.6
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
4903
diff
changeset
|
8 |
Status: This patch is Solaris specific. This will not be sent upstream. |
4903
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
9 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
10 |
--- ORIGINAL/./lib/auth/ecdhe.h 2015-07-24 15:17:22.747625209 -0700 |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
11 |
+++ gnutls-3.4.1/./lib/auth/ecdhe.h 2015-07-24 15:19:55.707550982 -0700 |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
12 |
@@ -23,6 +23,7 @@ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
13 |
#ifndef AUTH_ECDH_COMMON |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
14 |
#define AUTH_ECDH_COMMON |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
15 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
16 |
+#if defined(ENABLE_ECDHE) |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
17 |
#include <gnutls_auth.h> |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
18 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
19 |
int |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
20 |
@@ -48,4 +49,5 @@ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
21 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
22 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
23 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
24 |
+#endif /*ENABLE_ECDHE*/ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
25 |
#endif |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
26 |
--- ORIGINAL/./lib/auth/dhe_psk.c 2015-07-24 15:17:55.194610558 -0700 |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
27 |
+++ gnutls-3.4.1/./lib/auth/dhe_psk.c 2015-07-24 15:19:55.727540829 -0700 |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
28 |
@@ -39,20 +39,28 @@ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
29 |
#include "gnutls_mpi.h" |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
30 |
#include <gnutls_state.h> |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
31 |
#include <auth/dh_common.h> |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
32 |
+#if defined(ENABLE_ECDHE) |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
33 |
#include <auth/ecdhe.h> |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
34 |
+#endif |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
35 |
#include <gnutls_datum.h> |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
36 |
#include <auth/psk_passwd.h> |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
37 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
38 |
+#if defined(ENABLE_ECDHE) |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
39 |
static int |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
40 |
proc_ecdhe_psk_server_kx(gnutls_session_t session, uint8_t * data, |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
41 |
size_t _data_size); |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
42 |
+#endif |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
43 |
static int gen_dhe_psk_server_kx(gnutls_session_t, gnutls_buffer_st *); |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
44 |
static int gen_dhe_psk_client_kx(gnutls_session_t, gnutls_buffer_st *); |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
45 |
+#if defined(ENABLE_ECDHE) |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
46 |
static int gen_ecdhe_psk_client_kx(gnutls_session_t, gnutls_buffer_st *); |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
47 |
static int proc_ecdhe_psk_client_kx(gnutls_session_t, uint8_t *, size_t); |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
48 |
+#endif |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
49 |
static int proc_dhe_psk_server_kx(gnutls_session_t, uint8_t *, size_t); |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
50 |
+#if defined(ENABLE_ECDHE) |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
51 |
static int gen_ecdhe_psk_server_kx(gnutls_session_t session, |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
52 |
gnutls_buffer_st * data); |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
53 |
+#endif |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
54 |
static int proc_dhe_psk_client_kx(gnutls_session_t session, uint8_t * data, |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
55 |
size_t _data_size); |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
56 |
#ifdef ENABLE_DHE |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
57 |
@@ -93,6 +101,7 @@ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
58 |
}; |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
59 |
#endif |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
60 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
61 |
+#if defined(ENABLE_ECDHE) |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
62 |
static int |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
63 |
gen_ecdhe_psk_client_kx(gnutls_session_t session, gnutls_buffer_st * data) |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
64 |
{ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
65 |
@@ -136,6 +145,7 @@ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
66 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
67 |
return ret; |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
68 |
} |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
69 |
+#endif |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
70 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
71 |
static int |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
72 |
gen_dhe_psk_client_kx(gnutls_session_t session, gnutls_buffer_st * data) |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
73 |
@@ -234,6 +244,7 @@ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
74 |
return ret; |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
75 |
} |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
76 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
77 |
+#if defined(ENABLE_ECDHE) |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
78 |
static int |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
79 |
gen_ecdhe_psk_server_kx(gnutls_session_t session, gnutls_buffer_st * data) |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
80 |
{ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
81 |
@@ -258,6 +269,7 @@ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
82 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
83 |
return ret; |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
84 |
} |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
85 |
+#endif |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
86 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
87 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
88 |
static int |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
89 |
@@ -341,6 +353,7 @@ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
90 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
91 |
} |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
92 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
93 |
+#if defined(ENABLE_ECDHE) |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
94 |
static int |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
95 |
proc_ecdhe_psk_client_kx(gnutls_session_t session, uint8_t * data, |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
96 |
size_t _data_size) |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
97 |
@@ -409,6 +422,7 @@ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
98 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
99 |
return ret; |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
100 |
} |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
101 |
+#endif |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
102 |
|
5143
9b4a483bf8d9
22242767 Upgrade GnuTLS to 3.4.6
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
4903
diff
changeset
|
103 |
static int copy_hint(gnutls_session_t session, gnutls_datum_t *hint) |
9b4a483bf8d9
22242767 Upgrade GnuTLS to 3.4.6
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
4903
diff
changeset
|
104 |
{ |
4903
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
105 |
@@ -440,6 +454,7 @@ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
106 |
return 0; |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
107 |
} |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
108 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
109 |
+#if defined(ENABLE_ECDHE) |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
110 |
static int |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
111 |
proc_ecdhe_psk_server_kx(gnutls_session_t session, uint8_t * data, |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
112 |
size_t _data_size) |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
113 |
@@ -469,5 +484,6 @@ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
114 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
115 |
return 0; |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
116 |
} |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
117 |
+#endif /*ENABLE_ECDHE*/ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
118 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
119 |
#endif /* ENABLE_PSK */ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
120 |
--- ORIGINAL/./lib/auth/ecdhe.c 2015-07-24 15:17:30.508450604 -0700 |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
121 |
+++ gnutls-3.4.1/./lib/auth/ecdhe.c 2015-07-24 15:19:55.717659786 -0700 |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
122 |
@@ -25,6 +25,7 @@ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
123 |
* procedure of the certificate and anoymous authentication. |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
124 |
*/ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
125 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
126 |
+#if defined(ENABLE_ECDHE) |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
127 |
#include <gnutls_int.h> |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
128 |
#include "gnutls_auth.h" |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
129 |
#include "gnutls_errors.h" |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
130 |
@@ -50,7 +51,6 @@ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
131 |
proc_ecdhe_client_kx(gnutls_session_t session, |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
132 |
uint8_t * data, size_t _data_size); |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
133 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
134 |
-#if defined(ENABLE_ECDHE) |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
135 |
const mod_auth_st ecdhe_ecdsa_auth_struct = { |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
136 |
"ECDHE_ECDSA", |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
137 |
_gnutls_gen_cert_server_crt, |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
138 |
--- ORIGINAL/./lib/nettle/pk.c 2015-07-24 15:18:27.631820369 -0700 |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
139 |
+++ gnutls-3.4.1/./lib/nettle/pk.c 2015-07-24 15:19:55.737837073 -0700 |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
140 |
@@ -45,13 +45,17 @@ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
141 |
#include <nettle/rsa.h> |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
142 |
#include <gnutls/crypto.h> |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
143 |
#include <nettle/bignum.h> |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
144 |
+#if defined(ENABLE_ECDHE) |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
145 |
#include <nettle/ecc.h> |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
146 |
#include <nettle/ecdsa.h> |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
147 |
#include <nettle/ecc-curve.h> |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
148 |
+#endif |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
149 |
#include <gnettle.h> |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
150 |
#include <fips.h> |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
151 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
152 |
+#if defined(ENABLE_ECDHE) |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
153 |
static inline const struct ecc_curve *get_supported_curve(int curve); |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
154 |
+#endif |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
155 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
156 |
static void rnd_func(void *_ctx, size_t length, uint8_t * data) |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
157 |
{ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
158 |
@@ -64,6 +68,7 @@ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
159 |
} |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
160 |
} |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
161 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
162 |
+#if defined(ENABLE_ECDHE) |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
163 |
static void |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
164 |
ecc_scalar_zclear (struct ecc_scalar *s) |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
165 |
{ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
166 |
@@ -77,6 +82,7 @@ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
167 |
zeroize_key(p->p, ecc_size_a(p->ecc)*sizeof(mp_limb_t)); |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
168 |
ecc_point_clear(p); |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
169 |
} |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
170 |
+#endif |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
171 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
172 |
static void |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
173 |
_dsa_params_get(const gnutls_pk_params_st * pk_params, |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
174 |
@@ -113,6 +119,7 @@ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
175 |
pub->size = nettle_mpz_sizeinbase_256_u(pub->n); |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
176 |
} |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
177 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
178 |
+#if defined(ENABLE_ECDHE) |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
179 |
static int |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
180 |
_ecc_params_to_privkey(const gnutls_pk_params_st * pk_params, |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
181 |
struct ecc_scalar *priv, |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
182 |
@@ -161,6 +168,7 @@ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
183 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
184 |
return; |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
185 |
} |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
186 |
+#endif |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
187 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
188 |
#define MAX_DH_BITS DEFAULT_MAX_VERIFY_BITS |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
189 |
/* This is used when we have no idea on the structure |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
190 |
@@ -245,6 +253,7 @@ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
191 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
192 |
break; |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
193 |
} |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
194 |
+#if defined(ENABLE_ECDHE) |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
195 |
case GNUTLS_PK_EC: |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
196 |
{ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
197 |
struct ecc_scalar ecc_priv; |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
198 |
@@ -290,6 +299,7 @@ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
199 |
goto cleanup; |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
200 |
break; |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
201 |
} |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
202 |
+#endif |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
203 |
default: |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
204 |
gnutls_assert(); |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
205 |
ret = GNUTLS_E_INTERNAL_ERROR; |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
206 |
@@ -447,6 +457,7 @@ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
207 |
const mac_entry_st *me; |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
208 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
209 |
switch (algo) { |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
210 |
+#if defined(ENABLE_ECDHE) |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
211 |
case GNUTLS_PK_EC: /* we do ECDSA */ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
212 |
{ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
213 |
struct ecc_scalar priv; |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
214 |
@@ -495,6 +506,7 @@ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
215 |
} |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
216 |
break; |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
217 |
} |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
218 |
+#endif |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
219 |
case GNUTLS_PK_DSA: |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
220 |
{ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
221 |
struct dsa_params pub; |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
222 |
@@ -601,6 +613,7 @@ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
223 |
bigint_t tmp[2] = { NULL, NULL }; |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
224 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
225 |
switch (algo) { |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
226 |
+#if defined(ENABLE_ECDHE) |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
227 |
case GNUTLS_PK_EC: /* ECDSA */ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
228 |
{ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
229 |
struct ecc_point pub; |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
230 |
@@ -647,6 +660,7 @@ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
231 |
ecc_point_clear(&pub); |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
232 |
break; |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
233 |
} |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
234 |
+#endif |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
235 |
case GNUTLS_PK_DSA: |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
236 |
{ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
237 |
struct dsa_params pub; |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
238 |
@@ -726,6 +740,7 @@ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
239 |
return ret; |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
240 |
} |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
241 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
242 |
+#if defined(ENABLE_ECDHE) |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
243 |
static inline const struct ecc_curve *get_supported_curve(int curve) |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
244 |
{ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
245 |
switch (curve) { |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
246 |
@@ -750,6 +765,7 @@ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
247 |
{ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
248 |
return ((get_supported_curve(curve)!=NULL)?1:0); |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
249 |
} |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
250 |
+#endif |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
251 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
252 |
/* Generates algorithm's parameters. That is: |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
253 |
* For DSA: p, q, and g are generated. |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
254 |
@@ -854,9 +870,11 @@ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
255 |
break; |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
256 |
} |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
257 |
case GNUTLS_PK_RSA: |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
258 |
+#if defined(ENABLE_ECDHE) |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
259 |
case GNUTLS_PK_EC: |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
260 |
ret = 0; |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
261 |
break; |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
262 |
+#endif |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
263 |
default: |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
264 |
gnutls_assert(); |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
265 |
return GNUTLS_E_INVALID_REQUEST; |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
266 |
@@ -884,6 +902,7 @@ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
267 |
const gnutls_datum_t *priv_key, const gnutls_datum_t *pub_key, |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
268 |
const gnutls_datum_t *peer_key, gnutls_datum_t *Z); |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
269 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
270 |
+#if defined(ENABLE_ECDHE) |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
271 |
int _gnutls_ecdh_compute_key(gnutls_ecc_curve_t curve, |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
272 |
const gnutls_datum_t *x, const gnutls_datum_t *y, |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
273 |
const gnutls_datum_t *k, |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
274 |
@@ -893,6 +912,7 @@ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
275 |
int _gnutls_ecdh_generate_key(gnutls_ecc_curve_t curve, |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
276 |
gnutls_datum_t *x, gnutls_datum_t *y, |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
277 |
gnutls_datum_t *k); |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
278 |
+#endif |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
279 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
280 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
281 |
int _gnutls_dh_generate_key(gnutls_dh_params_t dh_params, |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
282 |
@@ -988,6 +1008,7 @@ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
283 |
return ret; |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
284 |
} |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
285 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
286 |
+#if defined(ENABLE_ECDHE) |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
287 |
int _gnutls_ecdh_generate_key(gnutls_ecc_curve_t curve, |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
288 |
gnutls_datum_t *x, gnutls_datum_t *y, |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
289 |
gnutls_datum_t *k) |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
290 |
@@ -1116,6 +1137,7 @@ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
291 |
gnutls_pk_params_clear(&priv); |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
292 |
return ret; |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
293 |
} |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
294 |
+#endif /*ENABLE_ECDHE*/ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
295 |
#endif |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
296 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
297 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
298 |
@@ -1308,6 +1330,7 @@ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
299 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
300 |
break; |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
301 |
} |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
302 |
+#if defined(ENABLE_ECDHE) |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
303 |
case GNUTLS_PK_EC: |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
304 |
{ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
305 |
struct ecc_scalar key; |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
306 |
@@ -1350,6 +1373,7 @@ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
307 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
308 |
break; |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
309 |
} |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
310 |
+#endif |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
311 |
default: |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
312 |
gnutls_assert(); |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
313 |
return GNUTLS_E_INVALID_REQUEST; |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
314 |
@@ -1494,6 +1518,7 @@ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
315 |
} |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
316 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
317 |
break; |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
318 |
+#if defined(ENABLE_ECDHE) |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
319 |
case GNUTLS_PK_EC: |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
320 |
{ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
321 |
struct ecc_point r, pub; |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
322 |
@@ -1567,6 +1592,7 @@ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
323 |
mpz_clear(y2); |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
324 |
} |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
325 |
break; |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
326 |
+#endif |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
327 |
default: |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
328 |
ret = gnutls_assert_val(GNUTLS_E_INVALID_REQUEST); |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
329 |
} |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
330 |
@@ -1584,6 +1610,7 @@ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
331 |
case GNUTLS_PK_RSA: |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
332 |
case GNUTLS_PK_DSA: |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
333 |
return 0; |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
334 |
+#if defined(ENABLE_ECDHE) |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
335 |
case GNUTLS_PK_EC: |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
336 |
{ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
337 |
/* just verify that x and y lie on the curve */ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
338 |
@@ -1624,6 +1651,7 @@ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
339 |
ecc_point_clear(&pub); |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
340 |
} |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
341 |
break; |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
342 |
+#endif |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
343 |
default: |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
344 |
ret = gnutls_assert_val(GNUTLS_E_INVALID_REQUEST); |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
345 |
} |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
346 |
@@ -1725,5 +1753,7 @@ |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
347 |
.generate_keys = wrap_nettle_pk_generate_keys, |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
348 |
.pk_fixup_private_params = wrap_nettle_pk_fixup, |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
349 |
.derive = _wrap_nettle_pk_derive, |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
350 |
+#if defined(ENABLE_ECDHE) |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
351 |
.curve_exists = _wrap_nettle_pk_curve_exists, |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
352 |
+#endif |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
353 |
}; |