projects
/
BearSSL
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added macro that indicates presence of the time callback feature. Also added C++...
[BearSSL]
/
src
/
ssl
/
ssl_server_full_rsa.c
diff --git
a/src/ssl/ssl_server_full_rsa.c
b/src/ssl/ssl_server_full_rsa.c
index
cbb60f9
..
d67c076
100644
(file)
--- a/
src/ssl/ssl_server_full_rsa.c
+++ b/
src/ssl/ssl_server_full_rsa.c
@@
-53,6
+53,10
@@
br_ssl_server_init_full_rsa(br_ssl_server_context *cc,
BR_TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
BR_TLS_RSA_WITH_AES_128_GCM_SHA256,
BR_TLS_RSA_WITH_AES_256_GCM_SHA384,
BR_TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
BR_TLS_RSA_WITH_AES_128_GCM_SHA256,
BR_TLS_RSA_WITH_AES_256_GCM_SHA384,
+ BR_TLS_RSA_WITH_AES_128_CCM,
+ BR_TLS_RSA_WITH_AES_256_CCM,
+ BR_TLS_RSA_WITH_AES_128_CCM_8,
+ BR_TLS_RSA_WITH_AES_256_CCM_8,
BR_TLS_RSA_WITH_AES_128_CBC_SHA256,
BR_TLS_RSA_WITH_AES_256_CBC_SHA256,
BR_TLS_RSA_WITH_AES_128_CBC_SHA,
BR_TLS_RSA_WITH_AES_128_CBC_SHA256,
BR_TLS_RSA_WITH_AES_256_CBC_SHA256,
BR_TLS_RSA_WITH_AES_128_CBC_SHA,
@@
-97,12
+101,8
@@
br_ssl_server_init_full_rsa(br_ssl_server_context *cc,
*/
br_ssl_server_set_single_rsa(cc, chain, chain_len, sk,
BR_KEYTYPE_KEYX | BR_KEYTYPE_SIGN,
*/
br_ssl_server_set_single_rsa(cc, chain, chain_len, sk,
BR_KEYTYPE_KEYX | BR_KEYTYPE_SIGN,
-#if BR_LOMUL
- br_rsa_i15_private, br_rsa_i15_pkcs1_sign
-#else
- br_rsa_i31_private, br_rsa_i31_pkcs1_sign
-#endif
- );
+ br_rsa_private_get_default(),
+ br_rsa_pkcs1_sign_get_default());
/*
* Set supported hash functions.
/*
* Set supported hash functions.
@@
-125,6
+125,7
@@
br_ssl_server_init_full_rsa(br_ssl_server_context *cc,
* Symmetric encryption.
*/
br_ssl_engine_set_default_aes_cbc(&cc->eng);
* Symmetric encryption.
*/
br_ssl_engine_set_default_aes_cbc(&cc->eng);
+ br_ssl_engine_set_default_aes_ccm(&cc->eng);
br_ssl_engine_set_default_aes_gcm(&cc->eng);
br_ssl_engine_set_default_des_cbc(&cc->eng);
br_ssl_engine_set_default_chapol(&cc->eng);
br_ssl_engine_set_default_aes_gcm(&cc->eng);
br_ssl_engine_set_default_des_cbc(&cc->eng);
br_ssl_engine_set_default_chapol(&cc->eng);