write_oid_and_params: moved nullity check of params earlier

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>

diff --git a/lib/x509/mpi.c b/lib/x509/mpi.c
index 2c301d321d7f580427d96b172416597101329c8a..20a64690a3d1c8b80cd87c1f9d2fbf21d9712c13 100644 (file)
--- a/lib/x509/mpi.c
+++ b/lib/x509/mpi.c
@@ -284,10 +284,14 @@ static int write_oid_and_params(ASN1_TYPE dst, const char *dst_name, const char
        int result;
        char name[128];
 
+       if (params == NULL) {
+               gnutls_assert();
+               return GNUTLS_E_INVALID_REQUEST;
+       }
+
        _gnutls_str_cpy(name, sizeof(name), dst_name);
        _gnutls_str_cat(name, sizeof(name), ".algorithm");
 
-
        /* write the OID.
         */
        result = asn1_write_value(dst, name, oid, 1);
@@ -305,11 +309,6 @@ static int write_oid_and_params(ASN1_TYPE dst, const char *dst_name, const char
        else if (params->pk == GNUTLS_PK_RSA_PSS) {
                gnutls_datum_t tmp = { NULL, 0 };
 
-               if (params == NULL) {
-                       gnutls_assert();
-                       return GNUTLS_E_INVALID_REQUEST;
-               }
-
                result = _gnutls_x509_write_rsa_pss_params(params, &tmp);
                if (result < 0)
                        return gnutls_assert_val(result);