3 files changed, 12 insertions, 3 deletions

diff --git a/src/lib/libcrypto/objects/obj_xref.c b/src/lib/libcrypto/objects/obj_xref.c
index 152eca5c67..9f744bcede 100644
--- a/src/lib/libcrypto/objects/obj_xref.c
+++ b/src/lib/libcrypto/objects/obj_xref.c
@@ -110,8 +110,10 @@ int OBJ_find_sigid_algs(int signid, int *pdig_nid, int *ppkey_nid)
 #endif
         if (rv == NULL)
                 return 0;
-        *pdig_nid = rv->hash_id;
-        *ppkey_nid = rv->pkey_id;
+        if (pdig_nid)
+                *pdig_nid = rv->hash_id;
+        if (ppkey_nid)
+                *ppkey_nid = rv->pkey_id;
         return 1;
         }
 
@@ -144,7 +146,8 @@ int OBJ_find_sigid_by_algs(int *psignid, int dig_nid, int pkey_nid)
 #endif
         if (rv == NULL)
                 return 0;
-        *psignid = (*rv)->sign_id;
+        if (psignid)
+                *psignid = (*rv)->sign_id;
         return 1;
         }
 
diff --git a/src/lib/libcrypto/objects/obj_xref.h b/src/lib/libcrypto/objects/obj_xref.h
index d5b9b8e198..e23938c296 100644
--- a/src/lib/libcrypto/objects/obj_xref.h
+++ b/src/lib/libcrypto/objects/obj_xref.h
@@ -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/src/lib/libcrypto/objects/obj_xref.txt b/src/lib/libcrypto/objects/obj_xref.txt
index e45b3d34b9..cb917182ee 100644
--- a/src/lib/libcrypto/objects/obj_xref.txt
+++ b/src/lib/libcrypto/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.