| s_cb.c (238405) | s_cb.c (246772) |
|---|---|
| 1/* apps/s_cb.c - callback functions used by s_client, s_server, and s_time */ 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 3 * All rights reserved. 4 * 5 * This package is an SSL implementation written 6 * by Eric Young (eay@cryptsoft.com). 7 * The implementation was written so as to conform with Netscapes SSL. 8 * --- 223 unchanged lines hidden (view full) --- 232 SSL_get_privatekey(ssl)); 233 EVP_PKEY_free(pktmp); 234 } 235 SSL_free(ssl); 236 */ 237 238 /* If we are using DSA, we can copy the parameters from 239 * the private key */ | 1/* apps/s_cb.c - callback functions used by s_client, s_server, and s_time */ 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 3 * All rights reserved. 4 * 5 * This package is an SSL implementation written 6 * by Eric Young (eay@cryptsoft.com). 7 * The implementation was written so as to conform with Netscapes SSL. 8 * --- 223 unchanged lines hidden (view full) --- 232 SSL_get_privatekey(ssl)); 233 EVP_PKEY_free(pktmp); 234 } 235 SSL_free(ssl); 236 */ 237 238 /* If we are using DSA, we can copy the parameters from 239 * the private key */ |
| 240 241 | 240 241 |
| 242 /* Now we know that a key and cert have been set against 243 * the SSL context */ 244 if (!SSL_CTX_check_private_key(ctx)) 245 { 246 BIO_printf(bio_err,"Private key does not match the certificate public key\n"); 247 return(0); 248 } 249 } --- 181 unchanged lines hidden (view full) --- 431 str_details1 = ", CLIENT-CERTIFICATE"; 432 break; 433 } 434 } 435 } 436 437 if (version == SSL3_VERSION || 438 version == TLS1_VERSION || | 242 /* Now we know that a key and cert have been set against 243 * the SSL context */ 244 if (!SSL_CTX_check_private_key(ctx)) 245 { 246 BIO_printf(bio_err,"Private key does not match the certificate public key\n"); 247 return(0); 248 } 249 } --- 181 unchanged lines hidden (view full) --- 431 str_details1 = ", CLIENT-CERTIFICATE"; 432 break; 433 } 434 } 435 } 436 437 if (version == SSL3_VERSION || 438 version == TLS1_VERSION || |
| 439 version == TLS1_1_VERSION || 440 version == TLS1_2_VERSION || |
|
| 439 version == DTLS1_VERSION || 440 version == DTLS1_BAD_VER) 441 { 442 switch (content_type) 443 { 444 case 20: 445 str_content_type = "ChangeCipherSpec"; 446 break; --- 482 unchanged lines hidden --- | 441 version == DTLS1_VERSION || 442 version == DTLS1_BAD_VER) 443 { 444 switch (content_type) 445 { 446 case 20: 447 str_content_type = "ChangeCipherSpec"; 448 break; --- 482 unchanged lines hidden --- |