Commit 03a057aa authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/opt/local/work/mysql-5.0-root
parents 5870ddf1 5216a1a9

extra/yassl/include/yassl_int.hpp

+6 −1
Original line number Diff line number Diff line
@@ -164,7 +164,12 @@ private: 


// openSSL bignum

struct BIGNUM {

    Integer int_;

    /*

      gcc 2.96 fix: because of two Integer classes (yaSSL::Integer and

      TaoCrypt::Integer), we need to explicitly state the namespace

      here to let gcc 2.96 deduce the correct type.

    */

    yaSSL::Integer int_;

    void assign(const byte* b, uint s) { int_.assign(b,s); }

};

extra/yassl/include/yassl_types.hpp

+10 −1
Original line number Diff line number Diff line
@@ -445,6 +445,15 @@ const opaque master_label[MASTER_LABEL_SZ + 1] = "master secret"; 
const opaque key_label   [KEY_LABEL_SZ + 1]    = "key expansion";





} // naemspace

} // namespace



#if __GNUC__ == 2 && __GNUC_MINOR__ <= 96

/*

  gcc 2.96 bails out because of two declarations of byte: yaSSL::byte and

  TaoCrypt::byte. TODO: define global types.hpp and move the declaration of

  'byte' there.

*/

using yaSSL::byte;

#endif



#endif // yaSSL_TYPES_HPP