diff options
| author | Brian Carlstrom <bdc@google.com> | 2010-08-18 11:26:06 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2010-08-18 11:26:06 -0700 |
| commit | 3d3a1b8fcf46ca3bdb3d8f09acd6ef604624a30d (patch) | |
| tree | 8f1d76d465ea3ed01709d0771f503c7cb4ab0ae6 /include | |
| parent | ff9be29b89c031de40089cc045b19e427e87aa00 (diff) | |
| download | replicant_openssl-3d3a1b8fcf46ca3bdb3d8f09acd6ef604624a30d.zip replicant_openssl-3d3a1b8fcf46ca3bdb3d8f09acd6ef604624a30d.tar.gz replicant_openssl-3d3a1b8fcf46ca3bdb3d8f09acd6ef604624a30d.tar.bz2 | |
Upgrade to openssl-1.0.0a
- Updated README.android
- Updated openssl.version
- Ran ./import_openssl.sh import .../openssl-1.0.0a.tar.gz
(which is responsible for the rest of the changes)
Change-Id: I3214fb8cb5297d68edc7632bbd9027952fec559b
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/dtls1.h | 1 | ||||
| -rw-r--r-- | include/openssl/opensslv.h | 6 | ||||
| -rw-r--r-- | include/openssl/pem.h | 3 | ||||
| -rw-r--r-- | include/openssl/safestack.h | 2 | ||||
| -rw-r--r-- | include/openssl/symhacks.h | 6 |
5 files changed, 13 insertions, 5 deletions
diff --git a/include/openssl/dtls1.h b/include/openssl/dtls1.h index af363a9..2900d1d 100644 --- a/include/openssl/dtls1.h +++ b/include/openssl/dtls1.h @@ -167,6 +167,7 @@ typedef struct hm_fragment_st { struct hm_header_st msg_header; unsigned char *fragment; + unsigned char *reassembly; } hm_fragment; typedef struct dtls1_state_st diff --git a/include/openssl/opensslv.h b/include/openssl/opensslv.h index cbe5264..2fb110f 100644 --- a/include/openssl/opensslv.h +++ b/include/openssl/opensslv.h @@ -25,11 +25,11 @@ * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for * major minor fix final patch/beta) */ -#define OPENSSL_VERSION_NUMBER 0x1000000fL +#define OPENSSL_VERSION_NUMBER 0x1000001fL #ifdef OPENSSL_FIPS -#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0-fips 29 Mar 2010" +#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0a-fips 1 Jun 2010" #else -#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0 29 Mar 2010" +#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0a 1 Jun 2010" #endif #define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT diff --git a/include/openssl/pem.h b/include/openssl/pem.h index 22231c2..8a6abab 100644 --- a/include/openssl/pem.h +++ b/include/openssl/pem.h @@ -548,10 +548,11 @@ EVP_PKEY *b2i_PrivateKey_bio(BIO *in); EVP_PKEY *b2i_PublicKey_bio(BIO *in); int i2b_PrivateKey_bio(BIO *out, EVP_PKEY *pk); int i2b_PublicKey_bio(BIO *out, EVP_PKEY *pk); - +#ifndef OPENSSL_NO_RC4 EVP_PKEY *b2i_PVK_bio(BIO *in, pem_password_cb *cb, void *u); int i2b_PVK_bio(BIO *out, EVP_PKEY *pk, int enclevel, pem_password_cb *cb, void *u); +#endif /* BEGIN ERROR CODES */ diff --git a/include/openssl/safestack.h b/include/openssl/safestack.h index d616b4a..891cb84 100644 --- a/include/openssl/safestack.h +++ b/include/openssl/safestack.h @@ -179,7 +179,7 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void) sk_is_sorted(CHECKED_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_STACK_OF(type, st), \ + (STACK_OF(type) *)d2i_ASN1_SET((STACK_OF(OPENSSL_BLOCK) **)CHECKED_STACK_OF(type, st), \ pp, length, \ CHECKED_D2I_OF(type, d2i_func), \ CHECKED_SK_FREE_FUNC(type, free_func), \ diff --git a/include/openssl/symhacks.h b/include/openssl/symhacks.h index 151b683..3fd4a81 100644 --- a/include/openssl/symhacks.h +++ b/include/openssl/symhacks.h @@ -399,6 +399,12 @@ #undef dtls1_retransmit_buffered_messages #define dtls1_retransmit_buffered_messages dtls1_retransmit_buffered_msgs +/* Hack some long UI names */ +#undef UI_method_get_prompt_constructor +#define UI_method_get_prompt_constructor UI_method_get_prompt_constructr +#undef UI_method_set_prompt_constructor +#define UI_method_set_prompt_constructor UI_method_set_prompt_constructr + #endif /* defined OPENSSL_SYS_VMS */ |