commit bfccdd3c92b5e9a47cef628374741a726e8c56dd
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Wed Jan 21 13:48:45 2015 +0000
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Wed Jan 21 13:48:45 2015 +0000
tree 90e4af20db605a2da5b568c8897d5480def04214
parent 0017c2be48a1c942c0360e04633b3d0e7cf5259d
parent 36adc3631caa03dc91b113f81f26aa8543629e52

Merge commit '36adc36' into dtls

* commit '36adc36':
  Add support for getrandom()
  Use library default for trunc-hmac in ssl_client2
  Make truncated hmac a runtime option server-side
  Fix portability issue in script
  Specific error for suites in common but none good
  Prefer SHA-1 certificates for pre-1.2 clients
  Some more refactoring/tuning.
  Minor refactoring

Conflicts:
	include/polarssl/error.h
	include/polarssl/ssl.h
	library/error.c

include/polarssl/error.h

diff --git a/include/polarssl/error.h b/include/polarssl/error.h
index 00c794e..1e36a0d 100644
--- a/include/polarssl/error.h
+++ b/include/polarssl/error.h
@@ -91,7 +91,7 @@
  * ECP       4   8 (Started from top)
  * MD        5   4
  * CIPHER    6   6
- * SSL       6   12 (Started from top)
+ * SSL       6   13 (Started from top)
  * SSL       7   31
  *
  * Module dependent error code (5 bits 0x.00.-0x.F8.)