diff options
| author | simon <simon@FreeBSD.org> | 2010-12-03 22:59:54 +0000 |
|---|---|---|
| committer | simon <simon@FreeBSD.org> | 2010-12-03 22:59:54 +0000 |
| commit | 2e755187682578966c1ec502dbfe70c798a908b4 (patch) | |
| tree | 001121d5a23a0b1561ac01281edf7c5f1cb0972a /crypto/openssl/crypto/stack/safestack.h | |
| parent | 477858ee257a6cd5108309ebe5f2cc80ab26c5e1 (diff) | |
| parent | ae03beb758270fb19d741c93f7bfde88a6635612 (diff) | |
| download | FreeBSD-src-2e755187682578966c1ec502dbfe70c798a908b4.zip FreeBSD-src-2e755187682578966c1ec502dbfe70c798a908b4.tar.gz | |
Merge OpenSSL 0.9.8q into head.
Security: CVE-2010-4180
Security: http://www.openssl.org/news/secadv_20101202.txt
MFC after: 3 days
Diffstat (limited to 'crypto/openssl/crypto/stack/safestack.h')
| -rw-r--r-- | crypto/openssl/crypto/stack/safestack.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/openssl/crypto/stack/safestack.h b/crypto/openssl/crypto/stack/safestack.h index 78cc485..b59c640 100644 --- a/crypto/openssl/crypto/stack/safestack.h +++ b/crypto/openssl/crypto/stack/safestack.h @@ -127,7 +127,7 @@ STACK_OF(type) \ sk_is_sorted(CHECKED_PTR_OF(STACK_OF(type), st)) #define SKM_ASN1_SET_OF_d2i(type, st, pp, length, d2i_func, free_func, ex_tag, ex_class) \ - (STACK_OF(type) *)d2i_ASN1_SET(CHECKED_PTR_OF(STACK_OF(type), st), \ + (STACK_OF(type) *)d2i_ASN1_SET(CHECKED_PTR_OF(STACK_OF(type)*, st), \ pp, length, \ CHECKED_D2I_OF(type, d2i_func), \ CHECKED_SK_FREE_FUNC(type, free_func), \ |
