@@ -55,18 +55,20 @@ fn generate_parameters(
5555
5656pub ( crate ) fn private_key_from_pkey (
5757 pkey : & openssl:: pkey:: PKeyRef < openssl:: pkey:: Private > ,
58- ) -> DHPrivateKey {
59- DHPrivateKey {
58+ ) -> CryptographyResult < DHPrivateKey > {
59+ check_dh_parameters ( & pkey. dh ( ) ?) ?;
60+ Ok ( DHPrivateKey {
6061 pkey : pkey. to_owned ( ) ,
61- }
62+ } )
6263}
6364
6465pub ( crate ) fn public_key_from_pkey (
6566 pkey : & openssl:: pkey:: PKeyRef < openssl:: pkey:: Public > ,
66- ) -> DHPublicKey {
67- DHPublicKey {
67+ ) -> CryptographyResult < DHPublicKey > {
68+ check_dh_parameters ( & pkey. dh ( ) ?) ?;
69+ Ok ( DHPublicKey {
6870 pkey : pkey. to_owned ( ) ,
69- }
71+ } )
7072}
7173
7274#[ pyo3:: pyfunction]
@@ -85,9 +87,9 @@ fn from_der_parameters(
8587 . transpose ( ) ?;
8688 let g = openssl:: bn:: BigNum :: from_slice ( asn1_params. g . as_bytes ( ) ) ?;
8789
88- Ok ( DHParameters {
89- dh : openssl :: dh :: Dh :: from_pqg ( p , q , g ) ? ,
90- } )
90+ let dh = openssl :: dh :: Dh :: from_pqg ( p , q , g ) ? ;
91+ check_dh_parameters ( & dh ) ? ;
92+ Ok ( DHParameters { dh } )
9193}
9294
9395#[ pyo3:: pyfunction]
@@ -119,13 +121,19 @@ fn dh_parameters_from_numbers(
119121 let g = utils:: py_int_to_bn ( py, numbers. g . bind ( py) ) ?;
120122
121123 let dh = openssl:: dh:: Dh :: from_pqg ( p, q, g) ?;
124+ check_dh_parameters ( & dh) ?;
125+ Ok ( dh)
126+ }
122127
128+ fn check_dh_parameters < T : openssl:: pkey:: HasParams > (
129+ dh : & openssl:: dh:: Dh < T > ,
130+ ) -> CryptographyResult < ( ) > {
123131 if !dh. check_key ( ) ? {
124132 return Err ( CryptographyError :: from (
125133 pyo3:: exceptions:: PyValueError :: new_err ( "Invalid DH parameters" ) ,
126134 ) ) ;
127135 }
128- Ok ( dh )
136+ Ok ( ( ) )
129137}
130138
131139fn clone_dh < T : openssl:: pkey:: HasParams > (
0 commit comments