Revision f97a7ada lib/utils/x509.py

b/lib/utils/x509.py
1 1
#
2 2
#
3 3

  
4
# Copyright (C) 2006, 2007, 2010, 2011 Google Inc.
4
# Copyright (C) 2006, 2007, 2010, 2011, 2012 Google Inc.
5 5
#
6 6
# This program is free software; you can redistribute it and/or modify
7 7
# it under the terms of the GNU General Public License as published by
......
180 180
  # Depending on the pyOpenSSL version, this can just return (None, None)
181 181
  (not_before, not_after) = GetX509CertValidity(cert)
182 182

  
183
  now = time.time() + constants.NODE_MAX_CLOCK_SKEW
184

  
183 185
  return _VerifyCertificateInner(cert.has_expired(), not_before, not_after,
184
                                 time.time(), warn_days, error_days)
186
                                 now, warn_days, error_days)
185 187

  
186 188

  
187 189
def SignX509Certificate(cert, key, salt):

Also available in: Unified diff