diff options
| author | cmiller@zippy.cornsilk.net <> | 2007-01-07 09:31:49 -0500 |
|---|---|---|
| committer | cmiller@zippy.cornsilk.net <> | 2007-01-07 09:31:49 -0500 |
| commit | a16eaf33014097b113ea67c9619a17c7b9a02d84 (patch) | |
| tree | ef218d11fc7a48e2a033e23e5e9cbe9dfda3a7ed /extra | |
| parent | 05d05c776f106d2e7a255a183884d3bf64c8979a (diff) | |
| parent | 1942fd0a499736a9d56744a145bb246da5b955c3 (diff) | |
| download | mariadb-git-a16eaf33014097b113ea67c9619a17c7b9a02d84.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint-greener
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/yassl/src/ssl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extra/yassl/src/ssl.cpp b/extra/yassl/src/ssl.cpp index ec2e99adecb..aa98465069c 100644 --- a/extra/yassl/src/ssl.cpp +++ b/extra/yassl/src/ssl.cpp @@ -122,7 +122,7 @@ int read_file(SSL_CTX* ctx, const char* file, int format, CertType type) EVP_BytesToKey(info.name, "MD5", info.iv, (byte*)password, passwordSz, 1, key, iv); - STL::auto_ptr<BulkCipher> cipher; + mySTL::auto_ptr<BulkCipher> cipher; if (strncmp(info.name, "DES-CBC", 7) == 0) cipher.reset(NEW_YS DES); else if (strncmp(info.name, "DES-EDE3-CBC", 13) == 0) @@ -138,7 +138,7 @@ int read_file(SSL_CTX* ctx, const char* file, int format, CertType type) return SSL_BAD_FILE; } cipher->set_decryptKey(key, info.iv); - STL::auto_ptr<x509> newx(NEW_YS x509(x->get_length())); + mySTL::auto_ptr<x509> newx(NEW_YS x509(x->get_length())); cipher->decrypt(newx->use_buffer(), x->get_buffer(), x->get_length()); ysDelete(x); |