[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gnutls branch, master, updated. gnutls_3_0_3-77-gbcf7a86
|
From: |
Nikos Mavrogiannopoulos |
|
Subject: |
[SCM] GNU gnutls branch, master, updated. gnutls_3_0_3-77-gbcf7a86 |
|
Date: |
Mon, 10 Oct 2011 06:35:36 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".
http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=bcf7a8605cef027c9be23d63f455ba429eec90ca
The branch, master has been updated
via bcf7a8605cef027c9be23d63f455ba429eec90ca (commit)
via 8f13c0dfd9c6d9b14b0566bf3f959f069dc972fd (commit)
via 2e83418372099b93324b845c3f655140a6965c98 (commit)
from 643ebdf12b415fc3edd3b7bc12654bc92d3aed24 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit bcf7a8605cef027c9be23d63f455ba429eec90ca
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sun Oct 9 06:56:06 2011 +0200
updated Andy's code. padlock_shax_blocks does not require any more, the
state to be of 128-byte size.
commit 8f13c0dfd9c6d9b14b0566bf3f959f069dc972fd
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sat Oct 8 15:01:26 2011 +0200
Corrected check for AES-GCM
commit 2e83418372099b93324b845c3f655140a6965c98
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sat Oct 8 14:41:40 2011 +0200
test for camellia
-----------------------------------------------------------------------
Summary of changes:
lib/accelerated/x86/asm/padlock-x86-64.s | 80 ++++++++++++++++++++++++++--
lib/accelerated/x86/asm/padlock-x86.s | 85 ++++++++++++++++++++++++++++-
src/tests.c | 20 ++-----
src/tests.h | 2 -
src/tls_test.c | 2 -
5 files changed, 163 insertions(+), 26 deletions(-)
diff --git a/lib/accelerated/x86/asm/padlock-x86-64.s
b/lib/accelerated/x86/asm/padlock-x86-64.s
index e18f7a5..c15da11 100644
--- a/lib/accelerated/x86/asm/padlock-x86-64.s
+++ b/lib/accelerated/x86/asm/padlock-x86-64.s
@@ -143,9 +143,21 @@ padlock_xstore:
.type padlock_sha1_oneshot,@function
.align 16
padlock_sha1_oneshot:
- xorq %rax,%rax
movq %rdx,%rcx
+ movq %rdi,%rdx
+ movups (%rdi),%xmm0
+ subq $128+8,%rsp
+ movl 16(%rdi),%eax
+ movaps %xmm0,(%rsp)
+ movq %rsp,%rdi
+ movl %eax,16(%rsp)
+ xorq %rax,%rax
.byte 0xf3,0x0f,0xa6,0xc8
+ movaps (%rsp),%xmm0
+ movl 16(%rsp),%eax
+ addq $128+8,%rsp
+ movups %xmm0,(%rdx)
+ movl %eax,16(%rdx)
.byte 0xf3,0xc3
.size padlock_sha1_oneshot,.-padlock_sha1_oneshot
@@ -153,9 +165,21 @@ padlock_sha1_oneshot:
.type padlock_sha1_blocks,@function
.align 16
padlock_sha1_blocks:
- movq $-1,%rax
movq %rdx,%rcx
+ movq %rdi,%rdx
+ movups (%rdi),%xmm0
+ subq $128+8,%rsp
+ movl 16(%rdi),%eax
+ movaps %xmm0,(%rsp)
+ movq %rsp,%rdi
+ movl %eax,16(%rsp)
+ movq $-1,%rax
.byte 0xf3,0x0f,0xa6,0xc8
+ movaps (%rsp),%xmm0
+ movl 16(%rsp),%eax
+ addq $128+8,%rsp
+ movups %xmm0,(%rdx)
+ movl %eax,16(%rdx)
.byte 0xf3,0xc3
.size padlock_sha1_blocks,.-padlock_sha1_blocks
@@ -163,9 +187,21 @@ padlock_sha1_blocks:
.type padlock_sha256_oneshot,@function
.align 16
padlock_sha256_oneshot:
- xorq %rax,%rax
movq %rdx,%rcx
+ movq %rdi,%rdx
+ movups (%rdi),%xmm0
+ subq $128+8,%rsp
+ movups 16(%rdi),%xmm1
+ movaps %xmm0,(%rsp)
+ movq %rsp,%rdi
+ movaps %xmm1,16(%rsp)
+ xorq %rax,%rax
.byte 0xf3,0x0f,0xa6,0xd0
+ movaps (%rsp),%xmm0
+ movaps 16(%rsp),%xmm1
+ addq $128+8,%rsp
+ movups %xmm0,(%rdx)
+ movups %xmm1,16(%rdx)
.byte 0xf3,0xc3
.size padlock_sha256_oneshot,.-padlock_sha256_oneshot
@@ -173,9 +209,21 @@ padlock_sha256_oneshot:
.type padlock_sha256_blocks,@function
.align 16
padlock_sha256_blocks:
- movq $-1,%rax
movq %rdx,%rcx
+ movq %rdi,%rdx
+ movups (%rdi),%xmm0
+ subq $128+8,%rsp
+ movups 16(%rdi),%xmm1
+ movaps %xmm0,(%rsp)
+ movq %rsp,%rdi
+ movaps %xmm1,16(%rsp)
+ movq $-1,%rax
.byte 0xf3,0x0f,0xa6,0xd0
+ movaps (%rsp),%xmm0
+ movaps 16(%rsp),%xmm1
+ addq $128+8,%rsp
+ movups %xmm0,(%rdx)
+ movups %xmm1,16(%rdx)
.byte 0xf3,0xc3
.size padlock_sha256_blocks,.-padlock_sha256_blocks
@@ -184,7 +232,27 @@ padlock_sha256_blocks:
.align 16
padlock_sha512_blocks:
movq %rdx,%rcx
+ movq %rdi,%rdx
+ movups (%rdi),%xmm0
+ subq $128+8,%rsp
+ movups 16(%rdi),%xmm1
+ movups 32(%rdi),%xmm2
+ movups 48(%rdi),%xmm3
+ movaps %xmm0,(%rsp)
+ movq %rsp,%rdi
+ movaps %xmm1,16(%rsp)
+ movaps %xmm2,32(%rsp)
+ movaps %xmm3,48(%rsp)
.byte 0xf3,0x0f,0xa6,0xe0
+ movaps (%rsp),%xmm0
+ movaps 16(%rsp),%xmm1
+ movaps 32(%rsp),%xmm2
+ movaps 48(%rsp),%xmm3
+ addq $128+8,%rsp
+ movups %xmm0,(%rdx)
+ movups %xmm1,16(%rdx)
+ movups %xmm2,32(%rdx)
+ movups %xmm3,48(%rdx)
.byte 0xf3,0xc3
.size padlock_sha512_blocks,.-padlock_sha512_blocks
.globl padlock_ecb_encrypt
@@ -228,6 +296,8 @@ padlock_ecb_encrypt:
jmp .Lecb_loop
.align 16
.Lecb_loop:
+ cmpq %rcx,%rbx
+ cmovaq %rcx,%rbx
movq %rdi,%r8
movq %rsi,%r9
movq %rcx,%r10
@@ -333,6 +403,8 @@ padlock_cbc_encrypt:
jmp .Lcbc_loop
.align 16
.Lcbc_loop:
+ cmpq %rcx,%rbx
+ cmovaq %rcx,%rbx
movq %rdi,%r8
movq %rsi,%r9
movq %rcx,%r10
diff --git a/lib/accelerated/x86/asm/padlock-x86.s
b/lib/accelerated/x86/asm/padlock-x86.s
index a0aed2c..06035d0 100644
--- a/lib/accelerated/x86/asm/padlock-x86.s
+++ b/lib/accelerated/x86/asm/padlock-x86.s
@@ -37,7 +37,6 @@
.file "padlock-x86.s"
.text
-
.globl padlock_capability
.type padlock_capability,@function
.align 16
@@ -423,7 +422,22 @@ padlock_sha1_oneshot:
movl 12(%esp),%edi
movl 16(%esp),%esi
movl 20(%esp),%ecx
+ movl %esp,%edx
+ addl $-128,%esp
+ movups (%edi),%xmm0
+ andl $-16,%esp
+ movl 16(%edi),%eax
+ movaps %xmm0,(%esp)
+ movl %esp,%edi
+ movl %eax,16(%esp)
+ xorl %eax,%eax
.byte 243,15,166,200
+ movaps (%esp),%xmm0
+ movl 16(%esp),%eax
+ movl %edx,%esp
+ movl 12(%esp),%edi
+ movups %xmm0,(%edi)
+ movl %eax,16(%edi)
popl %esi
popl %edi
ret
@@ -435,11 +449,25 @@ padlock_sha1_blocks:
.L_padlock_sha1_blocks_begin:
pushl %edi
pushl %esi
- movl $-1,%eax
movl 12(%esp),%edi
movl 16(%esp),%esi
+ movl %esp,%edx
movl 20(%esp),%ecx
+ addl $-128,%esp
+ movups (%edi),%xmm0
+ andl $-16,%esp
+ movl 16(%edi),%eax
+ movaps %xmm0,(%esp)
+ movl %esp,%edi
+ movl %eax,16(%esp)
+ movl $-1,%eax
.byte 243,15,166,200
+ movaps (%esp),%xmm0
+ movl 16(%esp),%eax
+ movl %edx,%esp
+ movl 12(%esp),%edi
+ movups %xmm0,(%edi)
+ movl %eax,16(%edi)
popl %esi
popl %edi
ret
@@ -455,7 +483,22 @@ padlock_sha256_oneshot:
movl 12(%esp),%edi
movl 16(%esp),%esi
movl 20(%esp),%ecx
+ movl %esp,%edx
+ addl $-128,%esp
+ movups (%edi),%xmm0
+ andl $-16,%esp
+ movups 16(%edi),%xmm1
+ movaps %xmm0,(%esp)
+ movl %esp,%edi
+ movaps %xmm1,16(%esp)
+ xorl %eax,%eax
.byte 243,15,166,208
+ movaps (%esp),%xmm0
+ movaps 16(%esp),%xmm1
+ movl %edx,%esp
+ movl 12(%esp),%edi
+ movups %xmm0,(%edi)
+ movups %xmm1,16(%edi)
popl %esi
popl %edi
ret
@@ -467,11 +510,25 @@ padlock_sha256_blocks:
.L_padlock_sha256_blocks_begin:
pushl %edi
pushl %esi
- movl $-1,%eax
movl 12(%esp),%edi
movl 16(%esp),%esi
movl 20(%esp),%ecx
+ movl %esp,%edx
+ addl $-128,%esp
+ movups (%edi),%xmm0
+ andl $-16,%esp
+ movups 16(%edi),%xmm1
+ movaps %xmm0,(%esp)
+ movl %esp,%edi
+ movaps %xmm1,16(%esp)
+ movl $-1,%eax
.byte 243,15,166,208
+ movaps (%esp),%xmm0
+ movaps 16(%esp),%xmm1
+ movl %edx,%esp
+ movl 12(%esp),%edi
+ movups %xmm0,(%edi)
+ movups %xmm1,16(%edi)
popl %esi
popl %edi
ret
@@ -486,7 +543,29 @@ padlock_sha512_blocks:
movl 12(%esp),%edi
movl 16(%esp),%esi
movl 20(%esp),%ecx
+ movl %esp,%edx
+ addl $-128,%esp
+ movups (%edi),%xmm0
+ andl $-16,%esp
+ movups 16(%edi),%xmm1
+ movups 32(%edi),%xmm2
+ movups 48(%edi),%xmm3
+ movaps %xmm0,(%esp)
+ movl %esp,%edi
+ movaps %xmm1,16(%esp)
+ movaps %xmm2,32(%esp)
+ movaps %xmm3,48(%esp)
.byte 243,15,166,224
+ movaps (%esp),%xmm0
+ movaps 16(%esp),%xmm1
+ movaps 32(%esp),%xmm2
+ movaps 48(%esp),%xmm3
+ movl %edx,%esp
+ movl 12(%esp),%edi
+ movups %xmm0,(%edi)
+ movups %xmm1,16(%edi)
+ movups %xmm2,32(%edi)
+ movups %xmm3,48(%edi)
popl %esi
popl %edi
ret
diff --git a/src/tests.c b/src/tests.c
index d5660ae..af5eec1 100644
--- a/src/tests.c
+++ b/src/tests.c
@@ -107,16 +107,16 @@ do_handshake (gnutls_session_t session)
char protocol_str[] = "+VERS-TLS1.0:+VERS-SSL3.0";
char protocol_all_str[] =
"+VERS-TLS1.2:+VERS-TLS1.1:+VERS-TLS1.0:+VERS-SSL3.0";
-char prio_str[256] = "";
+char prio_str[512] = "";
#define ALL_CIPHERS "+3DES-CBC:+ARCFOUR-128:+ARCFOUR-40"
#define BLOCK_CIPHERS "+3DES-CBC:+AES-128-CBC"
#define ALL_COMP "+COMP-NULL"
#define ALL_MACS "+SHA1:+MD5"
#define ALL_CERTTYPES "+CTYPE-X509"
-#define ALL_KX
"+RSA:+DHE-RSA:+DHE-DSS:+ANON-DH:+RSA-EXPORT:+ECDHE-RSA:+ECDHE-ECDSA:+ANON-ECDH:+CURVE-ALL"
+#define ALL_KX
"+RSA:+DHE-RSA:+DHE-DSS:+ANON-DH:+RSA-EXPORT:+ECDHE-RSA:+ECDHE-ECDSA:+ANON-ECDH"
#define INIT_STR "NONE:"
-char rest[128] = "%UNSAFE_RENEGOTIATION";
+char rest[128] = "%UNSAFE_RENEGOTIATION:+SIGN-ALL:+CURVE-ALL";
static inline void
_gnutls_priority_set_direct (gnutls_session_t session, const char *str)
@@ -384,7 +384,7 @@ test_ecdhe_curve (gnutls_session_t session)
if (curve == GNUTLS_ECC_CURVE_INVALID)
return TEST_IGNORE;
- printf ("\n Curve %s\n", gnutls_ecc_curve_get_name(curve));
+ printf ("\n Curve %s", gnutls_ecc_curve_get_name(curve));
return TEST_SUCCEED;
}
@@ -494,7 +494,7 @@ test_code_t test_aes_gcm (gnutls_session_t session)
int ret;
sprintf (prio_str, INIT_STR
- "+AES-128-GCM:+AES-256-GCM:" ALL_COMP ":" ALL_CERTTYPES ":%s:"
ALL_MACS
+ "+AES-128-GCM:+AES-256-GCM:+AEAD:" ALL_COMP ":" ALL_CERTTYPES
":%s:" ALL_MACS
":" ALL_KX ":%s", protocol_all_str, rest);
_gnutls_priority_set_direct (session, prio_str);
@@ -504,7 +504,6 @@ test_code_t test_aes_gcm (gnutls_session_t session)
return ret;
}
-#ifdef ENABLE_CAMELLIA
test_code_t
test_camellia (gnutls_session_t session)
{
@@ -520,7 +519,6 @@ test_camellia (gnutls_session_t session)
ret = do_handshake (session);
return ret;
}
-#endif
test_code_t
test_openpgp1 (gnutls_session_t session)
@@ -549,18 +547,10 @@ test_unknown_ciphersuites (gnutls_session_t session)
{
int ret;
-
-#ifdef ENABLE_CAMELLIA
- sprintf (prio_str,
- INIT_STR ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES ":%s:" ALL_MACS
- ":" ALL_KX ":%s", protocol_str, rest);
- _gnutls_priority_set_direct (session, prio_str);
-#else
sprintf (prio_str,
INIT_STR "+AES-128-CBC:" ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES
":%s:" ALL_MACS ":" ALL_KX ":%s", protocol_str, rest);
_gnutls_priority_set_direct (session, prio_str);
-#endif
gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, xcred);
diff --git a/src/tests.h b/src/tests.h
index ed8fdb0..e63c31b 100644
--- a/src/tests.h
+++ b/src/tests.h
@@ -12,9 +12,7 @@ test_code_t test_dhe (gnutls_session_t state);
test_code_t test_dhe_group (gnutls_session_t state);
test_code_t test_ssl3 (gnutls_session_t state);
test_code_t test_aes (gnutls_session_t state);
-#ifdef ENABLE_CAMELLIA
test_code_t test_camellia (gnutls_session_t state);
-#endif
test_code_t test_md5 (gnutls_session_t state);
test_code_t test_sha (gnutls_session_t state);
test_code_t test_3des (gnutls_session_t state);
diff --git a/src/tls_test.c b/src/tls_test.c
index 6b1d1cc..207bbbc 100644
--- a/src/tls_test.c
+++ b/src/tls_test.c
@@ -138,10 +138,8 @@ static const TLS_TEST tls_tests[] = {
"dunno"},
{"for AES-CBC cipher support", test_aes, "yes", "no",
"dunno"},
-#ifdef ENABLE_CAMELLIA
{"for CAMELLIA cipher support", test_camellia, "yes", "no",
"dunno"},
-#endif
{"for 3DES-CBC cipher support", test_3des, "yes", "no", "dunno"},
{"for ARCFOUR 128 cipher support", test_arcfour, "yes", "no", "dunno"},
{"for ARCFOUR 40 cipher support", test_arcfour_40, "yes", "no",
hooks/post-receive
--
GNU gnutls
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gnutls branch, master, updated. gnutls_3_0_3-77-gbcf7a86,
Nikos Mavrogiannopoulos <=