diff options
| author | jsing <> | 2015-09-30 18:26:07 +0000 |
|---|---|---|
| committer | jsing <> | 2015-09-30 18:26:07 +0000 |
| commit | 05e5d9a5bb40624d103cbce35faadc1092d0662f (patch) | |
| tree | 15f0771b24251218acddcbd1847c6d17cd9875ba /src/lib | |
| parent | 8bd8d394b482272167d3349dfb5b0fa03779877b (diff) | |
| download | openbsd-05e5d9a5bb40624d103cbce35faadc1092d0662f.tar.gz openbsd-05e5d9a5bb40624d103cbce35faadc1092d0662f.tar.bz2 openbsd-05e5d9a5bb40624d103cbce35faadc1092d0662f.zip | |
Replace M_ASN1_UTCTIME_(new|free) with ASN1_UTCTIME_(new|free).
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/libcrypto/asn1/a_utctm.c | 6 | ||||
| -rw-r--r-- | src/lib/libssl/src/crypto/asn1/a_utctm.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libcrypto/asn1/a_utctm.c b/src/lib/libcrypto/asn1/a_utctm.c index aed855608d..ca19a8c7a0 100644 --- a/src/lib/libcrypto/asn1/a_utctm.c +++ b/src/lib/libcrypto/asn1/a_utctm.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: a_utctm.c,v 1.27 2014/07/11 08:44:47 jsing Exp $ */ | 1 | /* $OpenBSD: a_utctm.c,v 1.28 2015/09/30 18:26:07 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 | * |
| @@ -197,7 +197,7 @@ ASN1_UTCTIME_adj(ASN1_UTCTIME *s, time_t t, int offset_day, long offset_sec) | |||
| 197 | ASN1_UTCTIME *tmp = NULL, *ret; | 197 | ASN1_UTCTIME *tmp = NULL, *ret; |
| 198 | 198 | ||
| 199 | if (s == NULL) { | 199 | if (s == NULL) { |
| 200 | tmp = M_ASN1_UTCTIME_new(); | 200 | tmp = ASN1_UTCTIME_new(); |
| 201 | if (tmp == NULL) | 201 | if (tmp == NULL) |
| 202 | return NULL; | 202 | return NULL; |
| 203 | s = tmp; | 203 | s = tmp; |
| @@ -205,7 +205,7 @@ ASN1_UTCTIME_adj(ASN1_UTCTIME *s, time_t t, int offset_day, long offset_sec) | |||
| 205 | 205 | ||
| 206 | ret = ASN1_UTCTIME_adj_internal(s, t, offset_day, offset_sec); | 206 | ret = ASN1_UTCTIME_adj_internal(s, t, offset_day, offset_sec); |
| 207 | if (ret == NULL && tmp != NULL) | 207 | if (ret == NULL && tmp != NULL) |
| 208 | M_ASN1_UTCTIME_free(tmp); | 208 | ASN1_UTCTIME_free(tmp); |
| 209 | 209 | ||
| 210 | return ret; | 210 | return ret; |
| 211 | } | 211 | } |
diff --git a/src/lib/libssl/src/crypto/asn1/a_utctm.c b/src/lib/libssl/src/crypto/asn1/a_utctm.c index aed855608d..ca19a8c7a0 100644 --- a/src/lib/libssl/src/crypto/asn1/a_utctm.c +++ b/src/lib/libssl/src/crypto/asn1/a_utctm.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: a_utctm.c,v 1.27 2014/07/11 08:44:47 jsing Exp $ */ | 1 | /* $OpenBSD: a_utctm.c,v 1.28 2015/09/30 18:26:07 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 | * |
| @@ -197,7 +197,7 @@ ASN1_UTCTIME_adj(ASN1_UTCTIME *s, time_t t, int offset_day, long offset_sec) | |||
| 197 | ASN1_UTCTIME *tmp = NULL, *ret; | 197 | ASN1_UTCTIME *tmp = NULL, *ret; |
| 198 | 198 | ||
| 199 | if (s == NULL) { | 199 | if (s == NULL) { |
| 200 | tmp = M_ASN1_UTCTIME_new(); | 200 | tmp = ASN1_UTCTIME_new(); |
| 201 | if (tmp == NULL) | 201 | if (tmp == NULL) |
| 202 | return NULL; | 202 | return NULL; |
| 203 | s = tmp; | 203 | s = tmp; |
| @@ -205,7 +205,7 @@ ASN1_UTCTIME_adj(ASN1_UTCTIME *s, time_t t, int offset_day, long offset_sec) | |||
| 205 | 205 | ||
| 206 | ret = ASN1_UTCTIME_adj_internal(s, t, offset_day, offset_sec); | 206 | ret = ASN1_UTCTIME_adj_internal(s, t, offset_day, offset_sec); |
| 207 | if (ret == NULL && tmp != NULL) | 207 | if (ret == NULL && tmp != NULL) |
| 208 | M_ASN1_UTCTIME_free(tmp); | 208 | ASN1_UTCTIME_free(tmp); |
| 209 | 209 | ||
| 210 | return ret; | 210 | return ret; |
| 211 | } | 211 | } |