← Back to branch summary

~andersk/ubuntu/oneiric/openssl/spurious-reboot

« back to all changes in this revision

Viewing changes to .pc/perl-path.diff/crypto/des/asm/desboth.pl

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2011-05-01 23:51:53 UTC
  • mfrom: (11.1.20 sid)
  • Revision ID: james.westby@ubuntu.com-20110501235153-bjcxitndquaezb68
Tags: 1.0.0d-2ubuntu1
https://launchpad.net/bugs/675566
* Resynchronise with Debian (LP: #675566).  Remaining changes:
  - debian/libssl1.0.0.postinst:
    + Display a system restart required notification bubble on libssl1.0.0
      upgrade.
    + Use a different priority for libssl1.0.0/restart-services depending
      on whether a desktop, or server dist-upgrade is being performed.
  - debian/{libssl1.0.0-udeb.dirs, control, rules}: Create
    libssl1.0.0-udeb, for the benefit of wget-udeb (no wget-udeb package
    in Debian).
  - debian/{libcrypto1.0.0-udeb.dirs, libssl1.0.0.dirs, libssl1.0.0.files,
    rules}: Move runtime libraries to /lib, for the benefit of
    wpasupplicant.
  - debian/patches/aesni.patch: Backport Intel AES-NI support, now from
    http://rt.openssl.org/Ticket/Display.html?id=2065 rather than the
    0.9.8 variant.
  - debian/patches/Bsymbolic-functions.patch: Link using
    -Bsymbolic-functions.
  - debian/patches/perlpath-quilt.patch: Don't change perl #! paths under
    .pc.
  - debian/rules:
    + Don't run 'make test' when cross-building.
    + Use host compiler when cross-building.  Patch from Neil Williams.
    + Don't build for processors no longer supported: i486, i586 (on
      i386), v8 (on sparc).
    + Fix Makefile to properly clean up libs/ dirs in clean target.
    + Replace duplicate files in the doc directory with symlinks.
* Update architectures affected by Bsymbolic-functions.patch.
* Drop debian/patches/no-sslv2.patch; Debian now adds the 'no-ssl2'
  configure option, which compiles out SSLv2 support entirely, so this is
  no longer needed.
* Drop openssl-doc in favour of the libssl-doc package introduced by
  Debian.  Add Conflicts/Replaces until the next LTS release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/perl-path.diff/crypto/des/asm/desboth.pl
1
 
#!/usr/local/bin/perl
2
 
 
3
 
$L="edi";
4
 
$R="esi";
5
 
 
6
 
sub DES_encrypt3
7
 
        {
8
 
        local($name,$enc)=@_;
9
 
 
10
 
        &function_begin_B($name,"");
11
 
        &push("ebx");
12
 
        &mov("ebx",&wparam(0));
13
 
 
14
 
        &push("ebp");
15
 
        &push("esi");
16
 
 
17
 
        &push("edi");
18
 
 
19
 
        &call   (&label("pic_point0"));
20
 
        &set_label("pic_point0");
21
 
        &blindpop("ebp");
22
 
        &add    ("ebp", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point0") . "]");
23
 
 
24
 
        &comment("");
25
 
        &comment("Load the data words");
26
 
        &mov($L,&DWP(0,"ebx","",0));
27
 
        &mov($R,&DWP(4,"ebx","",0));
28
 
        &stack_push(3);
29
 
 
30
 
        &comment("");
31
 
        &comment("IP");
32
 
        &IP_new($L,$R,"edx",0);
33
 
 
34
 
        # put them back
35
 
        
36
 
        if ($enc)
37
 
                {
38
 
                &mov(&DWP(4,"ebx","",0),$R);
39
 
                 &mov("eax",&wparam(1));
40
 
                &mov(&DWP(0,"ebx","",0),"edx");
41
 
                 &mov("edi",&wparam(2));
42
 
                 &mov("esi",&wparam(3));
43
 
                }
44
 
        else
45
 
                {
46
 
                &mov(&DWP(4,"ebx","",0),$R);
47
 
                 &mov("esi",&wparam(1));
48
 
                &mov(&DWP(0,"ebx","",0),"edx");
49
 
                 &mov("edi",&wparam(2));
50
 
                 &mov("eax",&wparam(3));
51
 
                }
52
 
        &mov(&swtmp(2), (DWC(($enc)?"1":"0")));
53
 
        &mov(&swtmp(1), "eax");
54
 
        &mov(&swtmp(0), "ebx");
55
 
        &exch("ebx", "ebp");
56
 
        &call("DES_encrypt2\@PLT");
57
 
        &exch("ebx", "ebp");
58
 
        &mov(&swtmp(2), (DWC(($enc)?"0":"1")));
59
 
        &mov(&swtmp(1), "edi");
60
 
        &mov(&swtmp(0), "ebx");
61
 
        &exch("ebx", "ebp");
62
 
        &call("DES_encrypt2\@PLT");
63
 
        &exch("ebx", "ebp");
64
 
        &mov(&swtmp(2), (DWC(($enc)?"1":"0")));
65
 
        &mov(&swtmp(1), "esi");
66
 
        &mov(&swtmp(0), "ebx");
67
 
        &exch("ebx", "ebp");
68
 
        &call("DES_encrypt2\@PLT");
69
 
        &exch("ebx", "ebp");
70
 
 
71
 
        &stack_pop(3);
72
 
        &mov($L,&DWP(0,"ebx","",0));
73
 
        &mov($R,&DWP(4,"ebx","",0));
74
 
 
75
 
        &comment("");
76
 
        &comment("FP");
77
 
        &FP_new($L,$R,"eax",0);
78
 
 
79
 
        &mov(&DWP(0,"ebx","",0),"eax");
80
 
        &mov(&DWP(4,"ebx","",0),$R);
81
 
 
82
 
        &pop("edi");
83
 
        &pop("esi");
84
 
        &pop("ebp");
85
 
        &pop("ebx");
86
 
        &ret();
87
 
        &function_end_B($name);
88
 
        }
89
 
 
90