← Back to branch summary

~percona-core/percona-server/5.5

« back to all changes in this revision

Viewing changes to extra/yassl/taocrypt/src/des.cpp

  • Committer: Laurynas Biveinis
  • Date: 2014-09-24 09:00:06 UTC
  • mfrom: (0.16977.27 mysql-5.5.40-release)
  • mto: This revision was merged to the branch mainline in revision 699.
  • Revision ID: laurynas.biveinis@percona.com-20140924090006-ncu1gugac5p7j7yj
https://launchpad.net/bugs/1366073
Merge MySQL 5.5.40, implementing
https://blueprints.launchpad.net/percona-server/+spec/merge-5.5.40.

It also takes the upstream fix for bug 1366073 aka
http://bugs.mysql.com/bug.php?id=73834, aka 
http://bugs.mysql.com/bug.php?id=73761.

Update man pages from mysql-5.5.40.tar.gz.

Show diffs side-by-side

added added

removed removed

Lines of Context:
extra/yassl/taocrypt/src/des.cpp
1
1
/*
2
 
   Copyright (C) 2000-2007 MySQL AB
3
 
   Use is subject to license terms
 
2
   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
4
3
 
5
4
   This program is free software; you can redistribute it and/or modify
6
5
   it under the terms of the GNU General Public License as published by
642
641
 
643
642
 
644
643
#ifdef _MSC_VER
645
 
    __declspec(naked)
 
644
    __declspec(naked) 
646
645
#else
647
 
    __attribute__ ((noinline)) 
 
646
    __attribute__ ((noinline))
648
647
#endif
649
648
void DES_EDE3::AsmProcess(const byte* in, byte* out, void* box) const
650
649
{
664
663
    #define EPILOG()  \
665
664
        "pop ebp;" \
666
665
        "pop ebx;" \
667
 
               "emms;" \
668
 
               ".att_syntax;" \
 
666
        "emms;" \
 
667
        ".att_syntax;" \
669
668
            :  \
670
669
            : "d" (this), "S" (in), "a" (box), "c" (out) \
671
670
            : "%edi", "memory", "cc" \