diff options
| author | jsing <> | 2015-09-30 18:45:56 +0000 |
|---|---|---|
| committer | jsing <> | 2015-09-30 18:45:56 +0000 |
| commit | 0ec69fad35d79387923d81efc10dc1deafa00e16 (patch) | |
| tree | 8f36769f8de48b1b57750accec5db0a1659731d4 /src | |
| parent | bfadb4881fd0184be7b44bec090d8c18a238fd40 (diff) | |
| download | openbsd-0ec69fad35d79387923d81efc10dc1deafa00e16.tar.gz openbsd-0ec69fad35d79387923d81efc10dc1deafa00e16.tar.bz2 openbsd-0ec69fad35d79387923d81efc10dc1deafa00e16.zip | |
Replace M_ASN1_ENUMERATED_(free|new) with ASN1_ENUMERATED_(free|new).
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/asn1/a_enum.c | 6 | ||||
| -rw-r--r-- | src/lib/libssl/src/crypto/asn1/a_enum.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libcrypto/asn1/a_enum.c b/src/lib/libcrypto/asn1/a_enum.c index 3c059266be..142f6ed575 100644 --- a/src/lib/libcrypto/asn1/a_enum.c +++ b/src/lib/libcrypto/asn1/a_enum.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: a_enum.c,v 1.16 2014/09/21 12:17:42 miod Exp $ */ | 1 | /* $OpenBSD: a_enum.c,v 1.17 2015/09/30 18:45:56 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 | * |
| @@ -140,7 +140,7 @@ BN_to_ASN1_ENUMERATED(BIGNUM *bn, ASN1_ENUMERATED *ai) | |||
| 140 | int len, j; | 140 | int len, j; |
| 141 | 141 | ||
| 142 | if (ai == NULL) | 142 | if (ai == NULL) |
| 143 | ret = M_ASN1_ENUMERATED_new(); | 143 | ret = ASN1_ENUMERATED_new(); |
| 144 | else | 144 | else |
| 145 | ret = ai; | 145 | ret = ai; |
| 146 | if (ret == NULL) { | 146 | if (ret == NULL) { |
| @@ -172,7 +172,7 @@ BN_to_ASN1_ENUMERATED(BIGNUM *bn, ASN1_ENUMERATED *ai) | |||
| 172 | 172 | ||
| 173 | err: | 173 | err: |
| 174 | if (ret != ai) | 174 | if (ret != ai) |
| 175 | M_ASN1_ENUMERATED_free(ret); | 175 | ASN1_ENUMERATED_free(ret); |
| 176 | return (NULL); | 176 | return (NULL); |
| 177 | } | 177 | } |
| 178 | 178 | ||
diff --git a/src/lib/libssl/src/crypto/asn1/a_enum.c b/src/lib/libssl/src/crypto/asn1/a_enum.c index 3c059266be..142f6ed575 100644 --- a/src/lib/libssl/src/crypto/asn1/a_enum.c +++ b/src/lib/libssl/src/crypto/asn1/a_enum.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: a_enum.c,v 1.16 2014/09/21 12:17:42 miod Exp $ */ | 1 | /* $OpenBSD: a_enum.c,v 1.17 2015/09/30 18:45:56 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 | * |
| @@ -140,7 +140,7 @@ BN_to_ASN1_ENUMERATED(BIGNUM *bn, ASN1_ENUMERATED *ai) | |||
| 140 | int len, j; | 140 | int len, j; |
| 141 | 141 | ||
| 142 | if (ai == NULL) | 142 | if (ai == NULL) |
| 143 | ret = M_ASN1_ENUMERATED_new(); | 143 | ret = ASN1_ENUMERATED_new(); |
| 144 | else | 144 | else |
| 145 | ret = ai; | 145 | ret = ai; |
| 146 | if (ret == NULL) { | 146 | if (ret == NULL) { |
| @@ -172,7 +172,7 @@ BN_to_ASN1_ENUMERATED(BIGNUM *bn, ASN1_ENUMERATED *ai) | |||
| 172 | 172 | ||
| 173 | err: | 173 | err: |
| 174 | if (ret != ai) | 174 | if (ret != ai) |
| 175 | M_ASN1_ENUMERATED_free(ret); | 175 | ASN1_ENUMERATED_free(ret); |
| 176 | return (NULL); | 176 | return (NULL); |
| 177 | } | 177 | } |
| 178 | 178 | ||
