diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-12-15 00:15:52 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-12-15 00:15:52 +0100 |
| commit | 306fdc6939716f62d16ae3135fb4512d29f31908 (patch) | |
| tree | ae99274f6313e30cf8be6660f2130b297b46e008 /extra | |
| parent | a70b46279d51fe01dae52d12c02c0cc8636d878c (diff) | |
| parent | 7cc50597b0a42a1413b84b8579a38c4aa2c46f17 (diff) | |
| download | mariadb-git-306fdc6939716f62d16ae3135fb4512d29f31908.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
extra/yassl/src/ssl.cpp:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/net_serv.cc:
Auto merged
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); |