diff options
author | jsing <> | 2015-09-30 17:04:09 +0000 |
---|---|---|
committer | jsing <> | 2015-09-30 17:04:09 +0000 |
commit | 91af0933b080d8e84e238dd366f91808c0cdaae3 (patch) | |
tree | bee003d3239a3891de597b42e2787969cb25d4dd | |
parent | 24627f91d4485d77d06e87b7167b7bea9a6b84fe (diff) | |
download | openbsd-91af0933b080d8e84e238dd366f91808c0cdaae3.tar.gz openbsd-91af0933b080d8e84e238dd366f91808c0cdaae3.tar.bz2 openbsd-91af0933b080d8e84e238dd366f91808c0cdaae3.zip |
Remove unnecessary type assignments - M_ASN1_INTEGER_new() already sets
the type to V_ASN1_INTEGER.
ok doug@
-rw-r--r-- | src/lib/libcrypto/asn1/a_int.c | 4 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/asn1/a_int.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/lib/libcrypto/asn1/a_int.c b/src/lib/libcrypto/asn1/a_int.c index 6a378c0884..cbe68ec6d8 100644 --- a/src/lib/libcrypto/asn1/a_int.c +++ b/src/lib/libcrypto/asn1/a_int.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: a_int.c,v 1.28 2015/07/29 14:58:34 jsing Exp $ */ | 1 | /* $OpenBSD: a_int.c,v 1.29 2015/09/30 17:04:09 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 | * |
@@ -198,7 +198,6 @@ c2i_ASN1_INTEGER(ASN1_INTEGER **a, const unsigned char **pp, long len) | |||
198 | if ((a == NULL) || ((*a) == NULL)) { | 198 | if ((a == NULL) || ((*a) == NULL)) { |
199 | if ((ret = M_ASN1_INTEGER_new()) == NULL) | 199 | if ((ret = M_ASN1_INTEGER_new()) == NULL) |
200 | return (NULL); | 200 | return (NULL); |
201 | ret->type = V_ASN1_INTEGER; | ||
202 | } else | 201 | } else |
203 | ret = (*a); | 202 | ret = (*a); |
204 | 203 | ||
@@ -292,7 +291,6 @@ d2i_ASN1_UINTEGER(ASN1_INTEGER **a, const unsigned char **pp, long length) | |||
292 | if ((a == NULL) || ((*a) == NULL)) { | 291 | if ((a == NULL) || ((*a) == NULL)) { |
293 | if ((ret = M_ASN1_INTEGER_new()) == NULL) | 292 | if ((ret = M_ASN1_INTEGER_new()) == NULL) |
294 | return (NULL); | 293 | return (NULL); |
295 | ret->type = V_ASN1_INTEGER; | ||
296 | } else | 294 | } else |
297 | ret = (*a); | 295 | ret = (*a); |
298 | 296 | ||
diff --git a/src/lib/libssl/src/crypto/asn1/a_int.c b/src/lib/libssl/src/crypto/asn1/a_int.c index 6a378c0884..cbe68ec6d8 100644 --- a/src/lib/libssl/src/crypto/asn1/a_int.c +++ b/src/lib/libssl/src/crypto/asn1/a_int.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: a_int.c,v 1.28 2015/07/29 14:58:34 jsing Exp $ */ | 1 | /* $OpenBSD: a_int.c,v 1.29 2015/09/30 17:04:09 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 | * |
@@ -198,7 +198,6 @@ c2i_ASN1_INTEGER(ASN1_INTEGER **a, const unsigned char **pp, long len) | |||
198 | if ((a == NULL) || ((*a) == NULL)) { | 198 | if ((a == NULL) || ((*a) == NULL)) { |
199 | if ((ret = M_ASN1_INTEGER_new()) == NULL) | 199 | if ((ret = M_ASN1_INTEGER_new()) == NULL) |
200 | return (NULL); | 200 | return (NULL); |
201 | ret->type = V_ASN1_INTEGER; | ||
202 | } else | 201 | } else |
203 | ret = (*a); | 202 | ret = (*a); |
204 | 203 | ||
@@ -292,7 +291,6 @@ d2i_ASN1_UINTEGER(ASN1_INTEGER **a, const unsigned char **pp, long length) | |||
292 | if ((a == NULL) || ((*a) == NULL)) { | 291 | if ((a == NULL) || ((*a) == NULL)) { |
293 | if ((ret = M_ASN1_INTEGER_new()) == NULL) | 292 | if ((ret = M_ASN1_INTEGER_new()) == NULL) |
294 | return (NULL); | 293 | return (NULL); |
295 | ret->type = V_ASN1_INTEGER; | ||
296 | } else | 294 | } else |
297 | ret = (*a); | 295 | ret = (*a); |
298 | 296 | ||