Codebase list openssl / 9caf34a
Update pic.patch, openssl-pod-misspell.patch and make-targets.patch Kurt Roeckx 12 years ago
4 changed file(s) with 132 addition(s) and 136 deletion(s). Raw diff Collapse all Expand all
+1
-0
debian/changelog less more
11
22 * New upstream version
33 - Remove kfreebsd-pipe.patch, fixed upstream
4 - Update pic.patch, openssl-pod-misspell.patch and make-targets.patch
45
56 -- Kurt Roeckx <kurt@roeckx.be> Sat, 17 Mar 2012 10:09:17 +0100
67
+6
-6
debian/patches/make-targets.patch less more
0 Index: openssl-1.0.0c/Makefile.org
0 Index: openssl-1.0.1/Makefile.org
11 ===================================================================
2 --- openssl-1.0.0c.orig/Makefile.org 2010-12-12 16:10:12.000000000 +0100
3 +++ openssl-1.0.0c/Makefile.org 2010-12-12 16:11:27.000000000 +0100
4 @@ -109,7 +109,7 @@
5 ZLIB_INCLUDE=
6 LIBZLIB=
2 --- openssl-1.0.1.orig/Makefile.org 2012-03-17 09:41:07.000000000 +0000
3 +++ openssl-1.0.1/Makefile.org 2012-03-17 09:41:21.000000000 +0000
4 @@ -135,7 +135,7 @@
5
6 BASEADDR=
77
88 -DIRS= crypto ssl engines apps test tools
99 +DIRS= crypto ssl engines apps tools
+32
-47
debian/patches/openssl-pod-misspell.patch less more
0 --- a/apps/ca.c
1 +++ b/apps/ca.c
0 Index: openssl-1.0.1/apps/ca.c
1 ===================================================================
2 --- openssl-1.0.1.orig/apps/ca.c 2012-01-12 16:28:02.000000000 +0000
3 +++ openssl-1.0.1/apps/ca.c 2012-03-17 09:31:48.000000000 +0000
24 @@ -148,7 +148,7 @@
35 static const char *ca_usage[]={
46 "usage: ca args\n",
810 " -config file - A config file\n",
911 " -name arg - The particular CA definition to use\n",
1012 " -gencrl - Generate a new CRL\n",
11 --- a/apps/ecparam.c
12 +++ b/apps/ecparam.c
13 Index: openssl-1.0.1/apps/ecparam.c
14 ===================================================================
15 --- openssl-1.0.1.orig/apps/ecparam.c 2010-06-15 17:25:02.000000000 +0000
16 +++ openssl-1.0.1/apps/ecparam.c 2012-03-17 09:31:48.000000000 +0000
1317 @@ -105,7 +105,7 @@
1418 * in the asn1 der encoding
1519 * possible values: named_curve (default)
2832 " use the seed\n");
2933 BIO_printf(bio_err, " -genkey generate ec"
3034 " key\n");
31 --- a/crypto/evp/encode.c
32 +++ b/crypto/evp/encode.c
35 Index: openssl-1.0.1/crypto/evp/encode.c
36 ===================================================================
37 --- openssl-1.0.1.orig/crypto/evp/encode.c 2010-06-15 17:25:09.000000000 +0000
38 +++ openssl-1.0.1/crypto/evp/encode.c 2012-03-17 09:31:48.000000000 +0000
3339 @@ -250,7 +250,7 @@
3440 /* We parse the input data */
3541 for (i=0; i<inl; i++)
3945 if (ln >= 80) { rv= -1; goto end; }
4046
4147 /* Get char and put it into the buffer */
42 --- a/doc/apps/config.pod
43 +++ b/doc/apps/config.pod
48 Index: openssl-1.0.1/doc/apps/config.pod
49 ===================================================================
50 --- openssl-1.0.1.orig/doc/apps/config.pod 2004-11-25 17:47:29.000000000 +0000
51 +++ openssl-1.0.1/doc/apps/config.pod 2012-03-17 09:31:48.000000000 +0000
4452 @@ -119,7 +119,7 @@
4553 information.
4654
5058 specific to each ENGINE.
5159
5260 Each ENGINE specific section is used to set default algorithms, load
53 --- a/doc/apps/genpkey.pod
54 +++ b/doc/apps/genpkey.pod
55 @@ -114,6 +114,8 @@
56
57 The number of bits in the generated parameters. If not specified 1024 is used.
58
59 +=back
60 +
61 =head1 DH PARAMETER GENERATION OPTIONS
62
63 =over 4
64 --- a/doc/apps/openssl.pod
65 +++ b/doc/apps/openssl.pod
66 @@ -287,8 +287,6 @@
67
68 SHA-1 Digest
69
70 -=back
71 -
72 =item B<sha224>
73
74 SHA-224 Digest
75 @@ -305,6 +303,8 @@
76
77 SHA-512 Digest
78
79 +=back
80 +
81 =head2 ENCODING AND CIPHER COMMANDS
82
83 =over 10
84 --- a/doc/apps/req.pod
85 +++ b/doc/apps/req.pod
61 Index: openssl-1.0.1/doc/apps/req.pod
62 ===================================================================
63 --- openssl-1.0.1.orig/doc/apps/req.pod 2009-04-10 16:42:28.000000000 +0000
64 +++ openssl-1.0.1/doc/apps/req.pod 2012-03-17 09:31:48.000000000 +0000
8665 @@ -159,7 +159,7 @@
8766 the algorithm is determined by the parameters. B<algname:file> use algorithm
8867 B<algname> and parameter file B<file>: the two algorithms must match or an
9271
9372 B<dsa:filename> generates a DSA key using the parameters
9473 in the file B<filename>. B<ec:filename> generates EC key (usable both with
95 --- a/doc/apps/ts.pod
96 +++ b/doc/apps/ts.pod
74 Index: openssl-1.0.1/doc/apps/ts.pod
75 ===================================================================
76 --- openssl-1.0.1.orig/doc/apps/ts.pod 2009-04-10 11:25:54.000000000 +0000
77 +++ openssl-1.0.1/doc/apps/ts.pod 2012-03-17 09:31:48.000000000 +0000
9778 @@ -352,7 +352,7 @@
9879
9980 This is the main section and it specifies the name of another section
11293
11394 =head1 EXAMPLES
11495
115 --- a/doc/apps/tsget.pod
116 +++ b/doc/apps/tsget.pod
96 Index: openssl-1.0.1/doc/apps/tsget.pod
97 ===================================================================
98 --- openssl-1.0.1.orig/doc/apps/tsget.pod 2010-01-05 17:17:20.000000000 +0000
99 +++ openssl-1.0.1/doc/apps/tsget.pod 2012-03-17 09:31:48.000000000 +0000
117100 @@ -124,7 +124,7 @@
118101 =item [request]...
119102
123106 read from the standard input. (Optional)
124107
125108 =back
126 --- a/doc/apps/x509v3_config.pod
127 +++ b/doc/apps/x509v3_config.pod
109 Index: openssl-1.0.1/doc/apps/x509v3_config.pod
110 ===================================================================
111 --- openssl-1.0.1.orig/doc/apps/x509v3_config.pod 2006-11-07 13:44:03.000000000 +0000
112 +++ openssl-1.0.1/doc/apps/x509v3_config.pod 2012-03-17 09:31:48.000000000 +0000
128113 @@ -174,7 +174,7 @@
129114
130115 The value of B<dirName> should point to a section containing the distinguished
+93
-83
debian/patches/pic.patch less more
0 Index: openssl-1.0.0c/crypto/Makefile
1 ===================================================================
2 --- openssl-1.0.0c.orig/crypto/Makefile 2010-07-27 00:09:59.000000000 +0200
3 +++ openssl-1.0.0c/crypto/Makefile 2010-12-12 18:05:36.000000000 +0100
4 @@ -58,7 +58,7 @@
0 Index: openssl-1.0.1/crypto/Makefile
1 ===================================================================
2 --- openssl-1.0.1.orig/crypto/Makefile 2011-12-10 01:37:55.000000000 +0000
3 +++ openssl-1.0.1/crypto/Makefile 2012-03-17 09:29:15.000000000 +0000
4 @@ -60,7 +60,7 @@
55 echo " #define DATE \"`LC_ALL=C LC_TIME=C date`\""; \
66 echo '#endif' ) >buildinf.h
77
1010 $(PERL) x86cpuid.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
1111
1212 applink.o: $(TOP)/ms/applink.c
13 @@ -70,7 +70,7 @@
14 uplink-cof.s: $(TOP)/ms/uplink.pl
15 $(PERL) $(TOP)/ms/uplink.pl coff > $@
16
17 -x86_64cpuid.s: x86_64cpuid.pl
18 +x86_64cpuid.S: x86_64cpuid.pl
19 $(PERL) x86_64cpuid.pl $(PERLASM_SCHEME) > $@
20 ia64cpuid.s: ia64cpuid.S
21 $(CC) $(CFLAGS) -E ia64cpuid.S > $@
22 Index: openssl-1.0.0c/crypto/x86_64cpuid.pl
23 ===================================================================
24 --- openssl-1.0.0c.orig/crypto/x86_64cpuid.pl 2010-04-14 21:25:09.000000000 +0200
25 +++ openssl-1.0.0c/crypto/x86_64cpuid.pl 2010-12-12 18:05:36.000000000 +0100
26 @@ -14,7 +14,11 @@
27 print<<___;
13 @@ -72,7 +72,7 @@
14 uplink-x86.s: $(TOP)/ms/uplink-x86.pl
15 $(PERL) $(TOP)/ms/uplink-x86.pl $(PERLASM_SCHEME) > $@
16
17 -x86_64cpuid.s: x86_64cpuid.pl; $(PERL) x86_64cpuid.pl $(PERLASM_SCHEME) > $@
18 +x86_64cpuid.S: x86_64cpuid.pl; $(PERL) x86_64cpuid.pl $(PERLASM_SCHEME) > $@
19 ia64cpuid.s: ia64cpuid.S; $(CC) $(CFLAGS) -E ia64cpuid.S > $@
20 ppccpuid.s: ppccpuid.pl; $(PERL) ppccpuid.pl $(PERLASM_SCHEME) $@
21 pariscid.s: pariscid.pl; $(PERL) pariscid.pl $(PERLASM_SCHEME) $@
22 Index: openssl-1.0.1/crypto/x86_64cpuid.pl
23 ===================================================================
24 --- openssl-1.0.1.orig/crypto/x86_64cpuid.pl 2011-11-14 21:01:16.000000000 +0000
25 +++ openssl-1.0.1/crypto/x86_64cpuid.pl 2012-03-17 09:20:04.000000000 +0000
26 @@ -20,7 +20,11 @@
2827 .extern OPENSSL_cpuid_setup
28 .hidden OPENSSL_cpuid_setup
2929 .section .init
3030 +#ifdef OPENSSL_PIC
3131 + call OPENSSL_cpuid_setup\@PLT
3333 call OPENSSL_cpuid_setup
3434 +#endif
3535
36 .text
37
38 Index: openssl-1.0.0c/crypto/des/asm/desboth.pl
39 ===================================================================
40 --- openssl-1.0.0c.orig/crypto/des/asm/desboth.pl 2001-10-24 23:20:56.000000000 +0200
41 +++ openssl-1.0.0c/crypto/des/asm/desboth.pl 2010-12-12 18:05:36.000000000 +0100
36 .hidden OPENSSL_ia32cap_P
37 .comm OPENSSL_ia32cap_P,8,4
38 Index: openssl-1.0.1/crypto/des/asm/desboth.pl
39 ===================================================================
40 --- openssl-1.0.1.orig/crypto/des/asm/desboth.pl 2001-10-24 21:20:56.000000000 +0000
41 +++ openssl-1.0.1/crypto/des/asm/desboth.pl 2012-03-17 09:20:04.000000000 +0000
4242 @@ -16,6 +16,11 @@
4343
4444 &push("edi");
7676
7777 &stack_pop(3);
7878 &mov($L,&DWP(0,"ebx","",0));
79 Index: openssl-1.0.0c/crypto/rc4/Makefile
80 ===================================================================
81 --- openssl-1.0.0c.orig/crypto/rc4/Makefile 2009-02-11 11:01:36.000000000 +0100
82 +++ openssl-1.0.0c/crypto/rc4/Makefile 2010-12-12 18:05:36.000000000 +0100
79 Index: openssl-1.0.1/crypto/rc4/Makefile
80 ===================================================================
81 --- openssl-1.0.1.orig/crypto/rc4/Makefile 2011-11-14 20:42:21.000000000 +0000
82 +++ openssl-1.0.1/crypto/rc4/Makefile 2012-03-17 09:20:04.000000000 +0000
8383 @@ -44,7 +44,7 @@
8484 rc4-586.s: asm/rc4-586.pl ../perlasm/x86asm.pl
8585 $(PERL) asm/rc4-586.pl $(PERLASM_SCHEME) $(CFLAGS) > $@
8787 -rc4-x86_64.s: asm/rc4-x86_64.pl
8888 +rc4-x86_64.S: asm/rc4-x86_64.pl
8989 $(PERL) asm/rc4-x86_64.pl $(PERLASM_SCHEME) > $@
90
91 rc4-ia64.S: asm/rc4-ia64.pl
92 Index: openssl-1.0.0c/crypto/rc4/asm/rc4-x86_64.pl
93 ===================================================================
94 --- openssl-1.0.0c.orig/crypto/rc4/asm/rc4-x86_64.pl 2009-04-27 21:31:04.000000000 +0200
95 +++ openssl-1.0.0c/crypto/rc4/asm/rc4-x86_64.pl 2010-12-12 18:05:36.000000000 +0100
96 @@ -279,7 +279,11 @@
90 rc4-md5-x86_64.s: asm/rc4-md5-x86_64.pl
91 $(PERL) asm/rc4-md5-x86_64.pl $(PERLASM_SCHEME) > $@
92 Index: openssl-1.0.1/crypto/rc4/asm/rc4-x86_64.pl
93 ===================================================================
94 --- openssl-1.0.1.orig/crypto/rc4/asm/rc4-x86_64.pl 2011-07-01 14:13:52.000000000 +0000
95 +++ openssl-1.0.1/crypto/rc4/asm/rc4-x86_64.pl 2012-03-17 09:28:11.000000000 +0000
96 @@ -157,7 +157,11 @@
97 mov -4($dat),$YY#b
98 cmpl \$-1,256($dat)
99 je .LRC4_CHAR
100 +#ifdef OPENSSL_PIC
101 + mov OPENSSL_ia32cap_P\@GOTPCREL(%rip),%r8d
102 +#else
103 mov OPENSSL_ia32cap_P(%rip),%r8d
104 +#endif
105 xor $TX[1],$TX[1]
106 inc $XX[0]#b
107 sub $XX[0],$TX[1]
108 @@ -442,7 +446,11 @@
97109 xor %r10,%r10
98110 xor %r11,%r11
99111
100112 +#ifdef OPENSSL_PIC
101 + mov OPENSSL_ia32cap_P\@GOTPCREL(%rip),$idx#d
113 + mov OPENSSL_ia32cap_P\@GOTPCREL(%rip),$idx#d
102114 +#else
103115 mov OPENSSL_ia32cap_P(%rip),$idx#d
104116 +#endif
105 bt \$20,$idx#d
106 jnc .Lw1stloop
107 bt \$30,$idx#d
108 @@ -346,7 +350,11 @@
117 bt \$20,$idx#d # RC4_CHAR?
118 jc .Lc1stloop
119 jmp .Lw1stloop
120 @@ -506,7 +514,11 @@
109121 .align 16
110122 RC4_options:
111123 lea .Lopts(%rip),%rax
115127 mov OPENSSL_ia32cap_P(%rip),%edx
116128 +#endif
117129 bt \$20,%edx
118 jnc .Ldone
119 add \$12,%rax
120 Index: openssl-1.0.0c/crypto/perlasm/cbc.pl
121 ===================================================================
122 --- openssl-1.0.0c.orig/crypto/perlasm/cbc.pl 2005-05-09 23:48:00.000000000 +0200
123 +++ openssl-1.0.0c/crypto/perlasm/cbc.pl 2010-12-12 18:05:36.000000000 +0100
130 jc .L8xchar
131 bt \$30,%edx
132 Index: openssl-1.0.1/crypto/perlasm/cbc.pl
133 ===================================================================
134 --- openssl-1.0.1.orig/crypto/perlasm/cbc.pl 2011-07-13 06:22:46.000000000 +0000
135 +++ openssl-1.0.1/crypto/perlasm/cbc.pl 2012-03-17 09:20:04.000000000 +0000
124136 @@ -122,7 +122,11 @@
125137 &mov(&DWP($data_off,"esp","",0), "eax"); # put in array for call
126138 &mov(&DWP($data_off+4,"esp","",0), "ebx"); #
134146
135147 &mov("eax", &DWP($data_off,"esp","",0));
136148 &mov("ebx", &DWP($data_off+4,"esp","",0));
137 @@ -187,7 +191,11 @@
149 @@ -185,7 +189,11 @@
138150 &mov(&DWP($data_off,"esp","",0), "eax"); # put in array for call
139151 &mov(&DWP($data_off+4,"esp","",0), "ebx"); #
140152
147159
148160 &mov("eax", &DWP($data_off,"esp","",0));
149161 &mov("ebx", &DWP($data_off+4,"esp","",0));
150 @@ -220,7 +228,11 @@
162 @@ -218,7 +226,11 @@
151163 &mov(&DWP($data_off,"esp","",0), "eax"); # put back
152164 &mov(&DWP($data_off+4,"esp","",0), "ebx"); #
153165
160172
161173 &mov("eax", &DWP($data_off,"esp","",0)); # get return
162174 &mov("ebx", &DWP($data_off+4,"esp","",0)); #
163 @@ -263,7 +275,11 @@
175 @@ -261,7 +273,11 @@
164176 &mov(&DWP($data_off,"esp","",0), "eax"); # put back
165177 &mov(&DWP($data_off+4,"esp","",0), "ebx"); #
166178
173185
174186 &mov("eax", &DWP($data_off,"esp","",0)); # get return
175187 &mov("ebx", &DWP($data_off+4,"esp","",0)); #
176 Index: openssl-1.0.0c/crypto/perlasm/x86_64-xlate.pl
177 ===================================================================
178 --- openssl-1.0.0c.orig/crypto/perlasm/x86_64-xlate.pl 2010-12-12 18:05:36.000000000 +0100
179 +++ openssl-1.0.0c/crypto/perlasm/x86_64-xlate.pl 2010-12-12 18:05:36.000000000 +0100
180 @@ -638,7 +638,7 @@
188 Index: openssl-1.0.1/crypto/perlasm/x86_64-xlate.pl
189 ===================================================================
190 --- openssl-1.0.1.orig/crypto/perlasm/x86_64-xlate.pl 2012-03-17 09:19:38.000000000 +0000
191 +++ openssl-1.0.1/crypto/perlasm/x86_64-xlate.pl 2012-03-17 09:20:04.000000000 +0000
192 @@ -786,7 +786,7 @@
181193
182194 chomp($line);
183195
186198 $line =~ s|/\*.*\*/||; # ... and C-style comments...
187199 $line =~ s|^\s+||; # ... and skip white spaces in beginning
188200
189 Index: openssl-1.0.0c/crypto/perlasm/x86gas.pl
190 ===================================================================
191 --- openssl-1.0.0c.orig/crypto/perlasm/x86gas.pl 2008-12-17 20:56:47.000000000 +0100
192 +++ openssl-1.0.0c/crypto/perlasm/x86gas.pl 2010-12-12 18:05:36.000000000 +0100
193 @@ -209,7 +209,17 @@
194 if ($::elf)
201 Index: openssl-1.0.1/crypto/perlasm/x86gas.pl
202 ===================================================================
203 --- openssl-1.0.1.orig/crypto/perlasm/x86gas.pl 2011-12-09 19:16:35.000000000 +0000
204 +++ openssl-1.0.1/crypto/perlasm/x86gas.pl 2012-03-17 09:30:54.000000000 +0000
205 @@ -218,6 +218,15 @@
206 elsif ($::elf)
195207 { $initseg.=<<___;
196208 .section .init
197209 +#ifdef OPENSSL_PIC
198210 + pushl %ebx
199 + call .pic_point0
211 + call .pic_point0
200212 +.pic_point0:
201 + popl %ebx
202 + addl \$_GLOBAL_OFFSET_TABLE_+[.-.pic_point0],%ebx
213 + popl %ebx
214 + addl \$_GLOBAL_OFFSET_TABLE_+[.-.pic_point0],%ebx
203215 + call $f\@PLT
204216 + popl %ebx
205217 +#else
206218 call $f
207 +#endif
208 jmp .Linitalign
209 .align $align
210 .Linitalign:
211 Index: openssl-1.0.0c/crypto/aes/asm/aes-x86_64.pl
212 ===================================================================
213 --- openssl-1.0.0c.orig/crypto/aes/asm/aes-x86_64.pl 2008-12-27 14:32:21.000000000 +0100
214 +++ openssl-1.0.0c/crypto/aes/asm/aes-x86_64.pl 2010-12-12 18:05:36.000000000 +0100
215 @@ -1669,7 +1669,11 @@
219 ___
220 }
221 Index: openssl-1.0.1/crypto/aes/asm/aes-x86_64.pl
222 ===================================================================
223 --- openssl-1.0.1.orig/crypto/aes/asm/aes-x86_64.pl 2011-11-14 21:01:17.000000000 +0000
224 +++ openssl-1.0.1/crypto/aes/asm/aes-x86_64.pl 2012-03-17 09:20:04.000000000 +0000
225 @@ -1678,7 +1678,11 @@
216226 lea .LAES_Td(%rip),$sbox
217227 .Lcbc_picked_te:
218228
224234 cmp \$$speed_limit,%rdx
225235 jb .Lcbc_slow_prologue
226236 test \$15,%rdx
227 Index: openssl-1.0.0c/crypto/aes/Makefile
228 ===================================================================
229 --- openssl-1.0.0c.orig/crypto/aes/Makefile 2010-12-12 18:15:06.000000000 +0100
230 +++ openssl-1.0.0c/crypto/aes/Makefile 2010-12-12 18:15:30.000000000 +0100
231 @@ -51,7 +51,7 @@
232 aes-586.s: asm/aes-586.pl ../perlasm/x86asm.pl
233 $(PERL) asm/aes-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
237 Index: openssl-1.0.1/crypto/aes/Makefile
238 ===================================================================
239 --- openssl-1.0.1.orig/crypto/aes/Makefile 2011-11-14 20:42:21.000000000 +0000
240 +++ openssl-1.0.1/crypto/aes/Makefile 2012-03-17 09:20:04.000000000 +0000
241 @@ -55,7 +55,7 @@
242 aesni-x86.s: asm/aesni-x86.pl ../perlasm/x86asm.pl
243 $(PERL) asm/aesni-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
234244
235245 -aes-x86_64.s: asm/aes-x86_64.pl
236246 +aes-x86_64.S: asm/aes-x86_64.pl
237247 $(PERL) asm/aes-x86_64.pl $(PERLASM_SCHEME) > $@
238
239 aes-sparcv9.s: asm/aes-sparcv9.pl
248 vpaes-x86_64.s: asm/vpaes-x86_64.pl
249 $(PERL) asm/vpaes-x86_64.pl $(PERLASM_SCHEME) > $@