diff options
| author | Roel Aaij <roel.aaij@gmail.com> | 2018-11-04 08:54:58 +0100 |
|---|---|---|
| committer | Roel Aaij <roel.aaij@gmail.com> | 2018-11-04 08:54:58 +0100 |
| commit | f84b25243bd03ceea17dc129493af6cd843b067e (patch) | |
| tree | a83f0c297c0744406ea041efb08cc87626163354 | |
| parent | 68e7fb2f17dd9348e586ef676d8138c4b849a1ce (diff) | |
Remove accidental if if.
| -rw-r--r-- | wocky/wocky-openssl-dh1024.c | 4 | ||||
| -rw-r--r-- | wocky/wocky-openssl-dh2048.c | 4 | ||||
| -rw-r--r-- | wocky/wocky-openssl-dh4096.c | 4 | ||||
| -rw-r--r-- | wocky/wocky-openssl-dh512.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/wocky/wocky-openssl-dh1024.c b/wocky/wocky-openssl-dh1024.c index bb50523..15b2793 100644 --- a/wocky/wocky-openssl-dh1024.c +++ b/wocky/wocky-openssl-dh1024.c @@ -25,12 +25,12 @@ DH *get_dh1024(void) 0x02, }; DH *dh; -#if if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) +#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) int r = 0; #endif if ((dh=DH_new()) == NULL) return(NULL); -#if if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) +#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) r = DH_set0_pqg(dh, BN_bin2bn(dh1024_p,sizeof(dh1024_p),NULL), NULL, BN_bin2bn(dh1024_g,sizeof(dh1024_g),NULL)); if (!r) diff --git a/wocky/wocky-openssl-dh2048.c b/wocky/wocky-openssl-dh2048.c index d53ceda..f51f5b8 100644 --- a/wocky/wocky-openssl-dh2048.c +++ b/wocky/wocky-openssl-dh2048.c @@ -36,12 +36,12 @@ DH *get_dh2048(void) 0x02, }; DH *dh; -#if if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) +#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) int r = 0; #endif if ((dh=DH_new()) == NULL) return(NULL); -#if if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) +#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) r = DH_set0_pqg(dh, BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL), NULL, BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL)); if (!r) diff --git a/wocky/wocky-openssl-dh4096.c b/wocky/wocky-openssl-dh4096.c index 93fa7e5..c72f903 100644 --- a/wocky/wocky-openssl-dh4096.c +++ b/wocky/wocky-openssl-dh4096.c @@ -57,12 +57,12 @@ DH *get_dh4096(void) 0x02, }; DH *dh; -#if if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) +#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) int r = 0; #endif if ((dh=DH_new()) == NULL) return(NULL); -#if if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) +#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) r = DH_set0_pqg(dh, BN_bin2bn(dh4096_p,sizeof(dh4096_p),NULL), NULL, BN_bin2bn(dh4096_g,sizeof(dh4096_g),NULL)); if (!r) diff --git a/wocky/wocky-openssl-dh512.c b/wocky/wocky-openssl-dh512.c index c2891cd..885fdc4 100644 --- a/wocky/wocky-openssl-dh512.c +++ b/wocky/wocky-openssl-dh512.c @@ -20,12 +20,12 @@ DH *get_dh512(void) 0x02, }; DH *dh; -#if if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) +#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) int r = 0; #endif if ((dh=DH_new()) == NULL) return(NULL); -#if if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) +#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) r = DH_set0_pqg(dh, BN_bin2bn(dh512_p,sizeof(dh512_p),NULL), NULL, BN_bin2bn(dh512_g,sizeof(dh512_g),NULL)); if (!r) |