1 --- a/src/openvpn/crypto_polarssl.h
2 +++ b/src/openvpn/crypto_polarssl.h
3 @@ -60,7 +60,7 @@ typedef md_context_t hmac_ctx_t;
4 #define OPENVPN_MODE_OFB POLARSSL_MODE_OFB
6 /** Cipher is in CFB mode */
7 -#define OPENVPN_MODE_CFB POLARSSL_MODE_CFB128
8 +#define OPENVPN_MODE_CFB POLARSSL_MODE_CFB
10 /** Cipher should encrypt */
11 #define OPENVPN_OP_ENCRYPT POLARSSL_ENCRYPT
12 --- a/src/openvpn/ssl_polarssl.c
13 +++ b/src/openvpn/ssl_polarssl.c
14 @@ -65,23 +65,6 @@ tls_clear_error()
18 -static int default_ciphersuites[] =
20 - SSL_EDH_RSA_AES_256_SHA,
21 - SSL_EDH_RSA_CAMELLIA_256_SHA,
22 - SSL_EDH_RSA_AES_128_SHA,
23 - SSL_EDH_RSA_CAMELLIA_128_SHA,
24 - SSL_EDH_RSA_DES_168_SHA,
25 - SSL_RSA_AES_256_SHA,
26 - SSL_RSA_CAMELLIA_256_SHA,
27 - SSL_RSA_AES_128_SHA,
28 - SSL_RSA_CAMELLIA_128_SHA,
29 - SSL_RSA_DES_168_SHA,
30 - SSL_RSA_RC4_128_SHA,
31 - SSL_RSA_RC4_128_MD5,
36 tls_ctx_server_new(struct tls_root_ctx *ctx)
38 @@ -515,11 +498,11 @@ void key_state_ssl_init(struct key_state
39 ssl_set_rng (ks_ssl->ctx, ctr_drbg_random, rand_ctx_get());
41 ALLOC_OBJ_CLEAR (ks_ssl->ssn, ssl_session);
42 - ssl_set_session (ks_ssl->ctx, 0, 0, ks_ssl->ssn );
43 + ssl_set_session (ks_ssl->ctx, ks_ssl->ssn );
44 if (ssl_ctx->allowed_ciphers)
45 ssl_set_ciphersuites (ks_ssl->ctx, ssl_ctx->allowed_ciphers);
47 - ssl_set_ciphersuites (ks_ssl->ctx, default_ciphersuites);
48 + ssl_set_ciphersuites (ks_ssl->ctx, ssl_default_ciphersuites);
50 /* Initialise authentication information */
52 @@ -828,7 +811,7 @@ print_details (struct key_state_ssl * ks
53 ssl_get_version (ks_ssl->ctx),
54 ssl_get_ciphersuite(ks_ssl->ctx));
56 - cert = ks_ssl->ctx->peer_cert;
57 + cert = ssl_get_peer_cert(ks_ssl->ctx);
60 openvpn_snprintf (s2, sizeof (s2), ", " counter_format " bit RSA", (counter_type) cert->rsa.len * 8);