pool/gnutls
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 205686 from Base:System

Browse Source 
Upgrade to 3.2.6 (forwarded request 205591 from shawn2012)

OBS-URL: https://build.opensuse.org/request/show/205686
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnutls?expand=0&rev=67
This commit is contained in:
Stephan Kulow 2013-11-04 13:58:23 +00:00 committed by Git OBS Bridge
parent ee8692fe69
commit fbbe0b4946
8 changed files with 156 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnutls-3.2.5.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c6fbcdcd32b2f38cca3bbfa10759556d66f4795ac6e6e50503f2ee5c08c081b7
size 4987156

BIN
gnutls-3.2.5.tar.xz.sig
View File

Binary file not shown.

222
gnutls-3.2.5-noecc.patch → gnutls-3.2.6-noecc.patch
View File

@ -1,7 +1,7 @@
Index: gnutls-3.2.5/lib/algorithms/publickey.c
Index: gnutls-3.2.6/lib/algorithms/publickey.c
===================================================================
--- gnutls-3.2.5.orig/lib/algorithms/publickey.c
+++ gnutls-3.2.5/lib/algorithms/publickey.c
--- gnutls-3.2.6.orig/lib/algorithms/publickey.c
+++ gnutls-3.2.6/lib/algorithms/publickey.c
@@ -49,8 +49,10 @@ static const gnutls_pk_map pk_mappings[]
{GNUTLS_KX_RSA, GNUTLS_PK_RSA, CIPHER_ENCRYPT},
{GNUTLS_KX_DHE_RSA, GNUTLS_PK_RSA, CIPHER_SIGN},
@ -13,7 +13,7 @@ Index: gnutls-3.2.5/lib/algorithms/publickey.c
{GNUTLS_KX_DHE_DSS, GNUTLS_PK_DSA, CIPHER_SIGN},
{GNUTLS_KX_SRP_DSS, GNUTLS_PK_DSA, CIPHER_SIGN},
{GNUTLS_KX_RSA_PSK, GNUTLS_PK_RSA, CIPHER_ENCRYPT},
@@ -97,7 +99,9 @@ static const gnutls_pk_entry pk_algorith
@@ -98,7 +100,9 @@ static const gnutls_pk_entry pk_algorith
{"DSA", PK_DSA_OID, GNUTLS_PK_DSA},
{"GOST R 34.10-2001", PK_GOST_R3410_2001_OID, GNUTLS_PK_UNKNOWN},
{"GOST R 34.10-94", PK_GOST_R3410_94_OID, GNUTLS_PK_UNKNOWN},
@ -23,10 +23,10 @@ Index: gnutls-3.2.5/lib/algorithms/publickey.c
{0, 0, 0}
};
Index: gnutls-3.2.5/lib/auth/cert.c
Index: gnutls-3.2.6/lib/auth/cert.c
===================================================================
--- gnutls-3.2.5.orig/lib/auth/cert.c
+++ gnutls-3.2.5/lib/auth/cert.c
--- gnutls-3.2.6.orig/lib/auth/cert.c
+++ gnutls-3.2.6/lib/auth/cert.c
@@ -63,7 +63,11 @@ static gnutls_privkey_t alloc_and_load_p
key, int deinit);
#endif
@ -60,10 +60,10 @@ Index: gnutls-3.2.5/lib/auth/cert.c
ret = _gnutls_buffer_append_data (data, tmp_data, CERTTYPE_SIZE);
if (ret < 0)
Index: gnutls-3.2.5/lib/auth/dhe_psk.c
Index: gnutls-3.2.6/lib/auth/dhe_psk.c
===================================================================
--- gnutls-3.2.5.orig/lib/auth/dhe_psk.c
+++ gnutls-3.2.5/lib/auth/dhe_psk.c
--- gnutls-3.2.6.orig/lib/auth/dhe_psk.c
+++ gnutls-3.2.6/lib/auth/dhe_psk.c
@@ -92,6 +92,7 @@ const mod_auth_st ecdhe_psk_auth_struct
};
#endif
@ -128,10 +128,10 @@ Index: gnutls-3.2.5/lib/auth/dhe_psk.c
+#endif
#endif /* ENABLE_PSK */
Index: gnutls-3.2.5/lib/ext/ecc.c
Index: gnutls-3.2.6/lib/ext/ecc.c
===================================================================
--- gnutls-3.2.5.orig/lib/ext/ecc.c
+++ gnutls-3.2.5/lib/ext/ecc.c
--- gnutls-3.2.6.orig/lib/ext/ecc.c
+++ gnutls-3.2.6/lib/ext/ecc.c
@@ -35,7 +35,7 @@
/* Maps record size to numbers according to the
* extensions draft.
@ -146,10 +146,10 @@ Index: gnutls-3.2.5/lib/ext/ecc.c
return GNUTLS_E_ECC_UNSUPPORTED_CURVE;
}
+#endif
Index: gnutls-3.2.5/lib/gnutls_extensions.c
Index: gnutls-3.2.6/lib/gnutls_extensions.c
===================================================================
--- gnutls-3.2.5.orig/lib/gnutls_extensions.c
+++ gnutls-3.2.5/lib/gnutls_extensions.c
--- gnutls-3.2.6.orig/lib/gnutls_extensions.c
+++ gnutls-3.2.6/lib/gnutls_extensions.c
@@ -351,6 +351,7 @@ _gnutls_ext_init (void)
if (ret != GNUTLS_E_SUCCESS)
return ret;
@ -166,10 +166,10 @@ Index: gnutls-3.2.5/lib/gnutls_extensions.c
ret = _gnutls_ext_register (&ext_mod_sig);
if (ret != GNUTLS_E_SUCCESS)
Index: gnutls-3.2.5/lib/gnutls_priority.c
Index: gnutls-3.2.6/lib/gnutls_priority.c
===================================================================
--- gnutls-3.2.5.orig/lib/gnutls_priority.c
+++ gnutls-3.2.5/lib/gnutls_priority.c
--- gnutls-3.2.6.orig/lib/gnutls_priority.c
+++ gnutls-3.2.6/lib/gnutls_priority.c
@@ -245,35 +245,45 @@ gnutls_certificate_type_set_priority (gn
}
@ -216,7 +216,7 @@ Index: gnutls-3.2.5/lib/gnutls_priority.c
0
};
@@ -416,51 +426,74 @@ static const int comp_priority[] = {
@@ -423,51 +433,74 @@ static const int comp_priority[] = {
static const int sign_priority_default[] = {
GNUTLS_SIGN_RSA_SHA256,
GNUTLS_SIGN_DSA_SHA256,
@ -292,10 +292,10 @@ Index: gnutls-3.2.5/lib/gnutls_priority.c
0
};
Index: gnutls-3.2.5/lib/nettle/pk.c
Index: gnutls-3.2.6/lib/nettle/pk.c
===================================================================
--- gnutls-3.2.5.orig/lib/nettle/pk.c
+++ gnutls-3.2.5/lib/nettle/pk.c
--- gnutls-3.2.6.orig/lib/nettle/pk.c
+++ gnutls-3.2.6/lib/nettle/pk.c
@@ -146,6 +146,7 @@ static int _wrap_nettle_pk_derive(gnutls
switch (algo)
@ -376,10 +376,10 @@ Index: gnutls-3.2.5/lib/nettle/pk.c
default:
ret = gnutls_assert_val(GNUTLS_E_INVALID_REQUEST);
}
Index: gnutls-3.2.5/tests/cert-tests/dane
Index: gnutls-3.2.6/tests/cert-tests/dane
===================================================================
--- gnutls-3.2.5.orig/tests/cert-tests/dane
+++ gnutls-3.2.5/tests/cert-tests/dane
--- gnutls-3.2.6.orig/tests/cert-tests/dane
+++ gnutls-3.2.6/tests/cert-tests/dane
@@ -22,6 +22,8 @@
set -e
@ -388,11 +388,11 @@ Index: gnutls-3.2.5/tests/cert-tests/dane
+
srcdir=${srcdir:-.}
DANETOOL=${DANETOOL:-../../src/danetool$EXEEXT}
Index: gnutls-3.2.5/tests/dtls/dtls-nb
DIFF=${DIFF:-diff}
Index: gnutls-3.2.6/tests/dtls/dtls-nb
===================================================================
--- gnutls-3.2.5.orig/tests/dtls/dtls-nb
+++ gnutls-3.2.5/tests/dtls/dtls-nb
--- gnutls-3.2.6.orig/tests/dtls/dtls-nb
+++ gnutls-3.2.6/tests/dtls/dtls-nb
@@ -22,9 +22,7 @@
set -e
@ -404,10 +404,10 @@ Index: gnutls-3.2.5/tests/dtls/dtls-nb
./dtls-stress -nb -shello 021 -sfinished 01 -cfinished 012 SKeyExchange CKeyExchange CFinished
./dtls-stress -nb -shello 012 -sfinished 10 -cfinished 210 SHello SKeyExchange SHelloDone
Index: gnutls-3.2.5/tests/dtls/dtls
Index: gnutls-3.2.6/tests/dtls/dtls
===================================================================
--- gnutls-3.2.5.orig/tests/dtls/dtls
+++ gnutls-3.2.5/tests/dtls/dtls
--- gnutls-3.2.6.orig/tests/dtls/dtls
+++ gnutls-3.2.6/tests/dtls/dtls
@@ -22,9 +22,7 @@
set -e
@ -419,10 +419,10 @@ Index: gnutls-3.2.5/tests/dtls/dtls
./dtls-stress -shello 021 -sfinished 01 -cfinished 012 SKeyExchange CKeyExchange CFinished
./dtls-stress -shello 012 -sfinished 10 -cfinished 210 SHello SKeyExchange SHelloDone
Index: gnutls-3.2.5/tests/ecdsa/ecdsa
Index: gnutls-3.2.6/tests/ecdsa/ecdsa
===================================================================
--- gnutls-3.2.5.orig/tests/ecdsa/ecdsa
+++ gnutls-3.2.5/tests/ecdsa/ecdsa
--- gnutls-3.2.6.orig/tests/ecdsa/ecdsa
+++ gnutls-3.2.6/tests/ecdsa/ecdsa
@@ -22,6 +22,8 @@
#set -e
@ -432,10 +432,10 @@ Index: gnutls-3.2.5/tests/ecdsa/ecdsa
srcdir=${srcdir:-.}
CERTTOOL=${CERTTOOL:-../../src/certtool$EXEEXT}
Index: gnutls-3.2.5/tests/mini-dtls-heartbeat.c
Index: gnutls-3.2.6/tests/mini-dtls-heartbeat.c
===================================================================
--- gnutls-3.2.5.orig/tests/mini-dtls-heartbeat.c
+++ gnutls-3.2.5/tests/mini-dtls-heartbeat.c
--- gnutls-3.2.6.orig/tests/mini-dtls-heartbeat.c
+++ gnutls-3.2.6/tests/mini-dtls-heartbeat.c
@@ -27,7 +27,7 @@
#include <stdio.h>
#include <stdlib.h>
@ -445,10 +445,10 @@ Index: gnutls-3.2.5/tests/mini-dtls-heartbeat.c
int
main ()
Index: gnutls-3.2.5/tests/mini-dtls-record.c
Index: gnutls-3.2.6/tests/mini-dtls-record.c
===================================================================
--- gnutls-3.2.5.orig/tests/mini-dtls-record.c
+++ gnutls-3.2.5/tests/mini-dtls-record.c
--- gnutls-3.2.6.orig/tests/mini-dtls-record.c
+++ gnutls-3.2.6/tests/mini-dtls-record.c
@@ -29,7 +29,7 @@
#include <stdio.h>
#include <stdlib.h>
@ -458,10 +458,10 @@ Index: gnutls-3.2.5/tests/mini-dtls-record.c
int
main ()
Index: gnutls-3.2.5/tests/mini-dtls-rehandshake.c
Index: gnutls-3.2.6/tests/mini-dtls-rehandshake.c
===================================================================
--- gnutls-3.2.5.orig/tests/mini-dtls-rehandshake.c
+++ gnutls-3.2.5/tests/mini-dtls-rehandshake.c
--- gnutls-3.2.6.orig/tests/mini-dtls-rehandshake.c
+++ gnutls-3.2.6/tests/mini-dtls-rehandshake.c
@@ -27,7 +27,7 @@
#include <stdio.h>
#include <stdlib.h>
@ -471,10 +471,10 @@ Index: gnutls-3.2.5/tests/mini-dtls-rehandshake.c
int main()
{
Index: gnutls-3.2.5/tests/mini-dtls-srtp.c
Index: gnutls-3.2.6/tests/mini-dtls-srtp.c
===================================================================
--- gnutls-3.2.5.orig/tests/mini-dtls-srtp.c
+++ gnutls-3.2.5/tests/mini-dtls-srtp.c
--- gnutls-3.2.6.orig/tests/mini-dtls-srtp.c
+++ gnutls-3.2.6/tests/mini-dtls-srtp.c
@@ -27,7 +27,7 @@
#include <stdio.h>
#include <stdlib.h>
@ -484,10 +484,10 @@ Index: gnutls-3.2.5/tests/mini-dtls-srtp.c
int
main (int argc, char** argv)
Index: gnutls-3.2.5/tests/mini-handshake-timeout.c
Index: gnutls-3.2.6/tests/mini-handshake-timeout.c
===================================================================
--- gnutls-3.2.5.orig/tests/mini-handshake-timeout.c
+++ gnutls-3.2.5/tests/mini-handshake-timeout.c
--- gnutls-3.2.6.orig/tests/mini-handshake-timeout.c
+++ gnutls-3.2.6/tests/mini-handshake-timeout.c
@@ -28,7 +28,7 @@
#include <stdlib.h>
#include <string.h>
@ -497,7 +497,7 @@ Index: gnutls-3.2.5/tests/mini-handshake-timeout.c
int main()
{
@@ -142,7 +142,11 @@ initialize_tls_session (gnutls_session_t
@@ -144,7 +144,11 @@ initialize_tls_session (gnutls_session_t
/* avoid calling all the priority functions, since the defaults
* are adequate.
*/
@ -510,10 +510,10 @@ Index: gnutls-3.2.5/tests/mini-handshake-timeout.c
}
static void
Index: gnutls-3.2.5/tests/mini-loss-time.c
Index: gnutls-3.2.6/tests/mini-loss-time.c
===================================================================
--- gnutls-3.2.5.orig/tests/mini-loss-time.c
+++ gnutls-3.2.5/tests/mini-loss-time.c
--- gnutls-3.2.6.orig/tests/mini-loss-time.c
+++ gnutls-3.2.6/tests/mini-loss-time.c
@@ -28,7 +28,7 @@
#include <stdlib.h>
#include <string.h>
@ -523,10 +523,10 @@ Index: gnutls-3.2.5/tests/mini-loss-time.c
int main()
{
Index: gnutls-3.2.5/tests/mini-record.c
Index: gnutls-3.2.6/tests/mini-record.c
===================================================================
--- gnutls-3.2.5.orig/tests/mini-record.c
+++ gnutls-3.2.5/tests/mini-record.c
--- gnutls-3.2.6.orig/tests/mini-record.c
+++ gnutls-3.2.6/tests/mini-record.c
@@ -27,7 +27,7 @@
#include <stdio.h>
#include <stdlib.h>
@ -536,10 +536,10 @@ Index: gnutls-3.2.5/tests/mini-record.c
int main()
{
Index: gnutls-3.2.5/tests/mini-record-range.c
Index: gnutls-3.2.6/tests/mini-record-range.c
===================================================================
--- gnutls-3.2.5.orig/tests/mini-record-range.c
+++ gnutls-3.2.5/tests/mini-record-range.c
--- gnutls-3.2.6.orig/tests/mini-record-range.c
+++ gnutls-3.2.6/tests/mini-record-range.c
@@ -27,7 +27,7 @@
#include <stdio.h>
#include <stdlib.h>
@ -549,10 +549,10 @@ Index: gnutls-3.2.5/tests/mini-record-range.c
int main()
{
Index: gnutls-3.2.5/tests/mini-xssl.c
Index: gnutls-3.2.6/tests/mini-xssl.c
===================================================================
--- gnutls-3.2.5.orig/tests/mini-xssl.c
+++ gnutls-3.2.5/tests/mini-xssl.c
--- gnutls-3.2.6.orig/tests/mini-xssl.c
+++ gnutls-3.2.6/tests/mini-xssl.c
@@ -27,7 +27,7 @@
#include <stdio.h>
#include <stdlib.h>
@ -562,10 +562,10 @@ Index: gnutls-3.2.5/tests/mini-xssl.c
int main()
{
Index: gnutls-3.2.5/tests/pkcs12_simple.c
Index: gnutls-3.2.6/tests/pkcs12_simple.c
===================================================================
--- gnutls-3.2.5.orig/tests/pkcs12_simple.c
+++ gnutls-3.2.5/tests/pkcs12_simple.c
--- gnutls-3.2.6.orig/tests/pkcs12_simple.c
+++ gnutls-3.2.6/tests/pkcs12_simple.c
@@ -50,6 +50,10 @@ doit (void)
gnutls_x509_privkey_t pkey;
int ret;
@ -577,10 +577,10 @@ Index: gnutls-3.2.5/tests/pkcs12_simple.c
ret = global_init ();
if (ret < 0)
fail ("global_init failed %d\n", ret);
Index: gnutls-3.2.5/tests/slow/keygen.c
Index: gnutls-3.2.6/tests/slow/keygen.c
===================================================================
--- gnutls-3.2.5.orig/tests/slow/keygen.c
+++ gnutls-3.2.5/tests/slow/keygen.c
--- gnutls-3.2.6.orig/tests/slow/keygen.c
+++ gnutls-3.2.6/tests/slow/keygen.c
@@ -65,6 +65,11 @@ doit (void)
if (algorithm == GNUTLS_PK_DH)
continue;
@ -593,10 +593,10 @@ Index: gnutls-3.2.5/tests/slow/keygen.c
ret = gnutls_x509_privkey_init (&pkey);
if (ret < 0)
{
Index: gnutls-3.2.5/tests/srp/mini-srp.c
Index: gnutls-3.2.6/tests/srp/mini-srp.c
===================================================================
--- gnutls-3.2.5.orig/tests/srp/mini-srp.c
+++ gnutls-3.2.5/tests/srp/mini-srp.c
--- gnutls-3.2.6.orig/tests/srp/mini-srp.c
+++ gnutls-3.2.6/tests/srp/mini-srp.c
@@ -27,7 +27,7 @@
#include <stdio.h>
#include <stdlib.h>
@ -606,10 +606,10 @@ Index: gnutls-3.2.5/tests/srp/mini-srp.c
int main()
{
Index: gnutls-3.2.5/lib/auth/ecdhe.c
Index: gnutls-3.2.6/lib/auth/ecdhe.c
===================================================================
--- gnutls-3.2.5.orig/lib/auth/ecdhe.c
+++ gnutls-3.2.5/lib/auth/ecdhe.c
--- gnutls-3.2.6.orig/lib/auth/ecdhe.c
+++ gnutls-3.2.6/lib/auth/ecdhe.c
@@ -50,7 +50,7 @@ static int
proc_ecdhe_client_kx (gnutls_session_t session,
uint8_t * data, size_t _data_size);
@ -619,10 +619,10 @@ Index: gnutls-3.2.5/lib/auth/ecdhe.c
const mod_auth_st ecdhe_ecdsa_auth_struct = {
"ECDHE_ECDSA",
_gnutls_gen_cert_server_crt,
Index: gnutls-3.2.5/tests/mini-dtls-hello-verify.c
Index: gnutls-3.2.6/tests/mini-dtls-hello-verify.c
===================================================================
--- gnutls-3.2.5.orig/tests/mini-dtls-hello-verify.c
+++ gnutls-3.2.5/tests/mini-dtls-hello-verify.c
--- gnutls-3.2.6.orig/tests/mini-dtls-hello-verify.c
+++ gnutls-3.2.6/tests/mini-dtls-hello-verify.c
@@ -27,7 +27,7 @@
#include <stdio.h>
#include <stdlib.h>
@ -632,10 +632,10 @@ Index: gnutls-3.2.5/tests/mini-dtls-hello-verify.c
int main()
{
Index: gnutls-3.2.5/tests/mini-alpn.c
Index: gnutls-3.2.6/tests/mini-alpn.c
===================================================================
--- gnutls-3.2.5.orig/tests/mini-alpn.c
+++ gnutls-3.2.5/tests/mini-alpn.c
--- gnutls-3.2.6.orig/tests/mini-alpn.c
+++ gnutls-3.2.6/tests/mini-alpn.c
@@ -25,7 +25,7 @@
#include <stdio.h>
#include <stdlib.h>
@ -645,10 +645,10 @@ Index: gnutls-3.2.5/tests/mini-alpn.c
int
main (int argc, char** argv)
Index: gnutls-3.2.5/tests/mini-dtls-large.c
Index: gnutls-3.2.6/tests/mini-dtls-large.c
===================================================================
--- gnutls-3.2.5.orig/tests/mini-dtls-large.c
+++ gnutls-3.2.5/tests/mini-dtls-large.c
--- gnutls-3.2.6.orig/tests/mini-dtls-large.c
+++ gnutls-3.2.6/tests/mini-dtls-large.c
@@ -25,7 +25,7 @@
#include <stdio.h>
#include <stdlib.h>
@ -670,10 +670,10 @@ Index: gnutls-3.2.5/tests/mini-dtls-large.c
NULL);
gnutls_credentials_set (session, GNUTLS_CRD_ANON, anoncred);
Index: gnutls-3.2.5/tests/mini-x509-callbacks.c
Index: gnutls-3.2.6/tests/mini-x509-callbacks.c
===================================================================
--- gnutls-3.2.5.orig/tests/mini-x509-callbacks.c
+++ gnutls-3.2.5/tests/mini-x509-callbacks.c
--- gnutls-3.2.6.orig/tests/mini-x509-callbacks.c
+++ gnutls-3.2.6/tests/mini-x509-callbacks.c
@@ -58,8 +58,13 @@ unsigned int msg_order[] = {
GNUTLS_HANDSHAKE_CLIENT_HELLO,
GNUTLS_HANDSHAKE_SERVER_HELLO,
@ -688,10 +688,10 @@ Index: gnutls-3.2.5/tests/mini-x509-callbacks.c
GNUTLS_HANDSHAKE_SERVER_HELLO_DONE,
GNUTLS_HANDSHAKE_CERTIFICATE_PKT,
GNUTLS_HANDSHAKE_CLIENT_KEY_EXCHANGE,
Index: gnutls-3.2.5/lib/algorithms/kx.c
Index: gnutls-3.2.6/lib/algorithms/kx.c
===================================================================
--- gnutls-3.2.5.orig/lib/algorithms/kx.c
+++ gnutls-3.2.5/lib/algorithms/kx.c
--- gnutls-3.2.6.orig/lib/algorithms/kx.c
+++ gnutls-3.2.6/lib/algorithms/kx.c
@@ -28,9 +28,11 @@
extern mod_auth_st rsa_auth_struct;
@ -741,10 +741,10 @@ Index: gnutls-3.2.5/lib/algorithms/kx.c
{"ECDHE-PSK", GNUTLS_KX_ECDHE_PSK, &ecdhe_psk_auth_struct, 0},
# endif
#endif
Index: gnutls-3.2.5/tests/priorities.c
Index: gnutls-3.2.6/tests/priorities.c
===================================================================
--- gnutls-3.2.5.orig/tests/priorities.c
+++ gnutls-3.2.5/tests/priorities.c
--- gnutls-3.2.6.orig/tests/priorities.c
+++ gnutls-3.2.6/tests/priorities.c
@@ -73,7 +73,7 @@ unsigned i, si, count = 0;
for (i=0;i<ret;i++)
fprintf(stderr, "%s\n", gnutls_cipher_get_name(t[i]));
@ -768,43 +768,43 @@ Index: gnutls-3.2.5/tests/priorities.c
doit (void)
{
+#ifdef ENABLE_ECC
const int normal = 55;
const int normal = 66;
const int null = 5;
const int sec128 = 45;
const int sec128 = 56;
+#else
+ const int normal = 36;
+ const int normal = 42;
+ const int null = 3;
+ const int sec128 = 30;
+ const int sec128 = 36;
+#endif
try_prio("NORMAL", normal, 8);
try_prio("NORMAL:-MAC-ALL:+MD5:+MAC-ALL", normal, 8);
try_prio("NORMAL:+CIPHER-ALL", normal, 8); /* all (except null) */
try_prio("NORMAL", normal, 10);
try_prio("NORMAL:-MAC-ALL:+MD5:+MAC-ALL", normal, 10);
try_prio("NORMAL:+CIPHER-ALL", normal, 10); /* all (except null) */
try_prio("NORMAL:-CIPHER-ALL:+NULL", null, 1); /* null */
try_prio("NORMAL:-CIPHER-ALL:+NULL:+CIPHER-ALL", normal+null, 9); /* should be null + all */
try_prio("NORMAL:-CIPHER-ALL:+NULL:+CIPHER-ALL", normal+null, 11); /* should be null + all */
+#ifdef ENABLE_ECC
try_prio("NORMAL:-CIPHER-ALL:+NULL:+CIPHER-ALL:-CIPHER-ALL:+AES-128-CBC", 10, 1); /* should be null + all */
+#else
+ try_prio("NORMAL:-CIPHER-ALL:+NULL:+CIPHER-ALL:-CIPHER-ALL:+AES-128-CBC", 6, 1); /* should be null + all */
+#endif
try_prio("PERFORMANCE", normal, 8);
try_prio("PERFORMANCE", normal, 10);
+#ifdef ENABLE_ECC
try_prio("SECURE256", 14, 3);
try_prio("SECURE256", 20, 4);
+#else
+ try_prio("SECURE256", 9, 3);
+ try_prio("SECURE256", 12, 4);
+#endif
try_prio("SECURE128", sec128, 6);
try_prio("SECURE128:+SECURE256", sec128, 6); /* should be the same as SECURE128 */
try_prio("SECURE128:+SECURE256:+NORMAL", normal, 8); /* should be the same as NORMAL */
try_prio("SECURE128", sec128, 8);
try_prio("SECURE128:+SECURE256", sec128, 8); /* should be the same as SECURE128 */
try_prio("SECURE128:+SECURE256:+NORMAL", normal, 10); /* should be the same as NORMAL */
+#ifdef ENABLE_ECC
try_prio("SUITEB192", 1, 1);
+#endif
}
Index: gnutls-3.2.5/tests/mini-record-2.c
Index: gnutls-3.2.6/tests/mini-record-2.c
===================================================================
--- gnutls-3.2.5.orig/tests/mini-record-2.c
+++ gnutls-3.2.5/tests/mini-record-2.c
--- gnutls-3.2.6.orig/tests/mini-record-2.c
+++ gnutls-3.2.6/tests/mini-record-2.c
@@ -359,19 +359,19 @@ static void start (const char* prio, int
}
}

3
gnutls-3.2.6.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0a45dfa50edc8091ca1c25f7bae9d9c780b8a09c58ceb3e256264d2dc49338f4
size 4992204

BIN
gnutls-3.2.6.tar.xz.sig Normal file
View File

Binary file not shown.

40
gnutls.changes
View File

@ -1,3 +1,43 @@
-------------------------------------------------------------------
Fri Nov 1 14:39:41 UTC 2013 - shchang@suse.com
- Upgrade to 3.2.6
** libgnutls: Support for TPM via trousers is now enabled by default.
** libgnutls: Camellia in GCM mode has been added in default priorities,
and GCM mode is prioritized over CBC in all of the default priority strings.
** libgnutls: Added ciphersuite GNUTLS_ECDHE_RSA_AES_256_CBC_SHA384.
** libgnutls: Fixed ciphersuites
GNUTLS_ECDHE_ECDSA_CAMELLIA_256_CBC_SHA384,
GNUTLS_ECDHE_RSA_CAMELLIA_256_CBC_SHA384 and
GNUTLS_PSK_CAMELLIA_128_GCM_SHA256. Reported by Stefan Buehler.
** libgnutls: Added support for ISO OID for RSA-SHA1 signatures.
** libgnutls: Minimum acceptable DH group parameters were increased to
767 bits from 727.
** libgnutls: Added function to obtain random data from PKCS #11 tokens.
Contributed by Wolfgang Meyer zu Bergsten.
** gnulib: updated.
** libdane: Fixed a one-off bug in dane_query_tlsa() introduced by the
previous fix. Reported by Tomas Mraz.
** p11tool: Added option generate-random.
** API and ABI modifications:
gnutls_pkcs11_token_get_random: Added
Add: gnutls-3.2.6-noecc.patch, gnutls-3.2.6.tar.xz, gnutls-3.2.6.tar.xz.sig
Delete: gnutls-3.2.6-noecc.patch, gnutls-3.2.5.tar.xz, gnutls-3.2.5.tar.xz.sig,
make-obs-happy-with-gnutls_3.2.5.patch
-------------------------------------------------------------------
Mon Oct 28 20:36:13 UTC 2013 - shchang@suse.com

6
gnutls.spec
View File

@ -21,7 +21,7 @@
%define gnutls_ossl_sover 27
Name: gnutls
Version: 3.2.5
Version: 3.2.6
Release: 0
Summary: The GNU Transport Layer Security Library
License: LGPL-2.1+ and GPL-3.0+
@ -37,9 +37,8 @@ Source3: baselibs.conf
Patch3: gnutls-3.0.26-skip-test-fwrite.patch
# Disable elliptic curves for reasons. - meissner&cfarrell
Patch5: gnutls-3.2.5-noecc.patch
Patch5: gnutls-3.2.6-noecc.patch
Patch6: gnutls-implement-trust-store-dir.diff
Patch7: make-obs-happy-with-gnutls_3.2.5.patch
BuildRequires: automake
BuildRequires: gcc-c++
@ -141,7 +140,6 @@ Files needed for software development using gnutls.
%patch3
%patch5 -p1
%patch6 -p1
%patch7 -p1
%build
autoreconf -if

34
make-obs-happy-with-gnutls_3.2.5.patch
View File

@ -1,34 +0,0 @@
Index: gnutls-3.2.5/doc/examples/ex-client-xssl1.c
===================================================================
--- gnutls-3.2.5.orig/doc/examples/ex-client-xssl1.c
+++ gnutls-3.2.5/doc/examples/ex-client-xssl1.c
@@ -80,6 +80,8 @@ int main (void)
xssl_cred_deinit (cred);
gnutls_global_deinit ();
+
+ return 0;
}
Index: gnutls-3.2.5/doc/examples/ex-client-xssl2.c
===================================================================
--- gnutls-3.2.5.orig/doc/examples/ex-client-xssl2.c
+++ gnutls-3.2.5/doc/examples/ex-client-xssl2.c
@@ -95,4 +95,6 @@ int main (void)
xssl_cred_deinit (cred);
gnutls_global_deinit ();
+
+ return 0;
}
Index: gnutls-3.2.5/doc/examples/print-ciphersuites.c
===================================================================
--- gnutls-3.2.5.orig/doc/examples/print-ciphersuites.c
+++ gnutls-3.2.5/doc/examples/print-ciphersuites.c
@@ -51,4 +51,5 @@ int main(int argc, char** argv)
{
if (argc > 1)
print_cipher_suite_list (argv[1]);
+ return 0;
}