← Back to branch summary

~ubuntu-branches/ubuntu/lucid/openssl/lucid-proposed

« back to all changes in this revision

Viewing changes to crypto/des/asm/desboth.pl

  • Committer: Bazaar Package Importer
  • Author(s): Nicolas Valcárcel Scerpella (Canonical)
  • Date: 2009-12-06 20:16:24 UTC
  • mfrom: (11.1.9 sid)
  • Revision ID: james.westby@ubuntu.com-20091206201624-u126qjpqm2n2uuhu
Tags: 0.9.8k-7ubuntu1
https://launchpad.net/bugs/493392
* Merge from debian unstable, remaining changes (LP: #493392):
  - Link using -Bsymbolic-functions
  - Add support for lpia
  - Disable SSLv2 during compile
  - Ship documentation in openssl-doc, suggested by the package.
  - Use a different priority for libssl0.9.8/restart-services
    depending on whether a desktop, or server dist-upgrade is being
    performed.
  - Display a system restart required notification bubble on libssl0.9.8
    upgrade.
  - Replace duplicate files in the doc directory with symlinks.
  - Move runtime libraries to /lib, for the benefit of wpasupplicant
* Strip the patches out of the source into quilt patches
* Disable CVE-2009-3555.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
crypto/des/asm/desboth.pl
16
16
 
17
17
        &push("edi");
18
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
19
        &comment("");
25
20
        &comment("Load the data words");
26
21
        &mov($L,&DWP(0,"ebx","",0));
52
47
        &mov(&swtmp(2), (DWC(($enc)?"1":"0")));
53
48
        &mov(&swtmp(1), "eax");
54
49
        &mov(&swtmp(0), "ebx");
55
 
        &exch("ebx", "ebp");
56
 
        &call("DES_encrypt2\@PLT");
57
 
        &exch("ebx", "ebp");
 
50
        &call("DES_encrypt2");
58
51
        &mov(&swtmp(2), (DWC(($enc)?"0":"1")));
59
52
        &mov(&swtmp(1), "edi");
60
53
        &mov(&swtmp(0), "ebx");
61
 
        &exch("ebx", "ebp");
62
 
        &call("DES_encrypt2\@PLT");
63
 
        &exch("ebx", "ebp");
 
54
        &call("DES_encrypt2");
64
55
        &mov(&swtmp(2), (DWC(($enc)?"1":"0")));
65
56
        &mov(&swtmp(1), "esi");
66
57
        &mov(&swtmp(0), "ebx");
67
 
        &exch("ebx", "ebp");
68
 
        &call("DES_encrypt2\@PLT");
69
 
        &exch("ebx", "ebp");
 
58
        &call("DES_encrypt2");
70
59
 
71
60
        &stack_pop(3);
72
61
        &mov($L,&DWP(0,"ebx","",0));