diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-10-09 23:13:50 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-10-09 23:13:50 +0000 |
| commit | 9309ea66177f927aefa14bf317a578427139a0fc (patch) | |
| tree | dde4b5ce742168c5860279a634457045ac562e17 /crypto/objects | |
| parent | 05c9e3aea584c4d618dc32a4825287f06828a537 (diff) | |
| download | openssl-9309ea66177f927aefa14bf317a578427139a0fc.tar.gz | |
Backport PSS signature support from HEAD.
Diffstat (limited to 'crypto/objects')
| -rw-r--r-- | crypto/objects/obj_xref.h | 4 | ||||
| -rw-r--r-- | crypto/objects/obj_xref.txt | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/crypto/objects/obj_xref.h b/crypto/objects/obj_xref.h index 7836f01d95..e23938c296 100644 --- a/crypto/objects/obj_xref.h +++ b/crypto/objects/obj_xref.h @@ -1,4 +1,4 @@ -/* AUTOGENERATED BY crypto/objects/objxref.pl, DO NOT EDIT */ +/* AUTOGENERATED BY objxref.pl, DO NOT EDIT */ typedef struct { @@ -38,10 +38,12 @@ static const nid_triple sigoid_srt[] = {NID_id_GostR3411_94_with_GostR3410_94, NID_id_GostR3411_94, NID_id_GostR3410_94}, {NID_id_GostR3411_94_with_GostR3410_94_cc, NID_id_GostR3411_94, NID_id_GostR3410_94_cc}, {NID_id_GostR3411_94_with_GostR3410_2001_cc, NID_id_GostR3411_94, NID_id_GostR3410_2001_cc}, + {NID_rsassaPss, NID_undef, NID_rsaEncryption}, }; static const nid_triple * const sigoid_srt_xref[] = { + &sigoid_srt[29], &sigoid_srt[17], &sigoid_srt[18], &sigoid_srt[0], diff --git a/crypto/objects/obj_xref.txt b/crypto/objects/obj_xref.txt index e45b3d34b9..cb917182ee 100644 --- a/crypto/objects/obj_xref.txt +++ b/crypto/objects/obj_xref.txt @@ -13,6 +13,10 @@ sha512WithRSAEncryption sha512 rsaEncryption sha224WithRSAEncryption sha224 rsaEncryption mdc2WithRSA mdc2 rsaEncryption ripemd160WithRSA ripemd160 rsaEncryption +# For PSS the digest algorithm can vary and depends on the included +# AlgorithmIdentifier. The digest "undef" indicates the public key +# method should handle this explicitly. +rsassaPss undef rsaEncryption # Alternative deprecated OIDs. By using the older "rsa" OID this # type will be recognized by not normally used. |