| OLD | NEW |
| 1 /* | 1 /* |
| 2 * SSL3 Protocol | 2 * SSL3 Protocol |
| 3 * | 3 * |
| 4 * ***** BEGIN LICENSE BLOCK ***** | 4 * ***** BEGIN LICENSE BLOCK ***** |
| 5 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 | 5 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 |
| 6 * | 6 * |
| 7 * The contents of this file are subject to the Mozilla Public License Version | 7 * The contents of this file are subject to the Mozilla Public License Version |
| 8 * 1.1 (the "License"); you may not use this file except in compliance with | 8 * 1.1 (the "License"); you may not use this file except in compliance with |
| 9 * the License. You may obtain a copy of the License at | 9 * the License. You may obtain a copy of the License at |
| 10 * http://www.mozilla.org/MPL/ | 10 * http://www.mozilla.org/MPL/ |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 * the terms of any one of the MPL, the GPL or the LGPL. | 39 * the terms of any one of the MPL, the GPL or the LGPL. |
| 40 * | 40 * |
| 41 * ***** END LICENSE BLOCK ***** */ | 41 * ***** END LICENSE BLOCK ***** */ |
| 42 | 42 |
| 43 /* TLS extension code moved here from ssl3ecc.c */ | 43 /* TLS extension code moved here from ssl3ecc.c */ |
| 44 /* $Id: ssl3ext.c,v 1.14 2010/04/03 19:19:07 nelson%bolyard.com Exp $ */ | 44 /* $Id: ssl3ext.c,v 1.14 2010/04/03 19:19:07 nelson%bolyard.com Exp $ */ |
| 45 | 45 |
| 46 #include "nssrenam.h" | 46 #include "nssrenam.h" |
| 47 #include "nss.h" | 47 #include "nss.h" |
| 48 #include "ssl.h" | 48 #include "ssl.h" |
| 49 #include "sslimpl.h" |
| 49 #include "sslproto.h" | 50 #include "sslproto.h" |
| 50 #include "sslimpl.h" | |
| 51 #include "pk11pub.h" | 51 #include "pk11pub.h" |
| 52 #include "blapi.h" | 52 #include "blapi.h" |
| 53 #include "prinit.h" | 53 #include "prinit.h" |
| 54 | 54 |
| 55 static unsigned char key_name[SESS_TICKET_KEY_NAME_LEN]; | 55 static unsigned char key_name[SESS_TICKET_KEY_NAME_LEN]; |
| 56 static PK11SymKey *session_ticket_enc_key_pkcs11 = NULL; | 56 static PK11SymKey *session_ticket_enc_key_pkcs11 = NULL; |
| 57 static PK11SymKey *session_ticket_mac_key_pkcs11 = NULL; | 57 static PK11SymKey *session_ticket_mac_key_pkcs11 = NULL; |
| 58 | 58 |
| 59 static unsigned char session_ticket_enc_key[32]; | 59 static unsigned char session_ticket_enc_key[32]; |
| 60 static unsigned char session_ticket_mac_key[SHA256_LENGTH]; | 60 static unsigned char session_ticket_mac_key[SHA256_LENGTH]; |
| (...skipping 1576 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1637 ss->peerRequestedProtection = 1; | 1637 ss->peerRequestedProtection = 1; |
| 1638 ss->xtnData.negotiated[ss->xtnData.numNegotiated++] = ex_type; | 1638 ss->xtnData.negotiated[ss->xtnData.numNegotiated++] = ex_type; |
| 1639 if (ss->sec.isServer) { | 1639 if (ss->sec.isServer) { |
| 1640 /* prepare to send back the appropriate response */ | 1640 /* prepare to send back the appropriate response */ |
| 1641 rv = ssl3_RegisterServerHelloExtensionSender(ss, ex_type, | 1641 rv = ssl3_RegisterServerHelloExtensionSender(ss, ex_type, |
| 1642 ssl3_SendRenegotiationInfoXtn); | 1642 ssl3_SendRenegotiationInfoXtn); |
| 1643 } | 1643 } |
| 1644 return rv; | 1644 return rv; |
| 1645 } | 1645 } |
| 1646 | 1646 |
| OLD | NEW |