Keep RSA algorithm selected when retrying key generation after timeout

Tobias Fellarequested to merge
work/tobias/fix-retry-keygen-rsa into master

The code was mismatched here with one side using "RSA" as algorithm while the other side was using "RSA_S"

GnuPG-Bug-ID: 7365

Merge request reports