Merge remote-tracking branch 'refs/remotes/origin/development' into development

* refs/remotes/origin/development:
  Fix help message for cert_req/cert_write programs
This commit is contained in:
Manuel Pégourié-Gonnard 2015-10-30 16:54:35 +01:00
commit 1fa36597fc
2 changed files with 2 additions and 2 deletions

View file

@ -75,7 +75,7 @@ int main( void )
" key_encipherment\n" \ " key_encipherment\n" \
" data_encipherment\n" \ " data_encipherment\n" \
" key_agreement\n" \ " key_agreement\n" \
" key_certificate_sign\n" \ " key_cert_sign\n" \
" crl_sign\n" \ " crl_sign\n" \
" ns_cert_type=%%s default: (empty)\n" \ " ns_cert_type=%%s default: (empty)\n" \
" Comma-separated-list of values:\n" \ " Comma-separated-list of values:\n" \

View file

@ -115,7 +115,7 @@ int main( void )
" key_encipherment\n" \ " key_encipherment\n" \
" data_encipherment\n" \ " data_encipherment\n" \
" key_agreement\n" \ " key_agreement\n" \
" key_certificate_sign\n" \ " key_cert_sign\n" \
" crl_sign\n" \ " crl_sign\n" \
" ns_cert_type=%%s default: (empty)\n" \ " ns_cert_type=%%s default: (empty)\n" \
" Comma-separated-list of values:\n" \ " Comma-separated-list of values:\n" \