projects / packages / conserver.git / blame
| Commit | Line | Data |
|---|---|---|
| 596c6379 AM |
1 | --- conserver-8.1.18/conserver/main.c~ 2018-09-20 10:14:38.000000000 +0200 |
| 2 | +++ conserver-8.1.18/conserver/main.c 2018-09-20 10:17:58.968897256 +0200 | |
| 3 | @@ -108,12 +108,13 @@ GetDH512() | |
| 4 | 0x02, | |
| 5 | }; | |
| 6 | DH *dh; | |
| 7 | + BIGNUM *dhp_bn, *dhg_bn; | |
| 8 | ||
| 9 | if ((dh = DH_new()) == NULL) | |
| 10 | return (NULL); | |
| 11 | - dh->p = BN_bin2bn(dh512_p, sizeof(dh512_p), NULL); | |
| 12 | - dh->g = BN_bin2bn(dh512_g, sizeof(dh512_g), NULL); | |
| 13 | - if ((dh->p == NULL) || (dh->g == NULL)) { | |
| 14 | + dhp_bn = BN_bin2bn(dh512_p, sizeof(dh512_p), NULL); | |
| 15 | + dhg_bn = BN_bin2bn(dh512_g, sizeof(dh512_g), NULL); | |
| 16 | + if (dhp_bn == NULL || dhg_bn == NULL || !DH_set0_pqg(dh, dhp_bn, NULL, dhg_bn)) { | |
| 17 | DH_free(dh); | |
| 18 | return (NULL); | |
| 19 | } | |
| 20 | @@ -147,12 +147,13 @@ GetDH1024() | |
| 21 | 0x02, | |
| 22 | }; | |
| 23 | DH *dh; | |
| 24 | + BIGNUM *dhp_bn, *dhg_bn; | |
| 25 | ||
| 26 | if ((dh = DH_new()) == NULL) | |
| 27 | return (NULL); | |
| 28 | - dh->p = BN_bin2bn(dh1024_p, sizeof(dh1024_p), NULL); | |
| 29 | - dh->g = BN_bin2bn(dh1024_g, sizeof(dh1024_g), NULL); | |
| 30 | - if ((dh->p == NULL) || (dh->g == NULL)) { | |
| 31 | + dhp_bn = BN_bin2bn(dh1024_p, sizeof(dh1024_p), NULL); | |
| 32 | + dhg_bn = BN_bin2bn(dh1024_g, sizeof(dh1024_g), NULL); | |
| 33 | + if (dhp_bn == NULL || dhg_bn == NULL || !DH_set0_pqg(dh, dhp_bn, NULL, dhg_bn)) { | |
| 34 | DH_free(dh); | |
| 35 | return (NULL); | |
| 36 | } | |
| 37 | @@ -198,12 +199,13 @@ GetDH2048() | |
| 38 | 0x02, | |
| 39 | }; | |
| 40 | DH *dh; | |
| 41 | + BIGNUM *dhp_bn, *dhg_bn; | |
| 42 | ||
| 43 | if ((dh = DH_new()) == NULL) | |
| 44 | return (NULL); | |
| 45 | - dh->p = BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL); | |
| 46 | - dh->g = BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL); | |
| 47 | - if ((dh->p == NULL) || (dh->g == NULL)) { | |
| 48 | + dhp_bn = BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL); | |
| 49 | + dhg_bn = BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL); | |
| 50 | + if (dhp_bn == NULL || dhg_bn == NULL || !DH_set0_pqg(dh, dhp_bn, NULL, dhg_bn)) { | |
| 51 | DH_free(dh); | |
| 52 | return (NULL); | |
| 53 | } | |
| 54 | @@ -275,12 +277,13 @@ GetDH4096() | |
| 55 | 0x02, | |
| 56 | }; | |
| 57 | DH *dh; | |
| 58 | + BIGNUM *dhp_bn, *dhg_bn; | |
| 59 | ||
| 60 | if ((dh = DH_new()) == NULL) | |
| 61 | return (NULL); | |
| 62 | - dh->p = BN_bin2bn(dh4096_p, sizeof(dh4096_p), NULL); | |
| 63 | - dh->g = BN_bin2bn(dh4096_g, sizeof(dh4096_g), NULL); | |
| 64 | - if ((dh->p == NULL) || (dh->g == NULL)) { | |
| 65 | + dhp_bn = BN_bin2bn(dh4096_p, sizeof(dh4096_p), NULL); | |
| 66 | + dhg_bn = BN_bin2bn(dh4096_g, sizeof(dh4096_g), NULL); | |
| 67 | + if (dhp_bn == NULL || dhg_bn == NULL || !DH_set0_pqg(dh, dhp_bn, NULL, dhg_bn)) { | |
| 68 | DH_free(dh); | |
| 69 | return (NULL); | |
| 70 | } |