commit 3c1e8b539c7740599bf821fe337d82766d4eb60f
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Thu Jan 23 19:15:29 2014 +0100
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Sat Jan 25 12:48:58 2014 +0100
tree 76dd234a6ced4d77aec5a0d2809937c612725fa1
parent d9fd87be3368ad9a393e571cdee1c0b41b55736e

Finish parsing RSASSA-PSS parameters

library/x509_crt.c

diff --git a/library/x509_crt.c b/library/x509_crt.c
index 9a37f1a..1447689 100644
--- a/library/x509_crt.c
+++ b/library/x509_crt.c
@@ -620,9 +620,12 @@
     if( crt->sig_pk == POLARSSL_PK_RSASSA_PSS )
     {
         int salt_len, trailer_field;
+        md_type_t mgf_md;
 
-        if( ( ret = x509_get_rsassa_pss_params( &crt->sig_params,
-                        &crt->sig_md, &salt_len, &trailer_field ) ) != 0 )
+        /* Make sure params are valid */
+        ret = x509_get_rsassa_pss_params( &crt->sig_params,
+                &crt->sig_md, &mgf_md, &salt_len, &trailer_field );
+        if( ret != 0 )
             return( ret );
     }
     else
@@ -1184,15 +1187,20 @@
 
     if( crt->sig_pk == POLARSSL_PK_RSASSA_PSS )
     {
-        md_type_t md_alg;
+        md_type_t md_alg, mgf_md;
+        const md_info_t *md_info, *mgf_md_info;
         int salt_len, trailer_field;
 
         if( ( ret = x509_get_rsassa_pss_params( &crt->sig_params,
-                        &md_alg, &salt_len, &trailer_field ) ) != 0 )
+                        &md_alg, &mgf_md, &salt_len, &trailer_field ) ) != 0 )
             return( ret );
 
-        // TODO: SHA1 harcoded twice (WIP)
-        ret = snprintf( p, n, " (SHA1, MGF1-SHA1, %d, %d)",
+        md_info = md_info_from_type( md_alg );
+        mgf_md_info = md_info_from_type( mgf_md );
+
+        ret = snprintf( p, n, " (%s, MGF1-%s, 0x%02X, %d)",
+                              md_info ? md_info->name : "???",
+                              mgf_md_info ? mgf_md_info->name : "???",
                               salt_len, trailer_field );
         SAFE_SNPRINTF();
     }