diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-30 08:40:25 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-30 08:40:25 +0200 |
| commit | 60adbfdea1ee754341d64454274e7aa83bae8971 (patch) | |
| tree | 1b56329c88f1a881b0e7297bb4283cfbb7e39c97 /openssl/crypto/asn1/a_object.c | |
| parent | af72dcd109d7610b96863035541250997c7a172e (diff) | |
| download | vcxsrv-60adbfdea1ee754341d64454274e7aa83bae8971.tar.gz vcxsrv-60adbfdea1ee754341d64454274e7aa83bae8971.tar.bz2 vcxsrv-60adbfdea1ee754341d64454274e7aa83bae8971.zip | |
Upgraded to openssl-1.0.0e
Diffstat (limited to 'openssl/crypto/asn1/a_object.c')
| -rw-r--r-- | openssl/crypto/asn1/a_object.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openssl/crypto/asn1/a_object.c b/openssl/crypto/asn1/a_object.c index e5fbe7cbb..3978c9150 100644 --- a/openssl/crypto/asn1/a_object.c +++ b/openssl/crypto/asn1/a_object.c @@ -139,7 +139,7 @@ int a2d_ASN1_OBJECT(unsigned char *out, int olen, const char *buf, int num) ASN1err(ASN1_F_A2D_ASN1_OBJECT,ASN1_R_INVALID_DIGIT); goto err; } - if (!use_bn && l > (ULONG_MAX / 10L)) + if (!use_bn && l >= ((ULONG_MAX - 80) / 10L)) { use_bn = 1; if (!bl) @@ -293,7 +293,7 @@ ASN1_OBJECT *c2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp, /* Sanity check OID encoding: can't have leading 0x80 in * subidentifiers, see: X.690 8.19.2 */ - for (i = 0, p = *pp + 1; i < len - 1; i++, p++) + for (i = 0, p = *pp; i < len; i++, p++) { if (*p == 0x80 && (!i || !(p[-1] & 0x80))) { |