summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2003-12-29 21:51:47 +0000
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2003-12-29 21:51:47 +0000
commitfcd74a11533b27defb5f94f69f8d52feaab1cab7 (patch)
treefc19c2032478475722ebcc2cd83ca7bff740a162
parente97ac6044e4ce5140be60a1a7148c6842bdb3567 (diff)
downloadgnutls-fcd74a11533b27defb5f94f69f8d52feaab1cab7.tar.gz
*** empty log message ***
-rw-r--r--NEWS2
-rw-r--r--doc/TODO2
-rw-r--r--lib/gnutls_cipher.c6
3 files changed, 5 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index 3a926bd3d7..3272871587 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,5 @@
Version 1.1.3
-- Implemented TLS 1.1 (which obsoleted the TLS 1.0 CBC protection
+- Implemented TLS 1.1 (and also obsoleted the TLS 1.0 CBC protection
hack).
Version 1.1.2 (28/12/2003)
diff --git a/doc/TODO b/doc/TODO
index 3d6a8afadb..f57fb8608e 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -3,7 +3,6 @@ anything), contact the developer's mailing list (gnutls-dev@lists.gnupg.org),
in order to avoid having people working on the same thing.
Current list:
-* Add support for TLS 1.1
* Add gnutls_certificate_set_openpgp_keyring()
functions, similar to gnutls_certificate_set_openpgp_key().
* Use subkeys with the 0x20 flag in openpgp keys (if present),
@@ -11,7 +10,6 @@ Current list:
* Add function to extract the signers of an openpgp key. Should
be similar to gnutls_x509_crt_get_dn_oid().
* Add function to verify an openpgp key against a plain key.
-* Drop the compatibility functions.
* Convert documentation to texinfo format
* Audit the code
* Allow sending V2 Hello messages. It seems that some (old) broken
diff --git a/lib/gnutls_cipher.c b/lib/gnutls_cipher.c
index b5e58c7928..2d19e0fb82 100644
--- a/lib/gnutls_cipher.c
+++ b/lib/gnutls_cipher.c
@@ -338,9 +338,11 @@ int _gnutls_compressed2ciphertext(gnutls_session session,
/* Actual encryption (inplace).
*/
- if ( (ret = _gnutls_cipher_encrypt(session->connection_state.
+ ret = _gnutls_cipher_encrypt(session->connection_state.
write_cipher_state, cipher_data,
- length)) < 0) {
+ length);
+ if (ret < 0) {
+ gnutls_assert();
return ret;
}