diff options
| author | tedu <> | 2016-05-03 12:38:53 +0000 |
|---|---|---|
| committer | tedu <> | 2016-05-03 12:38:53 +0000 |
| commit | c6409771d22d6e819d9017d650687b93c835ed3a (patch) | |
| tree | b82aa12b453d40dd8f8ba316bad714a4590f3c18 /src/lib/libcrypto/asn1/tasn_enc.c | |
| parent | 5be055d50dafafb44d2ef72c845fd6bdf3785179 (diff) | |
| download | openbsd-c6409771d22d6e819d9017d650687b93c835ed3a.tar.gz openbsd-c6409771d22d6e819d9017d650687b93c835ed3a.tar.bz2 openbsd-c6409771d22d6e819d9017d650687b93c835ed3a.zip | |
patch from openssl for multiple issues:
missing padding check in aesni functions
overflow in evp encode functions
use of invalid negative asn.1 types
ok beck
Diffstat (limited to 'src/lib/libcrypto/asn1/tasn_enc.c')
| -rw-r--r-- | src/lib/libcrypto/asn1/tasn_enc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/libcrypto/asn1/tasn_enc.c b/src/lib/libcrypto/asn1/tasn_enc.c index 0a6426a95e..f4b8b300ca 100644 --- a/src/lib/libcrypto/asn1/tasn_enc.c +++ b/src/lib/libcrypto/asn1/tasn_enc.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: tasn_enc.c,v 1.17 2015/12/22 08:44:44 mmcc Exp $ */ | 1 | /* $OpenBSD: tasn_enc.c,v 1.18 2016/05/03 12:38:53 tedu Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 2000. | 3 | * project 2000. |
| 4 | */ | 4 | */ |
| @@ -603,9 +603,7 @@ asn1_ex_i2c(ASN1_VALUE **pval, unsigned char *cout, int *putype, | |||
| 603 | break; | 603 | break; |
| 604 | 604 | ||
| 605 | case V_ASN1_INTEGER: | 605 | case V_ASN1_INTEGER: |
| 606 | case V_ASN1_NEG_INTEGER: | ||
| 607 | case V_ASN1_ENUMERATED: | 606 | case V_ASN1_ENUMERATED: |
| 608 | case V_ASN1_NEG_ENUMERATED: | ||
| 609 | /* These are all have the same content format | 607 | /* These are all have the same content format |
| 610 | * as ASN1_INTEGER | 608 | * as ASN1_INTEGER |
| 611 | */ | 609 | */ |
