out = BIO_new(BIO_s_file());
if (out == NULL)
EXIT(1);
- BIO_set_fp(out, stdout, BIO_NOCLOSE);
+ BIO_set_fp(out, stdout, BIO_NOCLOSE | BIO_FP_TEXT);
_cb = BN_GENCB_new();
if (!_cb)
BIO_puts(out, "\n");
alen = DH_size(a);
- abuf = (unsigned char *)OPENSSL_malloc(alen);
+ abuf = OPENSSL_malloc(alen);
aout = DH_compute_key(abuf, b->pub_key, a);
BIO_puts(out, "key1 =");
BIO_puts(out, "\n");
blen = DH_size(b);
- bbuf = (unsigned char *)OPENSSL_malloc(blen);
+ bbuf = OPENSSL_malloc(blen);
bout = DH_compute_key(bbuf, a->pub_key, b);
BIO_puts(out, "key2 =");
err:
ERR_print_errors_fp(stderr);
- if (abuf != NULL)
- OPENSSL_free(abuf);
- if (bbuf != NULL)
- OPENSSL_free(bbuf);
+ OPENSSL_free(abuf);
+ OPENSSL_free(bbuf);
DH_free(b);
DH_free(a);
- if (_cb)
- BN_GENCB_free(_cb);
+ BN_GENCB_free(_cb);
BIO_free(out);
# ifdef OPENSSL_SYS_NETWARE
if (ret)
static int run_rfc5114_tests(void)
{
int i;
- for (i = 0; i < (int)(sizeof(rfctd) / sizeof(rfc5114_td)); i++) {
+ for (i = 0; i < (int)OSSL_NELEM(rfctd); i++) {
DH *dhA, *dhB;
unsigned char *Z1 = NULL, *Z2 = NULL;
const rfc5114_td *td = rfctd + i;