diff options
-rw-r--r-- | crypto/asymmetric_keys/x509_public_key.c | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/crypto/asymmetric_keys/x509_public_key.c b/crypto/asymmetric_keys/x509_public_key.c index 06007f0e880c..52222a2f34ba 100644 --- a/crypto/asymmetric_keys/x509_public_key.c +++ b/crypto/asymmetric_keys/x509_public_key.c | |||
@@ -106,7 +106,6 @@ error_no_sig: | |||
106 | static int x509_key_preparse(struct key_preparsed_payload *prep) | 106 | static int x509_key_preparse(struct key_preparsed_payload *prep) |
107 | { | 107 | { |
108 | struct x509_certificate *cert; | 108 | struct x509_certificate *cert; |
109 | struct tm now; | ||
110 | size_t srlen, sulen; | 109 | size_t srlen, sulen; |
111 | char *desc = NULL; | 110 | char *desc = NULL; |
112 | int ret; | 111 | int ret; |
@@ -137,43 +136,6 @@ static int x509_key_preparse(struct key_preparsed_payload *prep) | |||
137 | goto error_free_cert; | 136 | goto error_free_cert; |
138 | } | 137 | } |
139 | 138 | ||
140 | time_to_tm(CURRENT_TIME.tv_sec, 0, &now); | ||
141 | pr_devel("Now: %04ld-%02d-%02d %02d:%02d:%02d\n", | ||
142 | now.tm_year + 1900, now.tm_mon + 1, now.tm_mday, | ||
143 | now.tm_hour, now.tm_min, now.tm_sec); | ||
144 | if (now.tm_year < cert->valid_from.tm_year || | ||
145 | (now.tm_year == cert->valid_from.tm_year && | ||
146 | (now.tm_mon < cert->valid_from.tm_mon || | ||
147 | (now.tm_mon == cert->valid_from.tm_mon && | ||
148 | (now.tm_mday < cert->valid_from.tm_mday || | ||
149 | (now.tm_mday == cert->valid_from.tm_mday && | ||
150 | (now.tm_hour < cert->valid_from.tm_hour || | ||
151 | (now.tm_hour == cert->valid_from.tm_hour && | ||
152 | (now.tm_min < cert->valid_from.tm_min || | ||
153 | (now.tm_min == cert->valid_from.tm_min && | ||
154 | (now.tm_sec < cert->valid_from.tm_sec | ||
155 | ))))))))))) { | ||
156 | pr_warn("Cert %s is not yet valid\n", cert->fingerprint); | ||
157 | ret = -EKEYREJECTED; | ||
158 | goto error_free_cert; | ||
159 | } | ||
160 | if (now.tm_year > cert->valid_to.tm_year || | ||
161 | (now.tm_year == cert->valid_to.tm_year && | ||
162 | (now.tm_mon > cert->valid_to.tm_mon || | ||
163 | (now.tm_mon == cert->valid_to.tm_mon && | ||
164 | (now.tm_mday > cert->valid_to.tm_mday || | ||
165 | (now.tm_mday == cert->valid_to.tm_mday && | ||
166 | (now.tm_hour > cert->valid_to.tm_hour || | ||
167 | (now.tm_hour == cert->valid_to.tm_hour && | ||
168 | (now.tm_min > cert->valid_to.tm_min || | ||
169 | (now.tm_min == cert->valid_to.tm_min && | ||
170 | (now.tm_sec > cert->valid_to.tm_sec | ||
171 | ))))))))))) { | ||
172 | pr_warn("Cert %s has expired\n", cert->fingerprint); | ||
173 | ret = -EKEYEXPIRED; | ||
174 | goto error_free_cert; | ||
175 | } | ||
176 | |||
177 | cert->pub->algo = x509_public_key_algorithms[cert->pkey_algo]; | 139 | cert->pub->algo = x509_public_key_algorithms[cert->pkey_algo]; |
178 | cert->pub->id_type = PKEY_ID_X509; | 140 | cert->pub->id_type = PKEY_ID_X509; |
179 | 141 | ||