|
Line
Link Here
|
| 0 |
-- src/lib/omniORB/orbcore/ssl/sslContext.cc |
0 |
++ src/lib/omniORB/orbcore/ssl/sslContext.cc |
|
Lines 109-114
Link Here
|
| 109 |
#include <ssl/sslTransportImpl.h> |
109 |
#include <ssl/sslTransportImpl.h> |
| 110 |
#include <openssl/rand.h> |
110 |
#include <openssl/rand.h> |
| 111 |
#include <openssl/err.h> |
111 |
#include <openssl/err.h> |
|
|
112 |
#include <openssl/dh.h> |
| 112 |
#include <omniORB4/linkHacks.h> |
113 |
#include <omniORB4/linkHacks.h> |
| 113 |
|
114 |
|
| 114 |
OMNI_EXPORT_LINK_FORCE_SYMBOL(sslContext); |
115 |
OMNI_EXPORT_LINK_FORCE_SYMBOL(sslContext); |
|
Lines 357-367
Link Here
|
| 357 |
0x02 |
362 |
0x02 |
| 358 |
}; |
363 |
}; |
| 359 |
|
364 |
|
|
|
365 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L |
| 360 |
dh->p = BN_bin2bn(dh512_p, sizeof(dh512_p), 0); |
366 |
dh->p = BN_bin2bn(dh512_p, sizeof(dh512_p), 0); |
| 361 |
dh->g = BN_bin2bn(dh512_g, sizeof(dh512_g), 0); |
367 |
dh->g = BN_bin2bn(dh512_g, sizeof(dh512_g), 0); |
| 362 |
if( !dh->p || !dh->g) { |
368 |
if( !dh->p || !dh->g) { |
| 363 |
OMNIORB_THROW(INITIALIZE,INITIALIZE_TransportError,CORBA::COMPLETED_NO); |
369 |
OMNIORB_THROW(INITIALIZE,INITIALIZE_TransportError,CORBA::COMPLETED_NO); |
| 364 |
} |
370 |
} |
|
|
371 |
#else |
| 372 |
BIGNUM *bn_p, *bn_g; |
| 373 |
bn_p = BN_bin2bn(dh512_p, sizeof(dh512_p), NULL); |
| 374 |
bn_g = BN_bin2bn(dh512_g, sizeof(dh512_g), NULL); |
| 375 |
if( !bn_p || !bn_g || !DH_set0_pqg(dh, bn_p, NULL, bn_g)) { |
| 376 |
DH_free(dh); |
| 377 |
BN_free(bn_p); |
| 378 |
BN_free(bn_g); |
| 379 |
OMNIORB_THROW(INITIALIZE,INITIALIZE_TransportError,CORBA::COMPLETED_NO); |
| 380 |
} |
| 381 |
#endif |
| 365 |
|
382 |
|
| 366 |
SSL_CTX_set_tmp_dh(pd_ctx, dh); |
383 |
SSL_CTX_set_tmp_dh(pd_ctx, dh); |
| 367 |
DH_free(dh); |
384 |
DH_free(dh); |
