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

Side by Side Diff: net/cert/cert_status_flags.cc

Issue 20628006: Reject certificates that are valid for too long. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/cert/cert_status_flags.h" 5 #include "net/cert/cert_status_flags.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "net/base/net_errors.h" 8 #include "net/base/net_errors.h"
9 9
10 namespace net { 10 namespace net {
(...skipping 25 matching lines...) Expand all
36 // We should not use ERR_CERT_CONTAINS_ERRORS in new code. 36 // We should not use ERR_CERT_CONTAINS_ERRORS in new code.
37 case ERR_CERT_CONTAINS_ERRORS: 37 case ERR_CERT_CONTAINS_ERRORS:
38 NOTREACHED(); 38 NOTREACHED();
39 // Falls through. 39 // Falls through.
40 case ERR_CERT_INVALID: 40 case ERR_CERT_INVALID:
41 return CERT_STATUS_INVALID; 41 return CERT_STATUS_INVALID;
42 case ERR_CERT_WEAK_SIGNATURE_ALGORITHM: 42 case ERR_CERT_WEAK_SIGNATURE_ALGORITHM:
43 return CERT_STATUS_WEAK_SIGNATURE_ALGORITHM; 43 return CERT_STATUS_WEAK_SIGNATURE_ALGORITHM;
44 case ERR_CERT_WEAK_KEY: 44 case ERR_CERT_WEAK_KEY:
45 return CERT_STATUS_WEAK_KEY; 45 return CERT_STATUS_WEAK_KEY;
46 case ERR_CERT_TOO_LONG_VALIDITY:
47 return CERT_STATUS_TOO_LONG_VALIDITY;
46 default: 48 default:
47 return 0; 49 return 0;
48 } 50 }
49 } 51 }
50 52
51 int MapCertStatusToNetError(CertStatus cert_status) { 53 int MapCertStatusToNetError(CertStatus cert_status) {
52 // A certificate may have multiple errors. We report the most 54 // A certificate may have multiple errors. We report the most
53 // serious error. 55 // serious error.
54 56
55 // Unrecoverable errors 57 // Unrecoverable errors
56 if (cert_status & CERT_STATUS_REVOKED) 58 if (cert_status & CERT_STATUS_REVOKED)
57 return ERR_CERT_REVOKED; 59 return ERR_CERT_REVOKED;
58 if (cert_status & CERT_STATUS_INVALID) 60 if (cert_status & CERT_STATUS_INVALID)
59 return ERR_CERT_INVALID; 61 return ERR_CERT_INVALID;
60 62
61 // Recoverable errors 63 // Recoverable errors
62 if (cert_status & CERT_STATUS_AUTHORITY_INVALID) 64 if (cert_status & CERT_STATUS_AUTHORITY_INVALID)
63 return ERR_CERT_AUTHORITY_INVALID; 65 return ERR_CERT_AUTHORITY_INVALID;
64 if (cert_status & CERT_STATUS_COMMON_NAME_INVALID) 66 if (cert_status & CERT_STATUS_COMMON_NAME_INVALID)
65 return ERR_CERT_COMMON_NAME_INVALID; 67 return ERR_CERT_COMMON_NAME_INVALID;
66 if (cert_status & CERT_STATUS_WEAK_SIGNATURE_ALGORITHM) 68 if (cert_status & CERT_STATUS_WEAK_SIGNATURE_ALGORITHM)
67 return ERR_CERT_WEAK_SIGNATURE_ALGORITHM; 69 return ERR_CERT_WEAK_SIGNATURE_ALGORITHM;
68 if (cert_status & CERT_STATUS_WEAK_KEY) 70 if (cert_status & CERT_STATUS_WEAK_KEY)
69 return ERR_CERT_WEAK_KEY; 71 return ERR_CERT_WEAK_KEY;
70 if (cert_status & CERT_STATUS_DATE_INVALID) 72 if (cert_status & CERT_STATUS_DATE_INVALID)
71 return ERR_CERT_DATE_INVALID; 73 return ERR_CERT_DATE_INVALID;
74 if (cert_status & CERT_STATUS_TOO_LONG_VALIDITY)
75 return ERR_CERT_TOO_LONG_VALIDITY;
72 76
73 // Unknown status. Give it the benefit of the doubt. 77 // Unknown status. Give it the benefit of the doubt.
74 if (cert_status & CERT_STATUS_UNABLE_TO_CHECK_REVOCATION) 78 if (cert_status & CERT_STATUS_UNABLE_TO_CHECK_REVOCATION)
75 return ERR_CERT_UNABLE_TO_CHECK_REVOCATION; 79 return ERR_CERT_UNABLE_TO_CHECK_REVOCATION;
76 if (cert_status & CERT_STATUS_NO_REVOCATION_MECHANISM) 80 if (cert_status & CERT_STATUS_NO_REVOCATION_MECHANISM)
77 return ERR_CERT_NO_REVOCATION_MECHANISM; 81 return ERR_CERT_NO_REVOCATION_MECHANISM;
78 82
79 NOTREACHED(); 83 NOTREACHED();
80 return ERR_UNEXPECTED; 84 return ERR_UNEXPECTED;
81 } 85 }
82 86
83 } // namespace net 87 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698