← Back to branch summary

~mdcallag/+junk/5.1-map

« back to all changes in this revision

Viewing changes to vio/viosslfactories.c

  • Committer: msvensson at pilot
  • Date: 2007-04-24 09:11:45 UTC
  • mfrom: (2469.1.106)
  • Revision ID: sp1r-msvensson@pilot.blaudden-20070424091145-10463
Merge pilot.blaudden:/home/msvensson/mysql/my51-m-mysql_upgrade
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint

Show diffs side-by-side

added added

removed removed

Lines of Context:
vio/viosslfactories.c
257
257
    DBUG_RETURN(0);
258
258
  }
259
259
 
260
 
  /* Set the ciphers that can be used */
261
 
  if (cipher && SSL_CTX_set_cipher_list(ssl_fd->ssl_context, cipher))
 
260
  /*
 
261
    Set the ciphers that can be used
 
262
    NOTE: SSL_CTX_set_cipher_list will return 0 if
 
263
    none of the provided ciphers could be selected
 
264
  */
 
265
  if (cipher &&
 
266
      SSL_CTX_set_cipher_list(ssl_fd->ssl_context, cipher) == 0)
262
267
  {
263
268
    DBUG_PRINT("error", ("failed to set ciphers to use"));
264
269
    report_errors();
309
314
{
310
315
  struct st_VioSSLFd *ssl_fd;
311
316
  int verify= SSL_VERIFY_PEER;
 
317
 
 
318
  /*
 
319
    Turn off verification of servers certificate if both
 
320
    ca_file and ca_path is set to NULL
 
321
  */
 
322
  if (ca_file == 0 && ca_path == 0)
 
323
    verify= SSL_VERIFY_NONE;
 
324
 
312
325
  if (!(ssl_fd= new_VioSSLFd(key_file, cert_file, ca_file,
313
326
                             ca_path, cipher, TLSv1_client_method())))
314
327
  {