~ubuntu-branches/ubuntu/utopic/openvpn/utopic-proposed

Viewing changes to src/openvpn/ssl_openssl.c

Committer: Package Import Robot
Author(s): Stéphane Graber
Date: 2013-07-09 17:20:31 UTC
mfrom: (1.1.20) (10.2.26 sid)
Revision ID: package-import@ubuntu.com-20130709172031-j30621zfq11wy5tv

Tags: 2.3.2-4ubuntu1

* Merge from Debian unstable. Remaining changes:
  - debian/openvpn.init.d:
    + Do not use start-stop-daemon and </dev/null to avoid blocking boot.
    + Show per-VPN result messages.
    + Add "--script-security 2" by default for backwards compatabliity.

Show diffs side-by-side

added added

removed removed

src/openvpn/ssl_openssl.c

217

ASSERT(NULL != ctx);

218

219

// Translate IANA cipher suite names to OpenSSL names

220

for (begin_of_cipher = 0; begin_of_cipher < strlen(ciphers); begin_of_cipher = end_of_cipher+1) {

221

end_of_cipher = strcspn(&ciphers[begin_of_cipher], ":");

220

begin_of_cipher = end_of_cipher = 0;

221

for (; begin_of_cipher < strlen(ciphers); begin_of_cipher = end_of_cipher) {

222

end_of_cipher += strcspn(&ciphers[begin_of_cipher], ":");

222

223

cipher_pair = tls_get_cipher_name_pair(&ciphers[begin_of_cipher], end_of_cipher - begin_of_cipher);

223

224

225

if (NULL == cipher_pair)

257

258

openssl_ciphers_len += current_cipher_len;

258

259

openssl_ciphers[openssl_ciphers_len] = ':';

259

260

openssl_ciphers_len++;

261

262

end_of_cipher++;

260

263

}

261

264

262

265

if (openssl_ciphers_len > 0)

Older »