Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(321)

Side by Side Diff: net/third_party/nss/ssl/sslsock.c

Issue 7003069: Remove the TLS Snap Start code from NSS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/third_party/nss/ssl/sslimpl.h ('k') | net/third_party/nss/ssl/sslt.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * vtables (and methods that call through them) for the 4 types of 2 * vtables (and methods that call through them) for the 4 types of
3 * SSLSockets supported. Only one type is still supported. 3 * SSLSockets supported. Only one type is still supported.
4 * Various other functions. 4 * Various other functions.
5 * 5 *
6 * ***** BEGIN LICENSE BLOCK ***** 6 * ***** BEGIN LICENSE BLOCK *****
7 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 7 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
8 * 8 *
9 * The contents of this file are subject to the Mozilla Public License Version 9 * The contents of this file are subject to the Mozilla Public License Version
10 * 1.1 (the "License"); you may not use this file except in compliance with 10 * 1.1 (the "License"); you may not use this file except in compliance with
(...skipping 725 matching lines...) Expand 10 before | Expand all | Expand 10 after
736 break; 736 break;
737 737
738 case SSL_REQUIRE_SAFE_NEGOTIATION: 738 case SSL_REQUIRE_SAFE_NEGOTIATION:
739 ss->opt.requireSafeNegotiation = on; 739 ss->opt.requireSafeNegotiation = on;
740 break; 740 break;
741 741
742 case SSL_ENABLE_FALSE_START: 742 case SSL_ENABLE_FALSE_START:
743 ss->opt.enableFalseStart = on; 743 ss->opt.enableFalseStart = on;
744 break; 744 break;
745 745
746 case SSL_ENABLE_SNAP_START:
747 ss->opt.enableSnapStart = on;
748 break;
749
750 case SSL_ENABLE_OCSP_STAPLING: 746 case SSL_ENABLE_OCSP_STAPLING:
751 ss->opt.enableOCSPStapling = on; 747 ss->opt.enableOCSPStapling = on;
752 break; 748 break;
753 749
754 default: 750 default:
755 PORT_SetError(SEC_ERROR_INVALID_ARGS); 751 PORT_SetError(SEC_ERROR_INVALID_ARGS);
756 rv = SECFailure; 752 rv = SECFailure;
757 } 753 }
758 754
759 /* We can't use the macros for releasing the locks here, 755 /* We can't use the macros for releasing the locks here,
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
808 case SSL_NO_LOCKS: on = ss->opt.noLocks; break; 804 case SSL_NO_LOCKS: on = ss->opt.noLocks; break;
809 case SSL_ENABLE_SESSION_TICKETS: 805 case SSL_ENABLE_SESSION_TICKETS:
810 on = ss->opt.enableSessionTickets; 806 on = ss->opt.enableSessionTickets;
811 break; 807 break;
812 case SSL_ENABLE_DEFLATE: on = ss->opt.enableDeflate; break; 808 case SSL_ENABLE_DEFLATE: on = ss->opt.enableDeflate; break;
813 case SSL_ENABLE_RENEGOTIATION: 809 case SSL_ENABLE_RENEGOTIATION:
814 on = ss->opt.enableRenegotiation; break; 810 on = ss->opt.enableRenegotiation; break;
815 case SSL_REQUIRE_SAFE_NEGOTIATION: 811 case SSL_REQUIRE_SAFE_NEGOTIATION:
816 on = ss->opt.requireSafeNegotiation; break; 812 on = ss->opt.requireSafeNegotiation; break;
817 case SSL_ENABLE_FALSE_START: on = ss->opt.enableFalseStart; break; 813 case SSL_ENABLE_FALSE_START: on = ss->opt.enableFalseStart; break;
818 case SSL_ENABLE_SNAP_START: on = ss->opt.enableSnapStart; break;
819 case SSL_ENABLE_OCSP_STAPLING: on = ss->opt.enableOCSPStapling; break; 814 case SSL_ENABLE_OCSP_STAPLING: on = ss->opt.enableOCSPStapling; break;
820 815
821 default: 816 default:
822 PORT_SetError(SEC_ERROR_INVALID_ARGS); 817 PORT_SetError(SEC_ERROR_INVALID_ARGS);
823 rv = SECFailure; 818 rv = SECFailure;
824 } 819 }
825 820
826 ssl_ReleaseSSL3HandshakeLock(ss); 821 ssl_ReleaseSSL3HandshakeLock(ss);
827 ssl_Release1stHandshakeLock(ss); 822 ssl_Release1stHandshakeLock(ss);
828 823
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
861 case SSL_ENABLE_SESSION_TICKETS: 856 case SSL_ENABLE_SESSION_TICKETS:
862 on = ssl_defaults.enableSessionTickets; 857 on = ssl_defaults.enableSessionTickets;
863 break; 858 break;
864 case SSL_ENABLE_DEFLATE: on = ssl_defaults.enableDeflate; break; 859 case SSL_ENABLE_DEFLATE: on = ssl_defaults.enableDeflate; break;
865 case SSL_ENABLE_RENEGOTIATION: 860 case SSL_ENABLE_RENEGOTIATION:
866 on = ssl_defaults.enableRenegotiation; break; 861 on = ssl_defaults.enableRenegotiation; break;
867 case SSL_REQUIRE_SAFE_NEGOTIATION: 862 case SSL_REQUIRE_SAFE_NEGOTIATION:
868 on = ssl_defaults.requireSafeNegotiation; 863 on = ssl_defaults.requireSafeNegotiation;
869 break; 864 break;
870 case SSL_ENABLE_FALSE_START: on = ssl_defaults.enableFalseStart; break; 865 case SSL_ENABLE_FALSE_START: on = ssl_defaults.enableFalseStart; break;
871 case SSL_ENABLE_SNAP_START: on = ssl_defaults.enableSnapStart; break;
872 case SSL_ENABLE_OCSP_STAPLING: 866 case SSL_ENABLE_OCSP_STAPLING:
873 on = ssl_defaults.enableOCSPStapling; 867 on = ssl_defaults.enableOCSPStapling;
874 break; 868 break;
875 869
876 default: 870 default:
877 PORT_SetError(SEC_ERROR_INVALID_ARGS); 871 PORT_SetError(SEC_ERROR_INVALID_ARGS);
878 rv = SECFailure; 872 rv = SECFailure;
879 } 873 }
880 874
881 *pOn = on; 875 *pOn = on;
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
1012 break; 1006 break;
1013 1007
1014 case SSL_REQUIRE_SAFE_NEGOTIATION: 1008 case SSL_REQUIRE_SAFE_NEGOTIATION:
1015 ssl_defaults.requireSafeNegotiation = on; 1009 ssl_defaults.requireSafeNegotiation = on;
1016 break; 1010 break;
1017 1011
1018 case SSL_ENABLE_FALSE_START: 1012 case SSL_ENABLE_FALSE_START:
1019 ssl_defaults.enableFalseStart = on; 1013 ssl_defaults.enableFalseStart = on;
1020 break; 1014 break;
1021 1015
1022 case SSL_ENABLE_SNAP_START:
1023 ssl_defaults.enableSnapStart = on;
1024 break;
1025
1026 case SSL_ENABLE_OCSP_STAPLING: 1016 case SSL_ENABLE_OCSP_STAPLING:
1027 ssl_defaults.enableOCSPStapling = on; 1017 ssl_defaults.enableOCSPStapling = on;
1028 break; 1018 break;
1029 1019
1030 default: 1020 default:
1031 PORT_SetError(SEC_ERROR_INVALID_ARGS); 1021 PORT_SetError(SEC_ERROR_INVALID_ARGS);
1032 return SECFailure; 1022 return SECFailure;
1033 } 1023 }
1034 return SECSuccess; 1024 return SECSuccess;
1035 } 1025 }
(...skipping 1498 matching lines...) Expand 10 before | Expand all | Expand 10 after
2534 loser: 2524 loser:
2535 ssl_DestroySocketContents(ss); 2525 ssl_DestroySocketContents(ss);
2536 ssl_DestroyLocks(ss); 2526 ssl_DestroyLocks(ss);
2537 PORT_Free(ss); 2527 PORT_Free(ss);
2538 ss = NULL; 2528 ss = NULL;
2539 } 2529 }
2540 } 2530 }
2541 return ss; 2531 return ss;
2542 } 2532 }
2543 2533
OLDNEW
« no previous file with comments | « net/third_party/nss/ssl/sslimpl.h ('k') | net/third_party/nss/ssl/sslt.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698