You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
69 lines
2.6 KiB
69 lines
2.6 KiB
diff -up openssl-1.0.1e/crypto/asn1/a_int.c.asn1-negative openssl-1.0.1e/crypto/asn1/a_int.c |
|
--- openssl-1.0.1e/crypto/asn1/a_int.c.asn1-negative 2016-04-29 13:23:05.221797998 +0200 |
|
+++ openssl-1.0.1e/crypto/asn1/a_int.c 2016-04-29 13:26:51.030957218 +0200 |
|
@@ -124,6 +124,8 @@ int i2c_ASN1_INTEGER(ASN1_INTEGER *a, un |
|
{ |
|
ret=a->length; |
|
i=a->data[0]; |
|
+ if (ret == 1 && i == 0) |
|
+ neg = 0; |
|
if (!neg && (i > 127)) { |
|
pad=1; |
|
pb=0; |
|
@@ -157,7 +159,7 @@ int i2c_ASN1_INTEGER(ASN1_INTEGER *a, un |
|
p += a->length - 1; |
|
i = a->length; |
|
/* Copy zeros to destination as long as source is zero */ |
|
- while(!*n) { |
|
+ while(!*n && i > 1) { |
|
*(p--) = 0; |
|
n--; |
|
i--; |
|
@@ -415,7 +417,7 @@ ASN1_INTEGER *BN_to_ASN1_INTEGER(const B |
|
ASN1err(ASN1_F_BN_TO_ASN1_INTEGER,ERR_R_NESTED_ASN1_ERROR); |
|
goto err; |
|
} |
|
- if (BN_is_negative(bn)) |
|
+ if (BN_is_negative(bn) && !BN_is_zero(bn)) |
|
ret->type = V_ASN1_NEG_INTEGER; |
|
else ret->type=V_ASN1_INTEGER; |
|
j=BN_num_bits(bn); |
|
diff -up openssl-1.0.1e/crypto/asn1/a_type.c.asn1-negative openssl-1.0.1e/crypto/asn1/a_type.c |
|
--- openssl-1.0.1e/crypto/asn1/a_type.c.asn1-negative 2016-04-29 12:42:43.000000000 +0200 |
|
+++ openssl-1.0.1e/crypto/asn1/a_type.c 2016-04-29 13:28:40.202443787 +0200 |
|
@@ -131,9 +131,7 @@ int ASN1_TYPE_cmp(const ASN1_TYPE *a, co |
|
result = 0; /* They do not have content. */ |
|
break; |
|
case V_ASN1_INTEGER: |
|
- case V_ASN1_NEG_INTEGER: |
|
case V_ASN1_ENUMERATED: |
|
- case V_ASN1_NEG_ENUMERATED: |
|
case V_ASN1_BIT_STRING: |
|
case V_ASN1_OCTET_STRING: |
|
case V_ASN1_SEQUENCE: |
|
diff -up openssl-1.0.1e/crypto/asn1/tasn_dec.c.asn1-negative openssl-1.0.1e/crypto/asn1/tasn_dec.c |
|
--- openssl-1.0.1e/crypto/asn1/tasn_dec.c.asn1-negative 2016-04-29 12:42:43.000000000 +0200 |
|
+++ openssl-1.0.1e/crypto/asn1/tasn_dec.c 2016-04-29 13:30:08.560456293 +0200 |
|
@@ -1011,9 +1011,7 @@ int asn1_ex_c2i(ASN1_VALUE **pval, const |
|
break; |
|
|
|
case V_ASN1_INTEGER: |
|
- case V_ASN1_NEG_INTEGER: |
|
case V_ASN1_ENUMERATED: |
|
- case V_ASN1_NEG_ENUMERATED: |
|
tint = (ASN1_INTEGER **)pval; |
|
if (!c2i_ASN1_INTEGER(tint, &cont, len)) |
|
goto err; |
|
diff -up openssl-1.0.1e/crypto/asn1/tasn_enc.c.asn1-negative openssl-1.0.1e/crypto/asn1/tasn_enc.c |
|
--- openssl-1.0.1e/crypto/asn1/tasn_enc.c.asn1-negative 2013-02-11 16:26:04.000000000 +0100 |
|
+++ openssl-1.0.1e/crypto/asn1/tasn_enc.c 2016-04-29 13:30:34.688051394 +0200 |
|
@@ -638,9 +638,7 @@ int asn1_ex_i2c(ASN1_VALUE **pval, unsig |
|
break; |
|
|
|
case V_ASN1_INTEGER: |
|
- case V_ASN1_NEG_INTEGER: |
|
case V_ASN1_ENUMERATED: |
|
- case V_ASN1_NEG_ENUMERATED: |
|
/* These are all have the same content format |
|
* as ASN1_INTEGER |
|
*/
|
|
|