diff options
| author | Bernard Normier <bernard@zeroc.com> | 2006-10-16 14:56:26 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2006-10-16 14:56:26 +0000 |
| commit | 89521cdc3bb3744a1ca3051003e28449ac344c16 (patch) | |
| tree | 270f0375c41fc6205371a25376da6895b57a82fa /cpp/src/IceSSL/Util.cpp | |
| parent | Added install targets for BCC "pdb" files (diff) | |
| download | ice-89521cdc3bb3744a1ca3051003e28449ac344c16.tar.bz2 ice-89521cdc3bb3744a1ca3051003e28449ac344c16.tar.xz ice-89521cdc3bb3744a1ca3051003e28449ac344c16.zip | |
Merged R3_1_branch after 3.1.1 release
Diffstat (limited to 'cpp/src/IceSSL/Util.cpp')
| -rw-r--r-- | cpp/src/IceSSL/Util.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cpp/src/IceSSL/Util.cpp b/cpp/src/IceSSL/Util.cpp index 81da0f00efb..8595a80293e 100644 --- a/cpp/src/IceSSL/Util.cpp +++ b/cpp/src/IceSSL/Util.cpp @@ -195,13 +195,14 @@ IceSSL::DHParams::~DHParams() bool IceSSL::DHParams::add(int keyLength, const string& file) { - FILE* fp = fopen(file.c_str(), "r"); - if(!fp) + BIO* bio = BIO_new(BIO_s_file()); + if(BIO_read_filename(bio, file.c_str()) <= 0) { + BIO_free(bio); return false; } - DH* dh = PEM_read_DHparams(fp, 0, 0, 0); - fclose(fp); + DH* dh = PEM_read_bio_DHparams(bio, 0, 0, 0); + BIO_free(bio); if(!dh) { return false; |