diff options
Diffstat (limited to 'lib/libssl')
| -rw-r--r-- | lib/libssl/src/crypto/asn1/a_gentm.c | 6 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/asn1/a_time.c | 4 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/ts/ts_rsp_sign.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/lib/libssl/src/crypto/asn1/a_gentm.c b/lib/libssl/src/crypto/asn1/a_gentm.c index bc3453f410e..4cee40437cc 100644 --- a/lib/libssl/src/crypto/asn1/a_gentm.c +++ b/lib/libssl/src/crypto/asn1/a_gentm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: a_gentm.c,v 1.23 2015/02/07 13:19:15 doug Exp $ */ +/* $OpenBSD: a_gentm.c,v 1.24 2015/09/30 18:04:02 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -218,7 +218,7 @@ ASN1_GENERALIZEDTIME_adj(ASN1_GENERALIZEDTIME *s, time_t t, int offset_day, ASN1_GENERALIZEDTIME *tmp = NULL, *ret; if (s == NULL) { - tmp = M_ASN1_GENERALIZEDTIME_new(); + tmp = ASN1_GENERALIZEDTIME_new(); if (tmp == NULL) return NULL; s = tmp; @@ -226,7 +226,7 @@ ASN1_GENERALIZEDTIME_adj(ASN1_GENERALIZEDTIME *s, time_t t, int offset_day, ret = ASN1_GENERALIZEDTIME_adj_internal(s, t, offset_day, offset_sec); if (ret == NULL && tmp != NULL) - M_ASN1_GENERALIZEDTIME_free(tmp); + ASN1_GENERALIZEDTIME_free(tmp); return ret; diff --git a/lib/libssl/src/crypto/asn1/a_time.c b/lib/libssl/src/crypto/asn1/a_time.c index f51a8b1fbe0..25a1805640e 100644 --- a/lib/libssl/src/crypto/asn1/a_time.c +++ b/lib/libssl/src/crypto/asn1/a_time.c @@ -1,4 +1,4 @@ -/* $OpenBSD: a_time.c,v 1.24 2015/07/24 13:49:58 jsing Exp $ */ +/* $OpenBSD: a_time.c,v 1.25 2015/09/30 18:04:02 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1999 The OpenSSL Project. All rights reserved. * @@ -173,7 +173,7 @@ ASN1_TIME_to_generalizedtime_internal(ASN1_TIME *t, ASN1_GENERALIZEDTIME **out) i = snprintf(str, newlen, "%s%s", (t->data[0] >= '5') ? "19" : "20", (char *) t->data); if (i == -1 || i >= newlen) { - M_ASN1_GENERALIZEDTIME_free(ret); + ASN1_GENERALIZEDTIME_free(ret); *out = NULL; return NULL; } diff --git a/lib/libssl/src/crypto/ts/ts_rsp_sign.c b/lib/libssl/src/crypto/ts/ts_rsp_sign.c index 27659e8f458..758d7473841 100644 --- a/lib/libssl/src/crypto/ts/ts_rsp_sign.c +++ b/lib/libssl/src/crypto/ts/ts_rsp_sign.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ts_rsp_sign.c,v 1.18 2014/07/12 16:03:37 miod Exp $ */ +/* $OpenBSD: ts_rsp_sign.c,v 1.19 2015/09/30 18:04:02 jsing Exp $ */ /* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL * project 2002. */ @@ -1008,7 +1008,7 @@ TS_RESP_set_genTime_with_precision(ASN1_GENERALIZEDTIME *asn1_time, goto err; /* Now call OpenSSL to check and set our genTime value */ - if (!asn1_time && !(asn1_time = M_ASN1_GENERALIZEDTIME_new())) + if (!asn1_time && !(asn1_time = ASN1_GENERALIZEDTIME_new())) goto err; if (!ASN1_GENERALIZEDTIME_set_string(asn1_time, genTime_str)) { ASN1_GENERALIZEDTIME_free(asn1_time); |