Print this page
4853 illumos-gate is not lint-clean when built with openssl 1.0

Split Close
Expand all
Collapse all
          --- old/usr/src/lib/openssl/libsunw_ssl/s3_clnt.c
          +++ new/usr/src/lib/openssl/libsunw_ssl/s3_clnt.c
↓ open down ↓ 2267 lines elided ↑ open up ↑
2268 2268                          RSA *rsa;
2269 2269                          unsigned char tmp_buf[SSL_MAX_MASTER_KEY_LENGTH];
2270 2270  
2271 2271                          if (s->session->sess_cert == NULL)
2272 2272                                  {
2273 2273                                  /* We should always have a server certificate with SSL_kRSA. */
2274 2274                                  SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
2275 2275                                  goto err;
2276 2276                                  }
2277 2277  
     2278 +
2278 2279                          if (s->session->sess_cert->peer_rsa_tmp != NULL)
2279 2280                                  rsa=s->session->sess_cert->peer_rsa_tmp;
2280 2281                          else
2281 2282                                  {
2282 2283                                  pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
2283 2284                                  if ((pkey == NULL) ||
2284 2285                                          (pkey->type != EVP_PKEY_RSA) ||
2285 2286                                          (pkey->pkey.rsa == NULL))
2286 2287                                          {
2287 2288                                          SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
↓ open down ↓ 1118 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX