diff options
| -rw-r--r-- | lib/x509/crq.c | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/lib/x509/crq.c b/lib/x509/crq.c index 50c3e632f1..a3a00c5ba8 100644 --- a/lib/x509/crq.c +++ b/lib/x509/crq.c @@ -1072,6 +1072,7 @@ gnutls_x509_crq_set_challenge_password(gnutls_x509_crq_t crq, const char *pass) { int result; + char *password = NULL; if (crq == NULL) { gnutls_assert(); @@ -1089,16 +1090,29 @@ gnutls_x509_crq_set_challenge_password(gnutls_x509_crq_t crq, return _gnutls_asn2err(result); } + if (pass) { + gnutls_datum_t out; + result = _gnutls_utf8_password_normalize(pass, strlen(pass), &out); + if (result < 0) + return gnutls_assert_val(result); + + password = (char*)out.data; + } + result = _gnutls_x509_encode_and_write_attribute ("1.2.840.113549.1.9.7", crq->crq, - "certificationRequestInfo.attributes.?LAST", pass, - strlen(pass), 1); + "certificationRequestInfo.attributes.?LAST", password, + strlen(password), 1); if (result < 0) { gnutls_assert(); - return result; + goto cleanup; } - return 0; + result = 0; + + cleanup: + gnutls_free(password); + return result; } /** |