Commit 6a46bf82 authored by unknown's avatar unknown
Browse files

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

into  hasky.mysql.fi:/home/anjuta/my/mysql-5.0
parents 4d8dacbd a2035e16

extra/yassl/README

+13 −3
Original line number Diff line number Diff line 
yaSSL Release notes, version 1.3.0 (04/26/06)

yaSSL Release notes, version 1.3.5 (06/01/06)





    This release of yaSSL contains bug fixes, portability enhancements,

    better libcurl support, and improved non-blocking I/O.



See normal  build instructions below under 1.0.6.

See libcurl build instructions below under 1.3.0.





********************yaSSL Release notes, version 1.3.0 (04/26/06)





    This release of yaSSL contains minor bug fixes, portability enhancements,
@@ -17,8 +27,8 @@ See normal build instructions below under 1.0.6. 
    make

    make openssl-links



    (then go to your libcurl home and tell libcurl about yaSSL)

    ./configure --with-ssl=/yaSSL-HomeDir

    (then go to your libcurl home and tell libcurl about yaSSL build dir)

    ./configure --with-ssl=/yaSSL-BuildDir LDFLAGS=-lm

    make

extra/yassl/include/openssl/engine.h

0 → 100644
+5 −0
Original line number Diff line number Diff line 
/* engine.h for libcurl */



#undef HAVE_OPENSSL_ENGINE_H

extra/yassl/include/openssl/pkcs12.h

0 → 100644
+5 −0
Original line number Diff line number Diff line 
/* pkcs12.h for libcurl */





#undef HAVE_OPENSSL_PKCS12_H

extra/yassl/src/handshake.cpp

+24 −6
Original line number Diff line number Diff line
@@ -458,6 +458,11 @@ void ProcessOldClientHello(input_buffer& input, SSL& ssl) 


    uint16 sz = ((b0 & 0x7f) << 8) | b1;



    if (sz > input.get_remaining()) {

        ssl.SetError(bad_input);

        return;

    }



    // hashHandShake manually

    const opaque* buffer = input.get_buffer() + input.get_current();

    ssl.useHashes().use_MD5().update(buffer, sz);
@@ -681,25 +686,38 @@ DoProcessReply(SSL& ssl, mySTL::auto_ptr<input_buffer> buffered) 
    // old style sslv2 client hello?

    if (ssl.getSecurity().get_parms().entity_ == server_end &&

                  ssl.getStates().getServer() == clientNull) 

        if (buffer.peek() != handshake)

        if (buffer.peek() != handshake) {

            ProcessOldClientHello(buffer, ssl);

            if (ssl.GetError()) {

                buffered.reset(0);

                return buffered;

            }

        }



    while(!buffer.eof()) {

        // each record

        RecordLayerHeader hdr;

        bool              needHdr = false;



        if (static_cast<uint>(RECORD_HEADER) > buffer.get_remaining())

            needHdr = true;

        else {

        buffer >> hdr;

        ssl.verifyState(hdr);

        }



        // make sure we have enough input in buffer to process this record

        if (hdr.length_ > buffer.get_remaining()) { 

            uint sz = buffer.get_remaining() + RECORD_HEADER;

        if (needHdr || hdr.length_ > buffer.get_remaining()) {

            // put header in front for next time processing

            uint extra = needHdr ? 0 : RECORD_HEADER;

            uint sz = buffer.get_remaining() + extra;

            buffered.reset(NEW_YS input_buffer(sz, buffer.get_buffer() +

                           buffer.get_current() - RECORD_HEADER, sz));

                           buffer.get_current() - extra, sz));

            break;

        }



        while (buffer.get_current() < hdr.length_ + RECORD_HEADER + offset) {

            // each message in record

            // each message in record, can be more than 1 if not encrypted

            if (ssl.getSecurity().get_parms().pending_ == false) // cipher on

                decrypt_message(ssl, buffer, hdr.length_);

            mySTL::auto_ptr<Message> msg(mf.CreateObject(hdr.type_), ysDelete);
@@ -717,7 +735,7 @@ DoProcessReply(SSL& ssl, mySTL::auto_ptr<input_buffer> buffered) 
        }

        offset += hdr.length_ + RECORD_HEADER;

    }

    return buffered;  // done, don't call again

    return buffered;

}

mysql-test/r/create.result

+0 −14
Original line number Diff line number Diff line
@@ -773,17 +773,3 @@ Warnings: 
Warning	1071	Specified key was too long; max key length is 765 bytes

insert into t1 values('aaa');

drop table t1;
 
drop table if exists `about:text`;

create table `about:text` ( 

_id int not null auto_increment,

`about:text` varchar(255) not null default '',

primary key (_id)

);

show create table `about:text`;

Table	Create Table

about:text	CREATE TABLE `about:text` (

  `_id` int(11) NOT NULL auto_increment,

  `about:text` varchar(255) NOT NULL default '',

  PRIMARY KEY  (`_id`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table `about:text`;