| author | Alan Coopersmith <Alan.Coopersmith@Oracle.COM> |
| Fri, 14 Oct 2016 14:53:30 -0700 | |
| changeset 7114 | 72d09e38c454 |
| parent 5143 | 9b4a483bf8d9 |
| permissions | -rw-r--r-- |
|
5143
9b4a483bf8d9
22242767 Upgrade GnuTLS to 3.4.6
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
1 |
Source: Internal |
|
9b4a483bf8d9
22242767 Upgrade GnuTLS to 3.4.6
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
2 |
|
|
9b4a483bf8d9
22242767 Upgrade GnuTLS to 3.4.6
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
3 |
Info: This patch fixes the issue of pkcs11_common(NULL) being called |
|
9b4a483bf8d9
22242767 Upgrade GnuTLS to 3.4.6
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
4 |
when PKCS11 is not enabled. |
|
9b4a483bf8d9
22242767 Upgrade GnuTLS to 3.4.6
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
5 |
|
|
9b4a483bf8d9
22242767 Upgrade GnuTLS to 3.4.6
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
6 |
Status: This patch has been submitted to upstream, not yet accepted. |
|
9b4a483bf8d9
22242767 Upgrade GnuTLS to 3.4.6
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
7 |
|
|
9b4a483bf8d9
22242767 Upgrade GnuTLS to 3.4.6
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
8 |
--- gnutls-3.4.6/src/tpmtool.c Tue Jul 21 02:42:08 2015 |
|
9b4a483bf8d9
22242767 Upgrade GnuTLS to 3.4.6
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
9 |
+++ gnutls-3.4.6/src/tpmtool.c Thu Nov 19 13:43:02 2015 |
|
9b4a483bf8d9
22242767 Upgrade GnuTLS to 3.4.6
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
10 |
@@ -184,7 +184,9 @@ |
|
9b4a483bf8d9
22242767 Upgrade GnuTLS to 3.4.6
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
11 |
gnutls_datum_t data, sig = {NULL, 0};
|
|
9b4a483bf8d9
22242767 Upgrade GnuTLS to 3.4.6
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
12 |
int pk; |
|
9b4a483bf8d9
22242767 Upgrade GnuTLS to 3.4.6
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
13 |
|
|
9b4a483bf8d9
22242767 Upgrade GnuTLS to 3.4.6
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
14 |
+#ifdef ENABLE_PKCS11 |
|
9b4a483bf8d9
22242767 Upgrade GnuTLS to 3.4.6
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
15 |
pkcs11_common(NULL); |
|
9b4a483bf8d9
22242767 Upgrade GnuTLS to 3.4.6
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
16 |
+#endif |
|
9b4a483bf8d9
22242767 Upgrade GnuTLS to 3.4.6
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
17 |
|
|
9b4a483bf8d9
22242767 Upgrade GnuTLS to 3.4.6
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
18 |
data.data = (void*)TEST_DATA; |
|
9b4a483bf8d9
22242767 Upgrade GnuTLS to 3.4.6
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
19 |
data.size = sizeof(TEST_DATA)-1; |