• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision14153 (tree)
Zeit2008-10-01 02:01:19
Autorstefankueng

Log Message

Merge r14151 from trunk:
* - update to OpenSSL 0.9.8i

- enable capieng

Ändern Zusammenfassung

Diff

--- branches/1.5.x/build.txt (revision 14152)
+++ branches/1.5.x/build.txt (revision 14153)
@@ -69,7 +69,7 @@
6969
7070 \subsection Requirements3 Next you need to download some more.
7171 - OpenSSL source http://www.openssl.org/source/
72- You will need at least version 0.9.7m or 0.9.8g, respectively.
72+ You will need version 0.9.8i
7373 - ZLib source http://www.gzip.org/zlib/
7474 - tools collection http://tortoisesvn.tigris.org/files/documents/406/42347/Tools-1.5.zip
7575 - dictionaries/thesauri(\b Optional) http://lingucomponent.openoffice.org/
--- branches/1.5.x/ext/build/VC-32.pl (revision 14152)
+++ branches/1.5.x/ext/build/VC-32.pl (revision 14153)
@@ -31,8 +31,10 @@
3131 $base_cflags=' /W3 /Gs0 /GF /Gy /nologo -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DOPENSSL_SYSNAME_WIN32 -DOPENSSL_SYSNAME_WINNT -DUNICODE -D_UNICODE';
3232 $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8
3333 $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8
34- $opt_cflags=' /MD /Ox';
35- $dbg_cflags=' /MDd /Od -DDEBUG -D_DEBUG';
34+ my $f = $shlib?' /MD':' /MT';
35+ $lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib
36+ $opt_cflags=$f.' /Ox';
37+ $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
3638 $lflags="/nologo /subsystem:console /opt:ref";
3739 }
3840 elsif ($FLAVOR =~ /CE/)
@@ -94,8 +96,10 @@
9496 $base_cflags=' /W3 /WX /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
9597 $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8
9698 $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8
97- $opt_cflags=' /MD /Ox /O2 /Ob2';
98- $dbg_cflags=' /MDd /Od -DDEBUG -D_DEBUG';
99+ my $f = $shlib?' /MD':' /MT';
100+ $lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib
101+ $opt_cflags=$f.' /Ox /O2 /Ob2';
102+ $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
99103 $lflags="/nologo /subsystem:console /opt:ref";
100104 }
101105 $mlflags='';
@@ -134,7 +138,7 @@
134138 }
135139 else
136140 {
137- $ex_libs.=' gdi32.lib advapi32.lib user32.lib';
141+ $ex_libs.=' gdi32.lib crypt32.lib advapi32.lib user32.lib';
138142 }
139143
140144 # As native NT API is pure UNICODE, our WIN-NT build defaults to UNICODE,
@@ -155,7 +159,10 @@
155159 $shlib_ex_obj="";
156160 $app_ex_obj="setargv.obj" if ($FLAVOR !~ /CE/);
157161 if ($nasm) {
158- $asm='nasmw -f win32';
162+ my $ver=`nasm -v 2>NUL`;
163+ my $vew=`nasmw -v 2>NUL`;
164+ # pick newest version
165+ $asm=($ver gt $vew?"nasm":"nasmw")." -f win32";
159166 $afile='-o ';
160167 } else {
161168 $asm='ml /Cp /coff /c /Cx';
@@ -202,7 +209,6 @@
202209 if ($shlib && $FLAVOR !~ /CE/)
203210 {
204211 $mlflags.=" $lflags /dll";
205-# $cflags =~ s| /MD| /MT|;
206212 $lib_cflag=" -D_WINDLL";
207213 $out_def="out32dll";
208214 $tmp_def="tmp32dll";
@@ -252,7 +258,6 @@
252258 $name =~ tr/a-z/A-Z/;
253259 $name = "/def:ms/${name}.def";
254260 }
255-
256261 # $target="\$(LIB_D)$o$target";
257262 $ret.="$target: $objs\n";
258263 if (!$shlib)
@@ -266,6 +271,11 @@
266271 local($ex)=($target =~ /O_CRYPTO/)?'':' $(L_CRYPTO)';
267272 if ($name eq "")
268273 {
274+ $ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/);
275+ if ($target =~ /capi/)
276+ {
277+ $ex.=' crypt32.lib advapi32.lib';
278+ }
269279 }
270280 elsif ($FLAVOR =~ /CE/)
271281 {
@@ -275,6 +285,8 @@
275285 {
276286 $ex.=' unicows.lib' if ($FLAVOR =~ /NT/);
277287 $ex.=' wsock32.lib gdi32.lib advapi32.lib user32.lib';
288+ $ex.=' crypt32.lib';
289+ $ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/);
278290 }
279291 $ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/;
280292 $ret.="\t\$(LINK) \$(MLFLAGS) $efile$target $name @<<\n \$(SHLIB_EX_OBJ) $objs $ex\n<<\n";
--- branches/1.5.x/ext/build/ossl_typ.h (nonexistent)
+++ branches/1.5.x/ext/build/ossl_typ.h (revision 14153)
@@ -0,0 +1,182 @@
1+/* ====================================================================
2+ * Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved.
3+ *
4+ * Redistribution and use in source and binary forms, with or without
5+ * modification, are permitted provided that the following conditions
6+ * are met:
7+ *
8+ * 1. Redistributions of source code must retain the above copyright
9+ * notice, this list of conditions and the following disclaimer.
10+ *
11+ * 2. Redistributions in binary form must reproduce the above copyright
12+ * notice, this list of conditions and the following disclaimer in
13+ * the documentation and/or other materials provided with the
14+ * distribution.
15+ *
16+ * 3. All advertising materials mentioning features or use of this
17+ * software must display the following acknowledgment:
18+ * "This product includes software developed by the OpenSSL Project
19+ * for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
20+ *
21+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
22+ * endorse or promote products derived from this software without
23+ * prior written permission. For written permission, please contact
24+ * openssl-core@openssl.org.
25+ *
26+ * 5. Products derived from this software may not be called "OpenSSL"
27+ * nor may "OpenSSL" appear in their names without prior written
28+ * permission of the OpenSSL Project.
29+ *
30+ * 6. Redistributions of any form whatsoever must retain the following
31+ * acknowledgment:
32+ * "This product includes software developed by the OpenSSL Project
33+ * for use in the OpenSSL Toolkit (http://www.openssl.org/)"
34+ *
35+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
36+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
37+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
38+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
39+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
40+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
41+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
42+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
43+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
44+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
45+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
46+ * OF THE POSSIBILITY OF SUCH DAMAGE.
47+ * ====================================================================
48+ *
49+ * This product includes cryptographic software written by Eric Young
50+ * (eay@cryptsoft.com). This product includes software written by Tim
51+ * Hudson (tjh@cryptsoft.com).
52+ *
53+ */
54+
55+#ifndef HEADER_OPENSSL_TYPES_H
56+#define HEADER_OPENSSL_TYPES_H
57+
58+#include <openssl/e_os2.h>
59+
60+#ifdef NO_ASN1_TYPEDEFS
61+#define ASN1_INTEGER ASN1_STRING
62+#define ASN1_ENUMERATED ASN1_STRING
63+#define ASN1_BIT_STRING ASN1_STRING
64+#define ASN1_OCTET_STRING ASN1_STRING
65+#define ASN1_PRINTABLESTRING ASN1_STRING
66+#define ASN1_T61STRING ASN1_STRING
67+#define ASN1_IA5STRING ASN1_STRING
68+#define ASN1_UTCTIME ASN1_STRING
69+#define ASN1_GENERALIZEDTIME ASN1_STRING
70+#define ASN1_TIME ASN1_STRING
71+#define ASN1_GENERALSTRING ASN1_STRING
72+#define ASN1_UNIVERSALSTRING ASN1_STRING
73+#define ASN1_BMPSTRING ASN1_STRING
74+#define ASN1_VISIBLESTRING ASN1_STRING
75+#define ASN1_UTF8STRING ASN1_STRING
76+#define ASN1_BOOLEAN int
77+#define ASN1_NULL int
78+#else
79+typedef struct asn1_string_st ASN1_INTEGER;
80+typedef struct asn1_string_st ASN1_ENUMERATED;
81+typedef struct asn1_string_st ASN1_BIT_STRING;
82+typedef struct asn1_string_st ASN1_OCTET_STRING;
83+typedef struct asn1_string_st ASN1_PRINTABLESTRING;
84+typedef struct asn1_string_st ASN1_T61STRING;
85+typedef struct asn1_string_st ASN1_IA5STRING;
86+typedef struct asn1_string_st ASN1_GENERALSTRING;
87+typedef struct asn1_string_st ASN1_UNIVERSALSTRING;
88+typedef struct asn1_string_st ASN1_BMPSTRING;
89+typedef struct asn1_string_st ASN1_UTCTIME;
90+typedef struct asn1_string_st ASN1_TIME;
91+typedef struct asn1_string_st ASN1_GENERALIZEDTIME;
92+typedef struct asn1_string_st ASN1_VISIBLESTRING;
93+typedef struct asn1_string_st ASN1_UTF8STRING;
94+typedef int ASN1_BOOLEAN;
95+typedef int ASN1_NULL;
96+#endif
97+
98+#ifdef OPENSSL_SYS_WIN32
99+#undef X509_NAME
100+#undef X509_EXTENSIONS
101+#undef X509_CERT_PAIR
102+#undef PKCS7_ISSUER_AND_SERIAL
103+#undef OCSP_RESPONSE
104+#endif
105+
106+#ifdef BIGNUM
107+#undef BIGNUM
108+#endif
109+typedef struct bignum_st BIGNUM;
110+typedef struct bignum_ctx BN_CTX;
111+typedef struct bn_blinding_st BN_BLINDING;
112+typedef struct bn_mont_ctx_st BN_MONT_CTX;
113+typedef struct bn_recp_ctx_st BN_RECP_CTX;
114+typedef struct bn_gencb_st BN_GENCB;
115+
116+typedef struct buf_mem_st BUF_MEM;
117+
118+typedef struct evp_cipher_st EVP_CIPHER;
119+typedef struct evp_cipher_ctx_st EVP_CIPHER_CTX;
120+typedef struct env_md_st EVP_MD;
121+typedef struct env_md_ctx_st EVP_MD_CTX;
122+typedef struct evp_pkey_st EVP_PKEY;
123+
124+typedef struct dh_st DH;
125+typedef struct dh_method DH_METHOD;
126+
127+typedef struct dsa_st DSA;
128+typedef struct dsa_method DSA_METHOD;
129+
130+typedef struct rsa_st RSA;
131+typedef struct rsa_meth_st RSA_METHOD;
132+
133+typedef struct rand_meth_st RAND_METHOD;
134+
135+typedef struct ecdh_method ECDH_METHOD;
136+typedef struct ecdsa_method ECDSA_METHOD;
137+
138+typedef struct x509_st X509;
139+typedef struct X509_algor_st X509_ALGOR;
140+typedef struct X509_crl_st X509_CRL;
141+typedef struct X509_name_st X509_NAME;
142+typedef struct x509_store_st X509_STORE;
143+typedef struct x509_store_ctx_st X509_STORE_CTX;
144+typedef struct ssl_st SSL;
145+typedef struct ssl_ctx_st SSL_CTX;
146+
147+typedef struct v3_ext_ctx X509V3_CTX;
148+typedef struct conf_st CONF;
149+
150+typedef struct store_st STORE;
151+typedef struct store_method_st STORE_METHOD;
152+
153+typedef struct ui_st UI;
154+typedef struct ui_method_st UI_METHOD;
155+
156+typedef struct st_ERR_FNS ERR_FNS;
157+
158+typedef struct engine_st ENGINE;
159+
160+typedef struct X509_POLICY_NODE_st X509_POLICY_NODE;
161+typedef struct X509_POLICY_LEVEL_st X509_POLICY_LEVEL;
162+typedef struct X509_POLICY_TREE_st X509_POLICY_TREE;
163+typedef struct X509_POLICY_CACHE_st X509_POLICY_CACHE;
164+
165+ /* If placed in pkcs12.h, we end up with a circular depency with pkcs7.h */
166+#define DECLARE_PKCS12_STACK_OF(type) /* Nothing */
167+#define IMPLEMENT_PKCS12_STACK_OF(type) /* Nothing */
168+
169+typedef struct crypto_ex_data_st CRYPTO_EX_DATA;
170+/* Callback types for crypto.h */
171+typedef int CRYPTO_EX_new(void *parent, void *ptr, CRYPTO_EX_DATA *ad,
172+ int idx, long argl, void *argp);
173+typedef void CRYPTO_EX_free(void *parent, void *ptr, CRYPTO_EX_DATA *ad,
174+ int idx, long argl, void *argp);
175+typedef int CRYPTO_EX_dup(CRYPTO_EX_DATA *to, CRYPTO_EX_DATA *from, void *from_d,
176+ int idx, long argl, void *argp);
177+
178+typedef struct ocsp_req_ctx_st OCSP_REQ_CTX;
179+typedef struct ocsp_response_st OCSP_RESPONSE;
180+typedef struct ocsp_responder_id_st OCSP_RESPID;
181+
182+#endif /* def HEADER_OPENSSL_TYPES_H */
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
--- branches/1.5.x/src/Changelog.txt (revision 14152)
+++ branches/1.5.x/src/Changelog.txt (revision 14153)
@@ -1,4 +1,5 @@
11 Version 1.5.4
2+- CHG: OpenSSL 0.9.8i with capieng enabled
23 - BUG: Applying a patch where a context line had UTF-BOMs
34 in it failed. (Stefan)
45 - BUG: Checking out multiple folders from the repository browser failed
Show on old repository browser