wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change return (x) to return x

Browse source 
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3912)
This commit is contained in:
Pauli 2017-07-13 08:23:22 +10:00
parent a9a157e74a
commit 1f06acc08f
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
crypto/asn1/asn1_lib.c
View file

@ -23,12 +23,12 @@ static int _asn1_check_infinite_end(const unsigned char **p, long len)
* If there is 0 or 1 byte left, the length check should pick things up * If there is 0 or 1 byte left, the length check should pick things up
*/ */
if (len <= 0) if (len <= 0)
return (1); return 1;
else if ((len >= 2) && ((*p)[0] == 0) && ((*p)[1] == 0)) { else if ((len >= 2) && ((*p)[0] == 0) && ((*p)[1] == 0)) {
(*p) += 2; (*p) += 2;
return (1); return 1;
} }
return (0); return 0;
} }
int ASN1_check_infinite_end(unsigned char **p, long len) int ASN1_check_infinite_end(unsigned char **p, long len)
@ -96,10 +96,10 @@ int ASN1_get_object(const unsigned char **pp, long *plength, int *ptag,
ret |= 0x80; ret |= 0x80;
} }
*pp = p; *pp = p;
return (ret | inf); return ret | inf;
err: err:
ASN1err(ASN1_F_ASN1_GET_OBJECT, ASN1_R_HEADER_TOO_LONG); ASN1err(ASN1_F_ASN1_GET_OBJECT, ASN1_R_HEADER_TOO_LONG);
return (0x80); return 0x80;
} }
/* /*
@ -275,7 +275,7 @@ int ASN1_STRING_set(ASN1_STRING *str, const void *_data, int len)
if (len < 0) { if (len < 0) {
if (data == NULL) if (data == NULL)
return (0); return 0;
else else
len = strlen(data); len = strlen(data);
} }
@ -285,7 +285,7 @@ int ASN1_STRING_set(ASN1_STRING *str, const void *_data, int len)
if (str->data == NULL) { if (str->data == NULL) {
ASN1err(ASN1_F_ASN1_STRING_SET, ERR_R_MALLOC_FAILURE); ASN1err(ASN1_F_ASN1_STRING_SET, ERR_R_MALLOC_FAILURE);
str->data = c; str->data = c;
return (0); return 0;
} }
} }
str->length = len; str->length = len;
@ -294,7 +294,7 @@ int ASN1_STRING_set(ASN1_STRING *str, const void *_data, int len)
/* an allowance for strings :-) */ /* an allowance for strings :-) */
str->data[len] = '\0'; str->data[len] = '\0';
} }
return (1); return 1;
} }
void ASN1_STRING_set0(ASN1_STRING *str, void *data, int len) void ASN1_STRING_set0(ASN1_STRING *str, void *data, int len)
@ -306,7 +306,7 @@ void ASN1_STRING_set0(ASN1_STRING *str, void *data, int len)
ASN1_STRING *ASN1_STRING_new(void) ASN1_STRING *ASN1_STRING_new(void)
{ {
return (ASN1_STRING_type_new(V_ASN1_OCTET_STRING)); return ASN1_STRING_type_new(V_ASN1_OCTET_STRING);
} }
ASN1_STRING *ASN1_STRING_type_new(int type) ASN1_STRING *ASN1_STRING_type_new(int type)
@ -316,10 +316,10 @@ ASN1_STRING *ASN1_STRING_type_new(int type)
ret = OPENSSL_zalloc(sizeof(*ret)); ret = OPENSSL_zalloc(sizeof(*ret));
if (ret == NULL) { if (ret == NULL) {
ASN1err(ASN1_F_ASN1_STRING_TYPE_NEW, ERR_R_MALLOC_FAILURE); ASN1err(ASN1_F_ASN1_STRING_TYPE_NEW, ERR_R_MALLOC_FAILURE);
return (NULL); return NULL;
} }
ret->type = type; ret->type = type;
return (ret); return ret;
} }
void asn1_string_embed_free(ASN1_STRING *a, int embed) void asn1_string_embed_free(ASN1_STRING *a, int embed)
@ -356,11 +356,11 @@ int ASN1_STRING_cmp(const ASN1_STRING *a, const ASN1_STRING *b)
if (i == 0) { if (i == 0) {
i = memcmp(a->data, b->data, a->length); i = memcmp(a->data, b->data, a->length);
if (i == 0) if (i == 0)
return (a->type - b->type); return a->type - b->type;
else else
return (i); return i;
} else } else
return (i); return i;
} }
int ASN1_STRING_length(const ASN1_STRING *x) int ASN1_STRING_length(const ASN1_STRING *x)