Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 1903 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1914 SSL_VersionRangeSet(PRFileDesc *fd, const SSLVersionRange *vrange) | 1914 SSL_VersionRangeSet(PRFileDesc *fd, const SSLVersionRange *vrange) |
| 1915 { | 1915 { |
| 1916 sslSocket *ss = ssl_FindSocket(fd); | 1916 sslSocket *ss = ssl_FindSocket(fd); |
| 1917 | 1917 |
| 1918 if (!ss) { | 1918 if (!ss) { |
| 1919 SSL_DBG(("%d: SSL[%d]: bad socket in SSL3_VersionRangeSet", | 1919 SSL_DBG(("%d: SSL[%d]: bad socket in SSL3_VersionRangeSet", |
| 1920 SSL_GETPID(), fd)); | 1920 SSL_GETPID(), fd)); |
| 1921 return SECFailure; | 1921 return SECFailure; |
| 1922 } | 1922 } |
| 1923 | 1923 |
| 1924 if (!ssl3_VersionRangeIsValid(ssl_variant_stream, vrange)) { | 1924 if (!ssl3_VersionRangeIsValid(ss->protocolVariant, vrange)) { |
|
Ryan Sleevi
2012/08/15 03:39:07
same here?
wtc
2012/08/15 16:16:59
Yes, this is part of the unrelated bug fix for EKR
| |
| 1925 PORT_SetError(SSL_ERROR_INVALID_VERSION_RANGE); | 1925 PORT_SetError(SSL_ERROR_INVALID_VERSION_RANGE); |
| 1926 return SECFailure; | 1926 return SECFailure; |
| 1927 } | 1927 } |
| 1928 | 1928 |
| 1929 ssl_Get1stHandshakeLock(ss); | 1929 ssl_Get1stHandshakeLock(ss); |
| 1930 ssl_GetSSL3HandshakeLock(ss); | 1930 ssl_GetSSL3HandshakeLock(ss); |
| 1931 | 1931 |
| 1932 ss->vrange = *vrange; | 1932 ss->vrange = *vrange; |
| 1933 | 1933 |
| 1934 ssl_ReleaseSSL3HandshakeLock(ss); | 1934 ssl_ReleaseSSL3HandshakeLock(ss); |
| (...skipping 1131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3066 ssl_DestroySocketContents(ss); | 3066 ssl_DestroySocketContents(ss); |
| 3067 ssl_DestroyLocks(ss); | 3067 ssl_DestroyLocks(ss); |
| 3068 PORT_Free(ss); | 3068 PORT_Free(ss); |
| 3069 ss = NULL; | 3069 ss = NULL; |
| 3070 } | 3070 } |
| 3071 ss->protocolVariant = protocolVariant; | 3071 ss->protocolVariant = protocolVariant; |
| 3072 } | 3072 } |
| 3073 return ss; | 3073 return ss; |
| 3074 } | 3074 } |
| 3075 | 3075 |
| OLD | NEW |