From 91af0933b080d8e84e238dd366f91808c0cdaae3 Mon Sep 17 00:00:00 2001 From: jsing <> Date: Wed, 30 Sep 2015 17:04:09 +0000 Subject: Remove unnecessary type assignments - M_ASN1_INTEGER_new() already sets the type to V_ASN1_INTEGER. ok doug@ --- src/lib/libcrypto/asn1/a_int.c | 4 +--- 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 @@ -/* $OpenBSD: a_int.c,v 1.28 2015/07/29 14:58:34 jsing Exp $ */ +/* $OpenBSD: a_int.c,v 1.29 2015/09/30 17:04:09 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -198,7 +198,6 @@ c2i_ASN1_INTEGER(ASN1_INTEGER **a, const unsigned char **pp, long len) if ((a == NULL) || ((*a) == NULL)) { if ((ret = M_ASN1_INTEGER_new()) == NULL) return (NULL); - ret->type = V_ASN1_INTEGER; } else ret = (*a); @@ -292,7 +291,6 @@ d2i_ASN1_UINTEGER(ASN1_INTEGER **a, const unsigned char **pp, long length) if ((a == NULL) || ((*a) == NULL)) { if ((ret = M_ASN1_INTEGER_new()) == NULL) return (NULL); - ret->type = V_ASN1_INTEGER; } else ret = (*a); 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 @@ -/* $OpenBSD: a_int.c,v 1.28 2015/07/29 14:58:34 jsing Exp $ */ +/* $OpenBSD: a_int.c,v 1.29 2015/09/30 17:04:09 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -198,7 +198,6 @@ c2i_ASN1_INTEGER(ASN1_INTEGER **a, const unsigned char **pp, long len) if ((a == NULL) || ((*a) == NULL)) { if ((ret = M_ASN1_INTEGER_new()) == NULL) return (NULL); - ret->type = V_ASN1_INTEGER; } else ret = (*a); @@ -292,7 +291,6 @@ d2i_ASN1_UINTEGER(ASN1_INTEGER **a, const unsigned char **pp, long length) if ((a == NULL) || ((*a) == NULL)) { if ((ret = M_ASN1_INTEGER_new()) == NULL) return (NULL); - ret->type = V_ASN1_INTEGER; } else ret = (*a); -- cgit v1.2.3-55-g6feb