This series of patches integrates the two patches sended separately, resolves the conflict, and rebases on the latest code. The two patches respectively support the SM2/SM3 and EC-RDSA/streebog algorithm combinations for the pkcs7 parser. Elvira Khabirova (1): pkcs7: support EC-RDSA/streebog in SignerInfo Tianjia Zhang (1): pkcs7: parser support SM2 and SM3 algorithms combination crypto/asymmetric_keys/pkcs7_parser.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) -- 2.19.1.3.ge56e4f7
