Branch: Tag:

2014-04-25

2014-04-25 20:36:49 by Martin Nilsson <nilsson@opera.com>

Compilation fix. Context is no longer inherited into sslfile.

1:   #pike __REAL_VERSION__ + #require constant(SSL.Cipher)    - #if constant(SSL.Cipher.CipherAlgorithm) -  +    import ".";      MySSLPort port;
102: Inside #if constant(SSL.Cipher.CipherAlgorithm)
   "commonName" : "*",    ]);    -  add_cert( private_key, -  ({ -  Standards.X509.make_selfsigned_certificate(private_key, -  3600*24*365, a) -  }) ); +  string c = Standards.X509.make_selfsigned_certificate(private_key, +  3600*24*365, a); +  +  ctx->add_cert( private_key, ({ c }) );    }    }   
126: Inside #if constant(SSL.Cipher.CipherAlgorithm)
  #endif    0;    if( tmp_key && tmp_cert ) -  add_cert( tmp_key, tmp_cert ); +  ctx->add_cert( tmp_key, tmp_cert );    }       //! @deprecated add_cert
137: Inside #if constant(SSL.Cipher.CipherAlgorithm)
   else    tmp_cert = ({ [string]certificate });    if( tmp_key && tmp_cert ) -  add_cert( tmp_key, tmp_cert ); +  ctx->add_cert( tmp_key, tmp_cert );    }   }    - string _sprintf(int t) { + protected string _sprintf(int t) {    return t=='O' && sprintf("%O(%O:%d)", this_program, interface, portno);   } -  - #endif +