diff options
| author | msvensson@neptunus.(none) <> | 2006-12-14 21:48:58 +0100 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2006-12-14 21:48:58 +0100 |
| commit | 45cd2db0439290e15a24aedea18c1fbfe635d8fc (patch) | |
| tree | 3a23f8fe6818b1c94c928f085b0e0c0e79cbe188 /extra | |
| parent | b8542e9cd76d6b0306822ec074467549ec3f2985 (diff) | |
| parent | 110b8af30396ba92efad2d51eb4ed82914903332 (diff) | |
| download | mariadb-git-45cd2db0439290e15a24aedea18c1fbfe635d8fc.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
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); |