@@ -108,13 +108,13 @@ def test_sign_verify_options
108
108
pssopts = {
109
109
"rsa_padding_mode" => "pss" ,
110
110
"rsa_pss_saltlen" => 20 ,
111
- "rsa_mgf1_md" => "SHA1 "
111
+ "rsa_mgf1_md" => "SHA256 "
112
112
}
113
113
sig_pss = key . sign ( "SHA256" , data , pssopts )
114
114
assert_equal 256 , sig_pss . bytesize
115
115
assert_equal true , key . verify ( "SHA256" , sig_pss , data , pssopts )
116
116
assert_equal true , key . verify_pss ( "SHA256" , sig_pss , data ,
117
- salt_length : 20 , mgf1_hash : "SHA1 " )
117
+ salt_length : 20 , mgf1_hash : "SHA256 " )
118
118
# Defaults to PKCS #1 v1.5 padding => verification failure
119
119
assert_equal false , key . verify ( "SHA256" , sig_pss , data )
120
120
@@ -188,22 +188,22 @@ def test_sign_verify_pss
188
188
data = "Sign me!"
189
189
invalid_data = "Sign me?"
190
190
191
- signature = key . sign_pss ( "SHA256" , data , salt_length : 20 , mgf1_hash : "SHA1 " )
191
+ signature = key . sign_pss ( "SHA256" , data , salt_length : 20 , mgf1_hash : "SHA256 " )
192
192
assert_equal 256 , signature . bytesize
193
193
assert_equal true ,
194
- key . verify_pss ( "SHA256" , signature , data , salt_length : 20 , mgf1_hash : "SHA1 " )
194
+ key . verify_pss ( "SHA256" , signature , data , salt_length : 20 , mgf1_hash : "SHA256 " )
195
195
assert_equal true ,
196
- key . verify_pss ( "SHA256" , signature , data , salt_length : :auto , mgf1_hash : "SHA1 " )
196
+ key . verify_pss ( "SHA256" , signature , data , salt_length : :auto , mgf1_hash : "SHA256 " )
197
197
assert_equal false ,
198
- key . verify_pss ( "SHA256" , signature , invalid_data , salt_length : 20 , mgf1_hash : "SHA1 " )
198
+ key . verify_pss ( "SHA256" , signature , invalid_data , salt_length : 20 , mgf1_hash : "SHA256 " )
199
199
200
- signature = key . sign_pss ( "SHA256" , data , salt_length : :digest , mgf1_hash : "SHA1 " )
200
+ signature = key . sign_pss ( "SHA256" , data , salt_length : :digest , mgf1_hash : "SHA256 " )
201
201
assert_equal true ,
202
- key . verify_pss ( "SHA256" , signature , data , salt_length : 32 , mgf1_hash : "SHA1 " )
202
+ key . verify_pss ( "SHA256" , signature , data , salt_length : 32 , mgf1_hash : "SHA256 " )
203
203
assert_equal true ,
204
- key . verify_pss ( "SHA256" , signature , data , salt_length : :auto , mgf1_hash : "SHA1 " )
204
+ key . verify_pss ( "SHA256" , signature , data , salt_length : :auto , mgf1_hash : "SHA256 " )
205
205
assert_equal false ,
206
- key . verify_pss ( "SHA256" , signature , data , salt_length : 20 , mgf1_hash : "SHA1 " )
206
+ key . verify_pss ( "SHA256" , signature , data , salt_length : 20 , mgf1_hash : "SHA256 " )
207
207
208
208
# The sign_pss with `salt_length: :max` raises the "invalid salt length"
209
209
# error in FIPS. We need to skip the tests in FIPS.
@@ -213,18 +213,18 @@ def test_sign_verify_pss
213
213
# FIPS 186-5 section 5.4 PKCS #1
214
214
# https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.186-5.pdf
215
215
unless OpenSSL . fips_mode
216
- signature = key . sign_pss ( "SHA256" , data , salt_length : :max , mgf1_hash : "SHA1 " )
216
+ signature = key . sign_pss ( "SHA256" , data , salt_length : :max , mgf1_hash : "SHA256 " )
217
217
# Should verify on the following salt_length (sLen).
218
218
# sLen <= emLen (octat) - 2 - hLen (octet) = 2048 / 8 - 2 - 256 / 8 = 222
219
219
# https://datatracker.ietf.org/doc/html/rfc8017#section-9.1.1
220
220
assert_equal true ,
221
- key . verify_pss ( "SHA256" , signature , data , salt_length : 222 , mgf1_hash : "SHA1 " )
221
+ key . verify_pss ( "SHA256" , signature , data , salt_length : 222 , mgf1_hash : "SHA256 " )
222
222
assert_equal true ,
223
- key . verify_pss ( "SHA256" , signature , data , salt_length : :auto , mgf1_hash : "SHA1 " )
223
+ key . verify_pss ( "SHA256" , signature , data , salt_length : :auto , mgf1_hash : "SHA256 " )
224
224
end
225
225
226
226
assert_raise ( OpenSSL ::PKey ::RSAError ) {
227
- key . sign_pss ( "SHA256" , data , salt_length : 223 , mgf1_hash : "SHA1 " )
227
+ key . sign_pss ( "SHA256" , data , salt_length : 223 , mgf1_hash : "SHA256 " )
228
228
}
229
229
end
230
230
0 commit comments