diff options
| author | jsing <> | 2015-09-30 17:49:59 +0000 |
|---|---|---|
| committer | jsing <> | 2015-09-30 17:49:59 +0000 |
| commit | da3eb82aa9ab17870adc2479f9053b8d8805b853 (patch) | |
| tree | c8d1491e1a80d090dccca52ca188edfa54561da0 /src/lib | |
| parent | 1c7e31c2bbb07475f068a459f144cb492d148ec2 (diff) | |
| download | openbsd-da3eb82aa9ab17870adc2479f9053b8d8805b853.tar.gz openbsd-da3eb82aa9ab17870adc2479f9053b8d8805b853.tar.bz2 openbsd-da3eb82aa9ab17870adc2479f9053b8d8805b853.zip | |
s/M_ASN1_TIME_free/ASN1_TIME_free/
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/libcrypto/x509/x509_set.c | 6 | ||||
| -rw-r--r-- | src/lib/libcrypto/x509/x509cset.c | 8 | ||||
| -rw-r--r-- | src/lib/libssl/src/crypto/x509/x509_set.c | 6 | ||||
| -rw-r--r-- | src/lib/libssl/src/crypto/x509/x509cset.c | 8 |
4 files changed, 14 insertions, 14 deletions
diff --git a/src/lib/libcrypto/x509/x509_set.c b/src/lib/libcrypto/x509/x509_set.c index e77b49ea95..aeaf161024 100644 --- a/src/lib/libcrypto/x509/x509_set.c +++ b/src/lib/libcrypto/x509/x509_set.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509_set.c,v 1.11 2015/09/30 17:30:16 jsing Exp $ */ | 1 | /* $OpenBSD: x509_set.c,v 1.12 2015/09/30 17:49:59 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 | * |
| @@ -120,7 +120,7 @@ X509_set_notBefore(X509 *x, const ASN1_TIME *tm) | |||
| 120 | if (in != tm) { | 120 | if (in != tm) { |
| 121 | in = ASN1_STRING_dup(tm); | 121 | in = ASN1_STRING_dup(tm); |
| 122 | if (in != NULL) { | 122 | if (in != NULL) { |
| 123 | M_ASN1_TIME_free(x->cert_info->validity->notBefore); | 123 | ASN1_TIME_free(x->cert_info->validity->notBefore); |
| 124 | x->cert_info->validity->notBefore = in; | 124 | x->cert_info->validity->notBefore = in; |
| 125 | } | 125 | } |
| 126 | } | 126 | } |
| @@ -138,7 +138,7 @@ X509_set_notAfter(X509 *x, const ASN1_TIME *tm) | |||
| 138 | if (in != tm) { | 138 | if (in != tm) { |
| 139 | in = ASN1_STRING_dup(tm); | 139 | in = ASN1_STRING_dup(tm); |
| 140 | if (in != NULL) { | 140 | if (in != NULL) { |
| 141 | M_ASN1_TIME_free(x->cert_info->validity->notAfter); | 141 | ASN1_TIME_free(x->cert_info->validity->notAfter); |
| 142 | x->cert_info->validity->notAfter = in; | 142 | x->cert_info->validity->notAfter = in; |
| 143 | } | 143 | } |
| 144 | } | 144 | } |
diff --git a/src/lib/libcrypto/x509/x509cset.c b/src/lib/libcrypto/x509/x509cset.c index a0fbdfbc3b..afc1f0f2b3 100644 --- a/src/lib/libcrypto/x509/x509cset.c +++ b/src/lib/libcrypto/x509/x509cset.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509cset.c,v 1.10 2015/09/30 17:30:16 jsing Exp $ */ | 1 | /* $OpenBSD: x509cset.c,v 1.11 2015/09/30 17:49:59 jsing Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 2001. | 3 | * project 2001. |
| 4 | */ | 4 | */ |
| @@ -94,7 +94,7 @@ X509_CRL_set_lastUpdate(X509_CRL *x, const ASN1_TIME *tm) | |||
| 94 | if (in != tm) { | 94 | if (in != tm) { |
| 95 | in = ASN1_STRING_dup(tm); | 95 | in = ASN1_STRING_dup(tm); |
| 96 | if (in != NULL) { | 96 | if (in != NULL) { |
| 97 | M_ASN1_TIME_free(x->crl->lastUpdate); | 97 | ASN1_TIME_free(x->crl->lastUpdate); |
| 98 | x->crl->lastUpdate = in; | 98 | x->crl->lastUpdate = in; |
| 99 | } | 99 | } |
| 100 | } | 100 | } |
| @@ -112,7 +112,7 @@ X509_CRL_set_nextUpdate(X509_CRL *x, const ASN1_TIME *tm) | |||
| 112 | if (in != tm) { | 112 | if (in != tm) { |
| 113 | in = ASN1_STRING_dup(tm); | 113 | in = ASN1_STRING_dup(tm); |
| 114 | if (in != NULL) { | 114 | if (in != NULL) { |
| 115 | M_ASN1_TIME_free(x->crl->nextUpdate); | 115 | ASN1_TIME_free(x->crl->nextUpdate); |
| 116 | x->crl->nextUpdate = in; | 116 | x->crl->nextUpdate = in; |
| 117 | } | 117 | } |
| 118 | } | 118 | } |
| @@ -147,7 +147,7 @@ X509_REVOKED_set_revocationDate(X509_REVOKED *x, ASN1_TIME *tm) | |||
| 147 | if (in != tm) { | 147 | if (in != tm) { |
| 148 | in = ASN1_STRING_dup(tm); | 148 | in = ASN1_STRING_dup(tm); |
| 149 | if (in != NULL) { | 149 | if (in != NULL) { |
| 150 | M_ASN1_TIME_free(x->revocationDate); | 150 | ASN1_TIME_free(x->revocationDate); |
| 151 | x->revocationDate = in; | 151 | x->revocationDate = in; |
| 152 | } | 152 | } |
| 153 | } | 153 | } |
diff --git a/src/lib/libssl/src/crypto/x509/x509_set.c b/src/lib/libssl/src/crypto/x509/x509_set.c index e77b49ea95..aeaf161024 100644 --- a/src/lib/libssl/src/crypto/x509/x509_set.c +++ b/src/lib/libssl/src/crypto/x509/x509_set.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509_set.c,v 1.11 2015/09/30 17:30:16 jsing Exp $ */ | 1 | /* $OpenBSD: x509_set.c,v 1.12 2015/09/30 17:49:59 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 | * |
| @@ -120,7 +120,7 @@ X509_set_notBefore(X509 *x, const ASN1_TIME *tm) | |||
| 120 | if (in != tm) { | 120 | if (in != tm) { |
| 121 | in = ASN1_STRING_dup(tm); | 121 | in = ASN1_STRING_dup(tm); |
| 122 | if (in != NULL) { | 122 | if (in != NULL) { |
| 123 | M_ASN1_TIME_free(x->cert_info->validity->notBefore); | 123 | ASN1_TIME_free(x->cert_info->validity->notBefore); |
| 124 | x->cert_info->validity->notBefore = in; | 124 | x->cert_info->validity->notBefore = in; |
| 125 | } | 125 | } |
| 126 | } | 126 | } |
| @@ -138,7 +138,7 @@ X509_set_notAfter(X509 *x, const ASN1_TIME *tm) | |||
| 138 | if (in != tm) { | 138 | if (in != tm) { |
| 139 | in = ASN1_STRING_dup(tm); | 139 | in = ASN1_STRING_dup(tm); |
| 140 | if (in != NULL) { | 140 | if (in != NULL) { |
| 141 | M_ASN1_TIME_free(x->cert_info->validity->notAfter); | 141 | ASN1_TIME_free(x->cert_info->validity->notAfter); |
| 142 | x->cert_info->validity->notAfter = in; | 142 | x->cert_info->validity->notAfter = in; |
| 143 | } | 143 | } |
| 144 | } | 144 | } |
diff --git a/src/lib/libssl/src/crypto/x509/x509cset.c b/src/lib/libssl/src/crypto/x509/x509cset.c index a0fbdfbc3b..afc1f0f2b3 100644 --- a/src/lib/libssl/src/crypto/x509/x509cset.c +++ b/src/lib/libssl/src/crypto/x509/x509cset.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509cset.c,v 1.10 2015/09/30 17:30:16 jsing Exp $ */ | 1 | /* $OpenBSD: x509cset.c,v 1.11 2015/09/30 17:49:59 jsing Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 2001. | 3 | * project 2001. |
| 4 | */ | 4 | */ |
| @@ -94,7 +94,7 @@ X509_CRL_set_lastUpdate(X509_CRL *x, const ASN1_TIME *tm) | |||
| 94 | if (in != tm) { | 94 | if (in != tm) { |
| 95 | in = ASN1_STRING_dup(tm); | 95 | in = ASN1_STRING_dup(tm); |
| 96 | if (in != NULL) { | 96 | if (in != NULL) { |
| 97 | M_ASN1_TIME_free(x->crl->lastUpdate); | 97 | ASN1_TIME_free(x->crl->lastUpdate); |
| 98 | x->crl->lastUpdate = in; | 98 | x->crl->lastUpdate = in; |
| 99 | } | 99 | } |
| 100 | } | 100 | } |
| @@ -112,7 +112,7 @@ X509_CRL_set_nextUpdate(X509_CRL *x, const ASN1_TIME *tm) | |||
| 112 | if (in != tm) { | 112 | if (in != tm) { |
| 113 | in = ASN1_STRING_dup(tm); | 113 | in = ASN1_STRING_dup(tm); |
| 114 | if (in != NULL) { | 114 | if (in != NULL) { |
| 115 | M_ASN1_TIME_free(x->crl->nextUpdate); | 115 | ASN1_TIME_free(x->crl->nextUpdate); |
| 116 | x->crl->nextUpdate = in; | 116 | x->crl->nextUpdate = in; |
| 117 | } | 117 | } |
| 118 | } | 118 | } |
| @@ -147,7 +147,7 @@ X509_REVOKED_set_revocationDate(X509_REVOKED *x, ASN1_TIME *tm) | |||
| 147 | if (in != tm) { | 147 | if (in != tm) { |
| 148 | in = ASN1_STRING_dup(tm); | 148 | in = ASN1_STRING_dup(tm); |
| 149 | if (in != NULL) { | 149 | if (in != NULL) { |
| 150 | M_ASN1_TIME_free(x->revocationDate); | 150 | ASN1_TIME_free(x->revocationDate); |
| 151 | x->revocationDate = in; | 151 | x->revocationDate = in; |
| 152 | } | 152 | } |
| 153 | } | 153 | } |