diff options
| author | jsing <> | 2015-09-30 18:04:02 +0000 |
|---|---|---|
| committer | jsing <> | 2015-09-30 18:04:02 +0000 |
| commit | 19f8db457572080e997c229267930d64b582b2ce (patch) | |
| tree | 9ecca773b943036872a410cb742840ffc22159bd /src/lib/libcrypto/asn1 | |
| parent | 40e8ba9c4d631b50c0d5d6298e3e88a1fc3b90a8 (diff) | |
| download | openbsd-19f8db457572080e997c229267930d64b582b2ce.tar.gz openbsd-19f8db457572080e997c229267930d64b582b2ce.tar.bz2 openbsd-19f8db457572080e997c229267930d64b582b2ce.zip | |
Replace M_ASN1_GENERALIZEDTIME_(new|free) with
ASN1_GENERALIZEDTIME_(new|free).
Diffstat (limited to 'src/lib/libcrypto/asn1')
| -rw-r--r-- | src/lib/libcrypto/asn1/a_gentm.c | 6 | ||||
| -rw-r--r-- | src/lib/libcrypto/asn1/a_time.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libcrypto/asn1/a_gentm.c b/src/lib/libcrypto/asn1/a_gentm.c index bc3453f410..4cee40437c 100644 --- a/src/lib/libcrypto/asn1/a_gentm.c +++ b/src/lib/libcrypto/asn1/a_gentm.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: a_gentm.c,v 1.23 2015/02/07 13:19:15 doug Exp $ */ | 1 | /* $OpenBSD: a_gentm.c,v 1.24 2015/09/30 18:04:02 jsing Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -218,7 +218,7 @@ ASN1_GENERALIZEDTIME_adj(ASN1_GENERALIZEDTIME *s, time_t t, int offset_day, | |||
| 218 | ASN1_GENERALIZEDTIME *tmp = NULL, *ret; | 218 | ASN1_GENERALIZEDTIME *tmp = NULL, *ret; |
| 219 | 219 | ||
| 220 | if (s == NULL) { | 220 | if (s == NULL) { |
| 221 | tmp = M_ASN1_GENERALIZEDTIME_new(); | 221 | tmp = ASN1_GENERALIZEDTIME_new(); |
| 222 | if (tmp == NULL) | 222 | if (tmp == NULL) |
| 223 | return NULL; | 223 | return NULL; |
| 224 | s = tmp; | 224 | s = tmp; |
| @@ -226,7 +226,7 @@ ASN1_GENERALIZEDTIME_adj(ASN1_GENERALIZEDTIME *s, time_t t, int offset_day, | |||
| 226 | 226 | ||
| 227 | ret = ASN1_GENERALIZEDTIME_adj_internal(s, t, offset_day, offset_sec); | 227 | ret = ASN1_GENERALIZEDTIME_adj_internal(s, t, offset_day, offset_sec); |
| 228 | if (ret == NULL && tmp != NULL) | 228 | if (ret == NULL && tmp != NULL) |
| 229 | M_ASN1_GENERALIZEDTIME_free(tmp); | 229 | ASN1_GENERALIZEDTIME_free(tmp); |
| 230 | 230 | ||
| 231 | return ret; | 231 | return ret; |
| 232 | 232 | ||
diff --git a/src/lib/libcrypto/asn1/a_time.c b/src/lib/libcrypto/asn1/a_time.c index f51a8b1fbe..25a1805640 100644 --- a/src/lib/libcrypto/asn1/a_time.c +++ b/src/lib/libcrypto/asn1/a_time.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: a_time.c,v 1.24 2015/07/24 13:49:58 jsing Exp $ */ | 1 | /* $OpenBSD: a_time.c,v 1.25 2015/09/30 18:04:02 jsing Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright (c) 1999 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1999 The OpenSSL Project. All rights reserved. |
| 4 | * | 4 | * |
| @@ -173,7 +173,7 @@ ASN1_TIME_to_generalizedtime_internal(ASN1_TIME *t, ASN1_GENERALIZEDTIME **out) | |||
| 173 | i = snprintf(str, newlen, "%s%s", (t->data[0] >= '5') ? "19" : "20", | 173 | i = snprintf(str, newlen, "%s%s", (t->data[0] >= '5') ? "19" : "20", |
| 174 | (char *) t->data); | 174 | (char *) t->data); |
| 175 | if (i == -1 || i >= newlen) { | 175 | if (i == -1 || i >= newlen) { |
| 176 | M_ASN1_GENERALIZEDTIME_free(ret); | 176 | ASN1_GENERALIZEDTIME_free(ret); |
| 177 | *out = NULL; | 177 | *out = NULL; |
| 178 | return NULL; | 178 | return NULL; |
| 179 | } | 179 | } |
