October 2007 - Limal Commits - openSUSE Mailing Lists

r2359 - /limal-tags/stable-1_4_1/limal-ca-mgm/
by mcalmer＠svn.opensuse.org 29 Oct '07

29 Oct '07

Author: mcalmer Date: Mon Oct 29 11:39:04 2007 New Revision: 2359 URL: http://svn.opensuse.org/viewcvs/limal?rev=2359&view=rev Log: Created tag stable-1_4_1 for limal-ca-mgm Added: limal-tags/stable-1_4_1/limal-ca-mgm/ - copied from r2358, limal-head/limal-ca-mgm/ -- To unsubscribe, e-mail: limal-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: limal-commit+help(a)opensuse.org

1 0

r2358 - /limal-tags/stable-1_4_1/
by mcalmer＠svn.opensuse.org 29 Oct '07

29 Oct '07

Author: mcalmer Date: Mon Oct 29 11:39:03 2007 New Revision: 2358 URL: http://svn.opensuse.org/viewcvs/limal?rev=2358&view=rev Log: Created tag stable-1_4_1 Added: limal-tags/stable-1_4_1/ -- To unsubscribe, e-mail: limal-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: limal-commit+help(a)opensuse.org

1 0

r2357 - in /limal-head/limal-ca-mgm: ./ package/ po/
by mcalmer＠svn.opensuse.org 29 Oct '07

29 Oct '07

Author: mcalmer Date: Mon Oct 29 11:30:37 2007 New Revision: 2357 URL: http://svn.opensuse.org/viewcvs/limal?rev=2357&view=rev Log: version 1.4.1 Modified: limal-head/limal-ca-mgm/VERSION limal-head/limal-ca-mgm/package/limal-ca-mgm.changes limal-head/limal-ca-mgm/po/af.po limal-head/limal-ca-mgm/po/ar.po limal-head/limal-ca-mgm/po/bn.po limal-head/limal-ca-mgm/po/ca.po limal-head/limal-ca-mgm/po/cs.po limal-head/limal-ca-mgm/po/da.po limal-head/limal-ca-mgm/po/de.po limal-head/limal-ca-mgm/po/el.po limal-head/limal-ca-mgm/po/en_GB.po limal-head/limal-ca-mgm/po/es.po limal-head/limal-ca-mgm/po/et.po limal-head/limal-ca-mgm/po/fi.po limal-head/limal-ca-mgm/po/fr.po limal-head/limal-ca-mgm/po/gu.po limal-head/limal-ca-mgm/po/hi.po limal-head/limal-ca-mgm/po/hu.po limal-head/limal-ca-mgm/po/it.po limal-head/limal-ca-mgm/po/ja.po limal-head/limal-ca-mgm/po/km.po limal-head/limal-ca-mgm/po/lt.po limal-head/limal-ca-mgm/po/mr.po limal-head/limal-ca-mgm/po/nb.po limal-head/limal-ca-mgm/po/nl.po limal-head/limal-ca-mgm/po/pa.po limal-head/limal-ca-mgm/po/pl.po limal-head/limal-ca-mgm/po/pt.po limal-head/limal-ca-mgm/po/pt_BR.po limal-head/limal-ca-mgm/po/ru.po limal-head/limal-ca-mgm/po/sv.po limal-head/limal-ca-mgm/po/ta.po limal-head/limal-ca-mgm/po/uk.po limal-head/limal-ca-mgm/po/xh.po limal-head/limal-ca-mgm/po/zh_CN.po limal-head/limal-ca-mgm/po/zh_TW.po limal-head/limal-ca-mgm/po/zu.po Modified: limal-head/limal-ca-mgm/VERSION URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/VERSION?rev=2… ============================================================================== --- limal-head/limal-ca-mgm/VERSION (original) +++ limal-head/limal-ca-mgm/VERSION Mon Oct 29 11:30:37 2007 @@ -1 +1 @@ -1.4.0 +1.4.1 Modified: limal-head/limal-ca-mgm/package/limal-ca-mgm.changes URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/package/limal… ============================================================================== --- limal-head/limal-ca-mgm/package/limal-ca-mgm.changes (original) +++ limal-head/limal-ca-mgm/package/limal-ca-mgm.changes Mon Oct 29 11:30:37 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Oct 29 11:10:22 CET 2007 - mc(a)suse.de + +- version 1.4.1 +- test for invalid password in convert functions and throw + the correct error [#337411] + +------------------------------------------------------------------- Fri Oct 12 17:52:14 CEST 2007 - mc(a)suse.de - improve error reporting from openssl commands Modified: limal-head/limal-ca-mgm/po/af.po URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/po/af.po?rev=… ============================================================================== --- limal-head/limal-ca-mgm/po/af.po (original) +++ limal-head/limal-ca-mgm/po/af.po Mon Oct 29 11:30:37 2007 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: limal-ca-mgm\n" "Report-Msgid-Bugs-To: translation(a)suse.de\n" -"POT-Creation-Date: 2007-09-28 16:31+0200\n" +"POT-Creation-Date: 2007-10-29 11:25+0100\n" "PO-Revision-Date: 2006-11-03 12:03\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" @@ -25,8 +25,8 @@ #: src/AuthorityInfoAccessExtension.cpp:259 #: src/AuthorityInfoAccessExtension.cpp:342 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:87 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:194 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:86 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:193 #: src/BasicConstraintsExtension.cpp:84 src/BasicConstraintsExtension.cpp:187 #: src/BitExtensions.cpp:134 src/BitExtensions.cpp:247 #: src/BitExtensions.cpp:374 src/BitExtensions.cpp:482 src/CA.cpp:1565 @@ -73,12 +73,12 @@ msgid "AuthorityKeyIdentifierExt is not present." msgstr "AuthorityKeyIdentifierExt is nie teenwoordig nie." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:155 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:174 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:154 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:173 msgid "AuthorityKeyIdentifierGenerateExt is not present." msgstr "AuthorityKeyIdentifierGenerateExt is nie teenwoordig nie." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:186 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:185 msgid "Invalid AuthorityKeyIdentifierGenerateExt object." msgstr "Ongeldige AuthorityKeyIdentifierGenerateExt-voorwerp." @@ -198,7 +198,7 @@ msgid "Duplicate DN. Request already exists." msgstr "Dupliseer DN. Versoek bestaan reeds." -#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:968 +#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:1007 msgid "Cannot parse the certificate name." msgstr "Kan die sertifikaatnaam nie ontleed nie." @@ -535,93 +535,112 @@ msgid "Invalid command %1." msgstr "Ongeldige opdrag %1." -#: src/OpenSSLUtils.cpp:138 src/OpenSSLUtils.cpp:241 src/OpenSSLUtils.cpp:334 -#: src/OpenSSLUtils.cpp:453 src/OpenSSLUtils.cpp:586 src/OpenSSLUtils.cpp:681 -#: src/OpenSSLUtils.cpp:761 -msgid "Command returned '%1' : %2" -msgstr "Opdrag beantwoord '%1' : %2" +#: src/OpenSSLUtils.cpp:132 src/OpenSSLUtils.cpp:240 src/OpenSSLUtils.cpp:338 +#: src/OpenSSLUtils.cpp:462 src/OpenSSLUtils.cpp:600 src/OpenSSLUtils.cpp:700 +#: src/OpenSSLUtils.cpp:782 src/OpenSSLUtils.cpp:871 src/OpenSSLUtils.cpp:952 +#: src/OpenSSLUtils.cpp:1051 src/OpenSSLUtils.cpp:1137 +#: src/OpenSSLUtils.cpp:1271 src/OpenSSLUtils.cpp:1390 +#: src/OpenSSLUtils.cpp:1493 src/OpenSSLUtils.cpp:1645 +#: src/OpenSSLUtils.cpp:1782 +msgid "Executing openssl command failed." +msgstr "" + +#: src/OpenSSLUtils.cpp:143 src/OpenSSLUtils.cpp:251 src/OpenSSLUtils.cpp:349 +#: src/OpenSSLUtils.cpp:473 src/OpenSSLUtils.cpp:611 src/OpenSSLUtils.cpp:711 +#: src/OpenSSLUtils.cpp:796 src/OpenSSLUtils.cpp:1162 +#: src/OpenSSLUtils.cpp:1311 src/OpenSSLUtils.cpp:1415 +#: src/OpenSSLUtils.cpp:1518 src/OpenSSLUtils.cpp:1682 +#: src/OpenSSLUtils.cpp:1822 +msgid "openssl command failed: %1" +msgstr "" -#: src/OpenSSLUtils.cpp:171 src/OpenSSLUtils.cpp:268 src/OpenSSLUtils.cpp:366 -#: src/OpenSSLUtils.cpp:479 src/OpenSSLUtils.cpp:613 src/OpenSSLUtils.cpp:704 +#: src/OpenSSLUtils.cpp:176 src/OpenSSLUtils.cpp:278 src/OpenSSLUtils.cpp:381 +#: src/OpenSSLUtils.cpp:499 src/OpenSSLUtils.cpp:638 src/OpenSSLUtils.cpp:734 msgid "No valid key file specified." msgstr "Geen geldige sleutellÃªer gespesifiseer nie." -#: src/OpenSSLUtils.cpp:276 src/OpenSSLUtils.cpp:374 +#: src/OpenSSLUtils.cpp:286 src/OpenSSLUtils.cpp:389 msgid "No valid request file specified." msgstr "Geen geldige versoeklÃªer gespesifiseer nie." -#: src/OpenSSLUtils.cpp:487 src/OpenSSLUtils.cpp:621 src/OpenSSLUtils.cpp:712 +#: src/OpenSSLUtils.cpp:507 src/OpenSSLUtils.cpp:646 src/OpenSSLUtils.cpp:742 msgid "No valid CA certificate file specified." msgstr "Geen geldige CA-sertifikaatlÃªer gespesifiseer nie." -#: src/OpenSSLUtils.cpp:495 src/OpenSSLUtils.cpp:785 +#: src/OpenSSLUtils.cpp:515 src/OpenSSLUtils.cpp:820 msgid "No valid certificate file specified." msgstr "Geen geldige sertifikaatlÃªer gespesifiseer nie." -#: src/OpenSSLUtils.cpp:793 +#: src/OpenSSLUtils.cpp:828 msgid "No valid CA directory specified." msgstr "Geen geldige CA-gids gespesifiseer nie." -#: src/OpenSSLUtils.cpp:943 +#: src/OpenSSLUtils.cpp:982 msgid "Showing certificate status with serial %1 failed (%2)." msgstr "Toon van sertifikaatstatus met serie %1 het misluk (%2)." -#: src/OpenSSLUtils.cpp:979 +#: src/OpenSSLUtils.cpp:1018 msgid "The key file does not exist." msgstr "Die sleutellÃªer bestaan nie." -#: src/OpenSSLUtils.cpp:1474 +#: src/OpenSSLUtils.cpp:1306 src/OpenSSLUtils.cpp:1677 +#: src/OpenSSLUtils.cpp:1817 +#, fuzzy +msgid "Invalid password." +msgstr "Ongeldige CA-wagwoord." + +#: src/OpenSSLUtils.cpp:1595 msgid "The password for encrypting the output is required." msgstr "Die wagwoord vir enkriptering van die uitset word vereis." -#: src/OpenSSLUtils.cpp:1579 +#: src/OpenSSLUtils.cpp:1736 msgid "The PKCS12 password is required." msgstr "Die PKCS12-wagwoord word vereis." -#: src/OpenSSLUtils.cpp:1665 src/OpenSSLUtils.cpp:1865 -#: src/OpenSSLUtils.cpp:2017 +#: src/OpenSSLUtils.cpp:1847 src/OpenSSLUtils.cpp:2047 +#: src/OpenSSLUtils.cpp:2199 msgid "Cannot read directory: %1 (%2) [%3]." msgstr "Kan gids nie lees nie: %1 (%2) [%3]." -#: src/OpenSSLUtils.cpp:1715 +#: src/OpenSSLUtils.cpp:1897 msgid "No serial number found in %1." msgstr "Geen serienommer gevind in %1 nie." -#: src/OpenSSLUtils.cpp:1735 +#: src/OpenSSLUtils.cpp:1917 msgid "The request already exists." msgstr "Die navraag bestaan reeds." -#: src/OpenSSLUtils.cpp:1926 +#: src/OpenSSLUtils.cpp:2108 msgid "Cannot find the request subject." msgstr "Kan die navraagonderwerp nie vind nie." -#: src/OpenSSLUtils.cpp:2087 +#: src/OpenSSLUtils.cpp:2269 msgid "Cannot find the certificate subject." msgstr "Kan die sertifikaatonderwerp nie vind nie." -#: src/OpenSSLUtils.cpp:2186 +#: src/OpenSSLUtils.cpp:2368 msgid "Invalid caName: %1." msgstr "Ongeldige caName: %1." -#: src/OpenSSLUtils.cpp:2195 +#: src/OpenSSLUtils.cpp:2377 msgid "'%1' does not exist." msgstr "'%1' bestaan nie." -#: src/OpenSSLUtils.cpp:2205 +#: src/OpenSSLUtils.cpp:2387 msgid "%1 still exists." msgstr "%1 bestaan steeds." -#: src/OpenSSLUtils.cpp:2216 src/OpenSSLUtils.cpp:2264 -#: src/OpenSSLUtils.cpp:2278 src/OpenSSLUtils.cpp:2292 -#: src/OpenSSLUtils.cpp:2306 src/OpenSSLUtils.cpp:2320 +#: src/OpenSSLUtils.cpp:2398 src/OpenSSLUtils.cpp:2446 +#: src/OpenSSLUtils.cpp:2460 src/OpenSSLUtils.cpp:2474 +#: src/OpenSSLUtils.cpp:2488 src/OpenSSLUtils.cpp:2502 msgid "Cannot create directory: %1 (%2 [%3])." msgstr "Kan gids nie skep nie: %1 (%2 [%3])." -#: src/OpenSSLUtils.cpp:2251 +#: src/OpenSSLUtils.cpp:2433 msgid "Cannot copy the configuration template." msgstr "Kan die konfigurasiesjabloon nie kopieer nie." -#: src/OpenSSLUtils.cpp:2338 +#: src/OpenSSLUtils.cpp:2520 msgid "Cannot create the file." msgstr "Kan die lÃªer nie skep nie." @@ -740,28 +759,28 @@ msgid "Invalid SubjectKeyIdentifierExt object." msgstr "Ongeldige SubjectKeyIdentifierExt-voorwerp." -#: src/X509v3CertificateExtensions_Priv.cpp:394 -#: src/X509v3CertificateExtensions_Priv.cpp:450 +#: src/X509v3CertificateExtensions_Priv.cpp:395 +#: src/X509v3CertificateExtensions_Priv.cpp:452 #: src/X509v3RequestExtensions_Priv.cpp:134 #: src/X509v3RequestExtensions_Priv.cpp:189 msgid "Extension occurred more than once: %1." msgstr "Uitbreiding het meer as een keer voorgekom: %1." -#: src/X509v3CertificateExtensions_Priv.cpp:401 -#: src/X509v3CertificateExtensions_Priv.cpp:457 +#: src/X509v3CertificateExtensions_Priv.cpp:402 +#: src/X509v3CertificateExtensions_Priv.cpp:459 #: src/X509v3RequestExtensions_Priv.cpp:141 #: src/X509v3RequestExtensions_Priv.cpp:196 msgid "Unable to parse the certificate (NID: %1 Crit: %2)." msgstr "Kan die volgende sertifikaat nie ontleed nie (NID: %1 Crit: %2)." -#: src/X509v3CertificateExtensions_Priv.cpp:509 -#: src/X509v3CertificateExtensions_Priv.cpp:575 -#: src/X509v3CertificateExtensions_Priv.cpp:639 -#: src/X509v3CertificateExtensions_Priv.cpp:701 -#: src/X509v3CertificateExtensions_Priv.cpp:771 -#: src/X509v3CertificateExtensions_Priv.cpp:840 -#: src/X509v3CertificateExtensions_Priv.cpp:916 -#: src/X509v3CertificateExtensions_Priv.cpp:1002 +#: src/X509v3CertificateExtensions_Priv.cpp:511 +#: src/X509v3CertificateExtensions_Priv.cpp:577 +#: src/X509v3CertificateExtensions_Priv.cpp:641 +#: src/X509v3CertificateExtensions_Priv.cpp:703 +#: src/X509v3CertificateExtensions_Priv.cpp:773 +#: src/X509v3CertificateExtensions_Priv.cpp:842 +#: src/X509v3CertificateExtensions_Priv.cpp:918 +#: src/X509v3CertificateExtensions_Priv.cpp:1004 #: src/X509v3CRLExtensions_Priv.cpp:135 #: src/X509v3RequestExtensions_Priv.cpp:249 #: src/X509v3RequestExtensions_Priv.cpp:315 @@ -770,14 +789,14 @@ msgid "Extension occurred more than once." msgstr "Uitbreiding het meer as een keer voorgekom:" -#: src/X509v3CertificateExtensions_Priv.cpp:514 -#: src/X509v3CertificateExtensions_Priv.cpp:580 -#: src/X509v3CertificateExtensions_Priv.cpp:644 -#: src/X509v3CertificateExtensions_Priv.cpp:707 -#: src/X509v3CertificateExtensions_Priv.cpp:776 -#: src/X509v3CertificateExtensions_Priv.cpp:846 -#: src/X509v3CertificateExtensions_Priv.cpp:921 -#: src/X509v3CertificateExtensions_Priv.cpp:1007 +#: src/X509v3CertificateExtensions_Priv.cpp:516 +#: src/X509v3CertificateExtensions_Priv.cpp:582 +#: src/X509v3CertificateExtensions_Priv.cpp:646 +#: src/X509v3CertificateExtensions_Priv.cpp:709 +#: src/X509v3CertificateExtensions_Priv.cpp:778 +#: src/X509v3CertificateExtensions_Priv.cpp:848 +#: src/X509v3CertificateExtensions_Priv.cpp:923 +#: src/X509v3CertificateExtensions_Priv.cpp:1009 #: src/X509v3CRLExtensions_Priv.cpp:140 #: src/X509v3RequestExtensions_Priv.cpp:254 #: src/X509v3RequestExtensions_Priv.cpp:320 @@ -786,7 +805,7 @@ msgid "Unable to parse the certificate (Crit: %1)." msgstr "Kan die sertifikaat nie ontleed nie (Crit: %1)." -#: src/X509v3CertificateExtensions_Priv.cpp:941 +#: src/X509v3CertificateExtensions_Priv.cpp:943 msgid "Invalid location in authorityInfoAccess." msgstr "Ongeldige plek in authorityInfoAccess." @@ -918,3 +937,6 @@ #: src/X509v3RequestExtensions.cpp:231 msgid "Invalid value for X509v3RequestExts::setSubjectAlternativeName." msgstr "Ongeldige waarde vir X509v3RequestExts::setSubjectAlternativeName." + +#~ msgid "Command returned '%1' : %2" +#~ msgstr "Opdrag beantwoord '%1' : %2" Modified: limal-head/limal-ca-mgm/po/ar.po URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/po/ar.po?rev=… ============================================================================== --- limal-head/limal-ca-mgm/po/ar.po (original) +++ limal-head/limal-ca-mgm/po/ar.po Mon Oct 29 11:30:37 2007 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: @PACKAGE@\n" "Report-Msgid-Bugs-To: translation(a)suse.de\n" -"POT-Creation-Date: 2007-09-28 16:31+0200\n" +"POT-Creation-Date: 2007-10-29 11:25+0100\n" "PO-Revision-Date: 2001-07-13 15:36+0200\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" @@ -28,8 +28,8 @@ #: src/AuthorityInfoAccessExtension.cpp:259 #: src/AuthorityInfoAccessExtension.cpp:342 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:87 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:194 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:86 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:193 #: src/BasicConstraintsExtension.cpp:84 src/BasicConstraintsExtension.cpp:187 #: src/BitExtensions.cpp:134 src/BitExtensions.cpp:247 #: src/BitExtensions.cpp:374 src/BitExtensions.cpp:482 src/CA.cpp:1565 @@ -76,12 +76,12 @@ msgid "AuthorityKeyIdentifierExt is not present." msgstr "AuthorityKeyIdentifierExt ØºÙØ± ÙÙØ¬ÙØ¯." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:155 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:174 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:154 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:173 msgid "AuthorityKeyIdentifierGenerateExt is not present." msgstr "AuthorityKeyIdentifierGenerateExt ØºÙØ± ÙÙØ¬ÙØ¯." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:186 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:185 msgid "Invalid AuthorityKeyIdentifierGenerateExt object." msgstr "ÙØ§Ø¦Ù AuthorityKeyIdentifierGenerateExt ØºÙØ± ØµØ§ÙØ." @@ -201,7 +201,7 @@ msgid "Duplicate DN. Request already exists." msgstr "Ø§Ø³Ù ÙÙÙØ² ÙÙØ±Ø±. Ø§ÙØ·ÙØ¨ ÙÙØ¬ÙØ¯ Ø¨Ø§ÙÙØ¹Ù." -#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:968 +#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:1007 msgid "Cannot parse the certificate name." msgstr "ØªØ¹Ø°Ø± ØªØÙÙÙ Ø§Ø³Ù Ø§ÙØ´ÙØ§Ø¯Ø©." @@ -538,93 +538,112 @@ msgid "Invalid command %1." msgstr "Ø£ÙØ± ØºÙØ± ØµØ§ÙØ %1." -#: src/OpenSSLUtils.cpp:138 src/OpenSSLUtils.cpp:241 src/OpenSSLUtils.cpp:334 -#: src/OpenSSLUtils.cpp:453 src/OpenSSLUtils.cpp:586 src/OpenSSLUtils.cpp:681 -#: src/OpenSSLUtils.cpp:761 -msgid "Command returned '%1' : %2" -msgstr "ÙØªØ¬ Ø¹Ù ÙØ°Ø§ Ø§ÙØ£ÙØ± '%1' : %2" +#: src/OpenSSLUtils.cpp:132 src/OpenSSLUtils.cpp:240 src/OpenSSLUtils.cpp:338 +#: src/OpenSSLUtils.cpp:462 src/OpenSSLUtils.cpp:600 src/OpenSSLUtils.cpp:700 +#: src/OpenSSLUtils.cpp:782 src/OpenSSLUtils.cpp:871 src/OpenSSLUtils.cpp:952 +#: src/OpenSSLUtils.cpp:1051 src/OpenSSLUtils.cpp:1137 +#: src/OpenSSLUtils.cpp:1271 src/OpenSSLUtils.cpp:1390 +#: src/OpenSSLUtils.cpp:1493 src/OpenSSLUtils.cpp:1645 +#: src/OpenSSLUtils.cpp:1782 +msgid "Executing openssl command failed." +msgstr "" + +#: src/OpenSSLUtils.cpp:143 src/OpenSSLUtils.cpp:251 src/OpenSSLUtils.cpp:349 +#: src/OpenSSLUtils.cpp:473 src/OpenSSLUtils.cpp:611 src/OpenSSLUtils.cpp:711 +#: src/OpenSSLUtils.cpp:796 src/OpenSSLUtils.cpp:1162 +#: src/OpenSSLUtils.cpp:1311 src/OpenSSLUtils.cpp:1415 +#: src/OpenSSLUtils.cpp:1518 src/OpenSSLUtils.cpp:1682 +#: src/OpenSSLUtils.cpp:1822 +msgid "openssl command failed: %1" +msgstr "" -#: src/OpenSSLUtils.cpp:171 src/OpenSSLUtils.cpp:268 src/OpenSSLUtils.cpp:366 -#: src/OpenSSLUtils.cpp:479 src/OpenSSLUtils.cpp:613 src/OpenSSLUtils.cpp:704 +#: src/OpenSSLUtils.cpp:176 src/OpenSSLUtils.cpp:278 src/OpenSSLUtils.cpp:381 +#: src/OpenSSLUtils.cpp:499 src/OpenSSLUtils.cpp:638 src/OpenSSLUtils.cpp:734 msgid "No valid key file specified." msgstr "ÙÙ ÙØªÙ ØªØØ¯ÙØ¯ ÙÙÙ ÙÙØªØ§Ø ØµØ§ÙØ." -#: src/OpenSSLUtils.cpp:276 src/OpenSSLUtils.cpp:374 +#: src/OpenSSLUtils.cpp:286 src/OpenSSLUtils.cpp:389 msgid "No valid request file specified." msgstr "ÙÙ ÙØªÙ ØªØØ¯ÙØ¯ ÙÙÙ Ø·ÙØ¨ ØµØ§ÙØ." -#: src/OpenSSLUtils.cpp:487 src/OpenSSLUtils.cpp:621 src/OpenSSLUtils.cpp:712 +#: src/OpenSSLUtils.cpp:507 src/OpenSSLUtils.cpp:646 src/OpenSSLUtils.cpp:742 msgid "No valid CA certificate file specified." msgstr "ÙÙ ÙØªÙ ØªØØ¯ÙØ¯ ÙÙÙ Ø´ÙØ§Ø¯Ø© CA ØµØ§ÙØ." -#: src/OpenSSLUtils.cpp:495 src/OpenSSLUtils.cpp:785 +#: src/OpenSSLUtils.cpp:515 src/OpenSSLUtils.cpp:820 msgid "No valid certificate file specified." msgstr "ÙÙ ÙØªÙ ØªØØ¯ÙØ¯ ÙÙÙ Ø´ÙØ§Ø¯Ø© ØµØ§ÙØ." -#: src/OpenSSLUtils.cpp:793 +#: src/OpenSSLUtils.cpp:828 msgid "No valid CA directory specified." msgstr "ÙÙ ÙØªÙ ØªØØ¯ÙØ¯ Ø¯ÙÙÙ CA ØµØ§ÙØ." -#: src/OpenSSLUtils.cpp:943 +#: src/OpenSSLUtils.cpp:982 msgid "Showing certificate status with serial %1 failed (%2)." msgstr "ÙØ´Ù Ø¥Ø¸ÙØ§Ø± ØØ§ÙØ© Ø§ÙØ´ÙØ§Ø¯Ø© ÙØ¹ Ø§ÙØªØ³ÙØ³Ù %1 (%2)." -#: src/OpenSSLUtils.cpp:979 +#: src/OpenSSLUtils.cpp:1018 msgid "The key file does not exist." msgstr "ÙÙÙ Ø§ÙÙÙØªØ§Ø ØºÙØ± ÙÙØ¬ÙØ¯." -#: src/OpenSSLUtils.cpp:1474 +#: src/OpenSSLUtils.cpp:1306 src/OpenSSLUtils.cpp:1677 +#: src/OpenSSLUtils.cpp:1817 +#, fuzzy +msgid "Invalid password." +msgstr "ÙÙÙØ© Ø³Ø± CA ØºÙØ± ØµØ§ÙØØ©." + +#: src/OpenSSLUtils.cpp:1595 msgid "The password for encrypting the output is required." msgstr "ÙØ·ÙÙØ¨ ÙÙÙØ© Ø§ÙØ³Ø± Ø§ÙØ®Ø§ØµØ© Ø¨ØªØ´ÙÙØ± Ø§ÙÙØ®Ø±Ø¬Ø§Øª." -#: src/OpenSSLUtils.cpp:1579 +#: src/OpenSSLUtils.cpp:1736 msgid "The PKCS12 password is required." msgstr "ÙØ·ÙÙØ¨ ÙÙÙØ© Ø§ÙØ³Ø± PKCS12." -#: src/OpenSSLUtils.cpp:1665 src/OpenSSLUtils.cpp:1865 -#: src/OpenSSLUtils.cpp:2017 +#: src/OpenSSLUtils.cpp:1847 src/OpenSSLUtils.cpp:2047 +#: src/OpenSSLUtils.cpp:2199 msgid "Cannot read directory: %1 (%2) [%3]." msgstr "ØªØ¹Ø°Ø±Øª ÙØ±Ø§Ø¡Ø© Ø§ÙØ¯ÙÙÙ: %1 (%2) [%3]." -#: src/OpenSSLUtils.cpp:1715 +#: src/OpenSSLUtils.cpp:1897 msgid "No serial number found in %1." msgstr "ÙÙ ÙØªÙ Ø§ÙØ¹Ø«ÙØ± Ø¹ÙÙ Ø£Ù Ø±ÙÙ ØªØ³ÙØ³ÙÙ ÙÙ %1." -#: src/OpenSSLUtils.cpp:1735 +#: src/OpenSSLUtils.cpp:1917 msgid "The request already exists." msgstr "Ø§ÙØ·ÙØ¨ ÙÙØ¬ÙØ¯ Ø¨Ø§ÙÙØ¹Ù." -#: src/OpenSSLUtils.cpp:1926 +#: src/OpenSSLUtils.cpp:2108 msgid "Cannot find the request subject." msgstr "ØªØ¹Ø°Ø± Ø§ÙØ¹Ø«ÙØ± Ø¹ÙÙ ÙÙØ¶ÙØ¹ Ø§ÙØ·ÙØ¨." -#: src/OpenSSLUtils.cpp:2087 +#: src/OpenSSLUtils.cpp:2269 msgid "Cannot find the certificate subject." msgstr "ØªØ¹Ø°Ø± Ø§ÙØ¹Ø«ÙØ± Ø¹ÙÙ ÙÙØ¶ÙØ¹ Ø§ÙØ´ÙØ§Ø¯Ø©." -#: src/OpenSSLUtils.cpp:2186 +#: src/OpenSSLUtils.cpp:2368 msgid "Invalid caName: %1." msgstr "caName ØºÙØ± ØµØ§ÙØ: %1." -#: src/OpenSSLUtils.cpp:2195 +#: src/OpenSSLUtils.cpp:2377 msgid "'%1' does not exist." msgstr "'%1' ØºÙØ± ÙÙØ¬ÙØ¯." -#: src/OpenSSLUtils.cpp:2205 +#: src/OpenSSLUtils.cpp:2387 msgid "%1 still exists." msgstr "ÙØ§ ÙØ²Ø§Ù %1 ÙÙØ¬ÙØ¯ÙØ§." -#: src/OpenSSLUtils.cpp:2216 src/OpenSSLUtils.cpp:2264 -#: src/OpenSSLUtils.cpp:2278 src/OpenSSLUtils.cpp:2292 -#: src/OpenSSLUtils.cpp:2306 src/OpenSSLUtils.cpp:2320 +#: src/OpenSSLUtils.cpp:2398 src/OpenSSLUtils.cpp:2446 +#: src/OpenSSLUtils.cpp:2460 src/OpenSSLUtils.cpp:2474 +#: src/OpenSSLUtils.cpp:2488 src/OpenSSLUtils.cpp:2502 msgid "Cannot create directory: %1 (%2 [%3])." msgstr "ØªØ¹Ø°Ø± Ø¥ÙØ´Ø§Ø¡ Ø§ÙØ¯ÙÙÙ: %1 (%2 [%3])." -#: src/OpenSSLUtils.cpp:2251 +#: src/OpenSSLUtils.cpp:2433 msgid "Cannot copy the configuration template." msgstr "ØªØ¹Ø°Ø± ÙØ³Ø® ÙØ§ÙØ¨ Ø§ÙØªÙÙÙÙ." -#: src/OpenSSLUtils.cpp:2338 +#: src/OpenSSLUtils.cpp:2520 msgid "Cannot create the file." msgstr "ØªØ¹Ø°Ø± Ø¥ÙØ´Ø§Ø¡ Ø§ÙÙÙÙ." @@ -743,28 +762,28 @@ msgid "Invalid SubjectKeyIdentifierExt object." msgstr "ÙØ§Ø¦Ù SubjectKeyIdentifierExt ØºÙØ± ØµØ§ÙØ." -#: src/X509v3CertificateExtensions_Priv.cpp:394 -#: src/X509v3CertificateExtensions_Priv.cpp:450 +#: src/X509v3CertificateExtensions_Priv.cpp:395 +#: src/X509v3CertificateExtensions_Priv.cpp:452 #: src/X509v3RequestExtensions_Priv.cpp:134 #: src/X509v3RequestExtensions_Priv.cpp:189 msgid "Extension occurred more than once: %1." msgstr "Ø¸ÙØ± Ø§ÙØ§ÙØªØ¯Ø§Ø¯ Ø£ÙØ«Ø± ÙÙ ÙØ±Ø©: %1." -#: src/X509v3CertificateExtensions_Priv.cpp:401 -#: src/X509v3CertificateExtensions_Priv.cpp:457 +#: src/X509v3CertificateExtensions_Priv.cpp:402 +#: src/X509v3CertificateExtensions_Priv.cpp:459 #: src/X509v3RequestExtensions_Priv.cpp:141 #: src/X509v3RequestExtensions_Priv.cpp:196 msgid "Unable to parse the certificate (NID: %1 Crit: %2)." msgstr "ØªØ¹Ø°Ø± ØªØÙÙÙ Ø§ÙØ´ÙØ§Ø¯Ø© (NID: %1 Crit: %2)." -#: src/X509v3CertificateExtensions_Priv.cpp:509 -#: src/X509v3CertificateExtensions_Priv.cpp:575 -#: src/X509v3CertificateExtensions_Priv.cpp:639 -#: src/X509v3CertificateExtensions_Priv.cpp:701 -#: src/X509v3CertificateExtensions_Priv.cpp:771 -#: src/X509v3CertificateExtensions_Priv.cpp:840 -#: src/X509v3CertificateExtensions_Priv.cpp:916 -#: src/X509v3CertificateExtensions_Priv.cpp:1002 +#: src/X509v3CertificateExtensions_Priv.cpp:511 +#: src/X509v3CertificateExtensions_Priv.cpp:577 +#: src/X509v3CertificateExtensions_Priv.cpp:641 +#: src/X509v3CertificateExtensions_Priv.cpp:703 +#: src/X509v3CertificateExtensions_Priv.cpp:773 +#: src/X509v3CertificateExtensions_Priv.cpp:842 +#: src/X509v3CertificateExtensions_Priv.cpp:918 +#: src/X509v3CertificateExtensions_Priv.cpp:1004 #: src/X509v3CRLExtensions_Priv.cpp:135 #: src/X509v3RequestExtensions_Priv.cpp:249 #: src/X509v3RequestExtensions_Priv.cpp:315 @@ -773,14 +792,14 @@ msgid "Extension occurred more than once." msgstr "Ø¸ÙØ± Ø§ÙØ§ÙØªØ¯Ø§Ø¯ Ø£ÙØ«Ø± ÙÙ ÙØ±Ø©." -#: src/X509v3CertificateExtensions_Priv.cpp:514 -#: src/X509v3CertificateExtensions_Priv.cpp:580 -#: src/X509v3CertificateExtensions_Priv.cpp:644 -#: src/X509v3CertificateExtensions_Priv.cpp:707 -#: src/X509v3CertificateExtensions_Priv.cpp:776 -#: src/X509v3CertificateExtensions_Priv.cpp:846 -#: src/X509v3CertificateExtensions_Priv.cpp:921 -#: src/X509v3CertificateExtensions_Priv.cpp:1007 +#: src/X509v3CertificateExtensions_Priv.cpp:516 +#: src/X509v3CertificateExtensions_Priv.cpp:582 +#: src/X509v3CertificateExtensions_Priv.cpp:646 +#: src/X509v3CertificateExtensions_Priv.cpp:709 +#: src/X509v3CertificateExtensions_Priv.cpp:778 +#: src/X509v3CertificateExtensions_Priv.cpp:848 +#: src/X509v3CertificateExtensions_Priv.cpp:923 +#: src/X509v3CertificateExtensions_Priv.cpp:1009 #: src/X509v3CRLExtensions_Priv.cpp:140 #: src/X509v3RequestExtensions_Priv.cpp:254 #: src/X509v3RequestExtensions_Priv.cpp:320 @@ -789,7 +808,7 @@ msgid "Unable to parse the certificate (Crit: %1)." msgstr "ØªØ¹Ø°Ø± ØªØÙÙÙ Ø§ÙØ´ÙØ§Ø¯Ø© (Crit: %1)." -#: src/X509v3CertificateExtensions_Priv.cpp:941 +#: src/X509v3CertificateExtensions_Priv.cpp:943 msgid "Invalid location in authorityInfoAccess." msgstr "ÙÙÙØ¹ ØºÙØ± ØµØ§ÙØ ÙÙ authorityInfoAccess." @@ -916,3 +935,6 @@ #: src/X509v3RequestExtensions.cpp:231 msgid "Invalid value for X509v3RequestExts::setSubjectAlternativeName." msgstr "ÙÙÙØ© ØºÙØ± ØµØ§ÙØØ© ÙÙ X509v3RequestExts::setSubjectAlternativeName." + +#~ msgid "Command returned '%1' : %2" +#~ msgstr "ÙØªØ¬ Ø¹Ù ÙØ°Ø§ Ø§ÙØ£ÙØ± '%1' : %2" Modified: limal-head/limal-ca-mgm/po/bn.po URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/po/bn.po?rev=… ============================================================================== --- limal-head/limal-ca-mgm/po/bn.po (original) +++ limal-head/limal-ca-mgm/po/bn.po Mon Oct 29 11:30:37 2007 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: @PACKAGE@\n" "Report-Msgid-Bugs-To: translation(a)suse.de\n" -"POT-Creation-Date: 2007-09-28 16:31+0200\n" +"POT-Creation-Date: 2007-10-29 11:25+0100\n" "PO-Revision-Date: 2004-08-09 10:24+0200\n" "Last-Translator: Priyavert Sharma<priyavert.sharma(a)agreeya.com>\n" "Language-Team: AgreeYa Solutions<linux_team(a)agreeya.com>\n" @@ -23,8 +23,8 @@ #: src/AuthorityInfoAccessExtension.cpp:259 #: src/AuthorityInfoAccessExtension.cpp:342 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:87 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:194 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:86 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:193 #: src/BasicConstraintsExtension.cpp:84 src/BasicConstraintsExtension.cpp:187 #: src/BitExtensions.cpp:134 src/BitExtensions.cpp:247 #: src/BitExtensions.cpp:374 src/BitExtensions.cpp:482 src/CA.cpp:1565 @@ -71,12 +71,12 @@ msgid "AuthorityKeyIdentifierExt is not present." msgstr "AuthorityKeyIdentifierExt à¦à¦¨à§à¦ªà¦¸à§à¦¥à¦¿à¦¤" -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:155 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:174 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:154 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:173 msgid "AuthorityKeyIdentifierGenerateExt is not present." msgstr "AuthorityKeyIdentifierGenerateExt à¦à¦¨à§à¦ªà¦¸à§à¦¥à¦¿à¦¤" -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:186 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:185 msgid "Invalid AuthorityKeyIdentifierGenerateExt object." msgstr " AuthorityKeyIdentifierGenerateExt à¦¬à¦¿à¦·à§à¦à¦¿ à¦à¦¬à§à¦§" @@ -196,7 +196,7 @@ msgid "Duplicate DN. Request already exists." msgstr "à¦ªà§à¦°à¦¤à¦¿à¦°à§à¦ª DN à¦à¦¤à¦¿à¦®à¦§à§à¦¯à§ à¦à¦¨à§à¦°à§à¦§ à¦°à§à§à¦à§" -#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:968 +#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:1007 msgid "Cannot parse the certificate name." msgstr " à¦¸à¦¾à¦°à§à¦à¦¿à¦«à¦¿à¦à§à¦ à¦¨à¦¾à¦® à¦¬à¦¿à¦¶à§à¦²à§à¦·à¦£ à¦¬à§à¦¯à¦°à§à¦¥" @@ -533,93 +533,112 @@ msgid "Invalid command %1." msgstr "à¦à¦¬à§à¦§ à¦à¦¦à§à¦¶ %1." -#: src/OpenSSLUtils.cpp:138 src/OpenSSLUtils.cpp:241 src/OpenSSLUtils.cpp:334 -#: src/OpenSSLUtils.cpp:453 src/OpenSSLUtils.cpp:586 src/OpenSSLUtils.cpp:681 -#: src/OpenSSLUtils.cpp:761 -msgid "Command returned '%1' : %2" -msgstr "à¦à¦¦à§à¦¶ à¦«à§à¦°à¦¤ '%1' : %2" +#: src/OpenSSLUtils.cpp:132 src/OpenSSLUtils.cpp:240 src/OpenSSLUtils.cpp:338 +#: src/OpenSSLUtils.cpp:462 src/OpenSSLUtils.cpp:600 src/OpenSSLUtils.cpp:700 +#: src/OpenSSLUtils.cpp:782 src/OpenSSLUtils.cpp:871 src/OpenSSLUtils.cpp:952 +#: src/OpenSSLUtils.cpp:1051 src/OpenSSLUtils.cpp:1137 +#: src/OpenSSLUtils.cpp:1271 src/OpenSSLUtils.cpp:1390 +#: src/OpenSSLUtils.cpp:1493 src/OpenSSLUtils.cpp:1645 +#: src/OpenSSLUtils.cpp:1782 +msgid "Executing openssl command failed." +msgstr "" + +#: src/OpenSSLUtils.cpp:143 src/OpenSSLUtils.cpp:251 src/OpenSSLUtils.cpp:349 +#: src/OpenSSLUtils.cpp:473 src/OpenSSLUtils.cpp:611 src/OpenSSLUtils.cpp:711 +#: src/OpenSSLUtils.cpp:796 src/OpenSSLUtils.cpp:1162 +#: src/OpenSSLUtils.cpp:1311 src/OpenSSLUtils.cpp:1415 +#: src/OpenSSLUtils.cpp:1518 src/OpenSSLUtils.cpp:1682 +#: src/OpenSSLUtils.cpp:1822 +msgid "openssl command failed: %1" +msgstr "" -#: src/OpenSSLUtils.cpp:171 src/OpenSSLUtils.cpp:268 src/OpenSSLUtils.cpp:366 -#: src/OpenSSLUtils.cpp:479 src/OpenSSLUtils.cpp:613 src/OpenSSLUtils.cpp:704 +#: src/OpenSSLUtils.cpp:176 src/OpenSSLUtils.cpp:278 src/OpenSSLUtils.cpp:381 +#: src/OpenSSLUtils.cpp:499 src/OpenSSLUtils.cpp:638 src/OpenSSLUtils.cpp:734 msgid "No valid key file specified." msgstr "à¦¬à§à¦§ à¦à§ à¦«à¦¾à¦à¦²à§à¦° à¦à¦²à§à¦²à§à¦ à¦à¦°à¦¾ à¦¹à§à¦¨à¦¿" -#: src/OpenSSLUtils.cpp:276 src/OpenSSLUtils.cpp:374 +#: src/OpenSSLUtils.cpp:286 src/OpenSSLUtils.cpp:389 msgid "No valid request file specified." msgstr "à¦¬à§à¦§ à¦à¦¨à§à¦°à§à¦§ à¦«à¦¾à¦à¦²à§à¦° à¦à¦²à§à¦²à§à¦ à¦à¦°à¦¾ à¦¹à§à¦¨à¦¿" -#: src/OpenSSLUtils.cpp:487 src/OpenSSLUtils.cpp:621 src/OpenSSLUtils.cpp:712 +#: src/OpenSSLUtils.cpp:507 src/OpenSSLUtils.cpp:646 src/OpenSSLUtils.cpp:742 msgid "No valid CA certificate file specified." msgstr "à¦¬à§à¦§ CA à¦¸à¦¾à¦°à§à¦à¦¿à¦«à¦¿à¦à§à¦ à¦«à¦¾à¦à¦²à§à¦° à¦à¦²à§à¦²à§à¦ à¦à¦°à¦¾ à¦¹à§à¦¨à¦¿" -#: src/OpenSSLUtils.cpp:495 src/OpenSSLUtils.cpp:785 +#: src/OpenSSLUtils.cpp:515 src/OpenSSLUtils.cpp:820 msgid "No valid certificate file specified." msgstr "à¦¬à§à¦§ à¦¸à¦¾à¦°à§à¦à¦¿à¦«à¦¿à¦à§à¦ à¦«à¦¾à¦à¦²à§à¦° à¦à¦²à§à¦²à§à¦ à¦à¦°à¦¾ à¦¹à§à¦¨à¦¿" -#: src/OpenSSLUtils.cpp:793 +#: src/OpenSSLUtils.cpp:828 msgid "No valid CA directory specified." msgstr "à¦¬à§à¦§ CA à¦¡à¦¾à§à¦°à§à¦à§à¦à¦°à¦¿à¦° à¦à¦²à§à¦²à§à¦ à¦à¦°à¦¾ à¦¹à§à¦¨à¦¿" -#: src/OpenSSLUtils.cpp:943 +#: src/OpenSSLUtils.cpp:982 msgid "Showing certificate status with serial %1 failed (%2)." msgstr "à¦à§à¦°à¦®à¦¿à¦ %1 à¦¸à¦¹ à¦¸à¦¾à¦°à§à¦à¦¿à¦«à¦¿à¦à§à¦ à¦ªà¦°à¦¿à¦¸à§à¦¥à¦¿à¦¤à¦¿ à¦¦à§à¦à¦¾à¦¨à§ à¦¬à§à¦¯à¦°à§à¦¥ (%2)." -#: src/OpenSSLUtils.cpp:979 +#: src/OpenSSLUtils.cpp:1018 msgid "The key file does not exist." msgstr "à¦à¦ à¦à§ à¦«à¦¾à¦à¦² à¦¨à§à¦" -#: src/OpenSSLUtils.cpp:1474 +#: src/OpenSSLUtils.cpp:1306 src/OpenSSLUtils.cpp:1677 +#: src/OpenSSLUtils.cpp:1817 +#, fuzzy +msgid "Invalid password." +msgstr " CA à¦ªà¦¾à¦¸à¦à§à¦¾à¦°à§à¦¡ à¦à¦¬à§à¦§" + +#: src/OpenSSLUtils.cpp:1595 msgid "The password for encrypting the output is required." msgstr "à¦à¦à¦à¦ªà§à¦ à¦à¦¨à¦à§à¦°à¦¿à¦ªà§à¦ à¦à¦°à¦¾à¦° à¦à¦¨à§à¦¯ à¦ªà¦¾à¦¸à¦à§à¦¾à¦°à§à¦¡ à¦à¦¾à¦" -#: src/OpenSSLUtils.cpp:1579 +#: src/OpenSSLUtils.cpp:1736 msgid "The PKCS12 password is required." msgstr " PKCS12 à¦ªà¦¾à¦¸à¦à§à¦¾à¦°à§à¦¡ à¦à¦¾à¦" -#: src/OpenSSLUtils.cpp:1665 src/OpenSSLUtils.cpp:1865 -#: src/OpenSSLUtils.cpp:2017 +#: src/OpenSSLUtils.cpp:1847 src/OpenSSLUtils.cpp:2047 +#: src/OpenSSLUtils.cpp:2199 msgid "Cannot read directory: %1 (%2) [%3]." msgstr "à¦¡à¦¾à§à¦°à§à¦à§à¦à¦°à¦¿ à¦ªà¦¡à¦¼à¦¾ à¦¯à¦¾à¦à§à¦à§ à¦¨à¦¾: %1 (%2) [%3]." -#: src/OpenSSLUtils.cpp:1715 +#: src/OpenSSLUtils.cpp:1897 msgid "No serial number found in %1." msgstr " %1à¦ à¦à§à¦¨à§ à¦à§à¦°à¦®à¦¿à¦ à¦¸à¦à¦à§à¦¯à¦¾ à¦ªà¦¾à¦à§à¦¾ à¦¯à¦¾à§à¦¨à¦¿" -#: src/OpenSSLUtils.cpp:1735 +#: src/OpenSSLUtils.cpp:1917 msgid "The request already exists." msgstr "à¦à¦¤à¦¿à¦®à¦§à§à¦¯à§ à¦à¦ à¦à¦¨à§à¦°à§à¦§ à¦à¦°à¦¾ à¦¹à§à§ à¦à¦¿à§à§à¦à§" -#: src/OpenSSLUtils.cpp:1926 +#: src/OpenSSLUtils.cpp:2108 msgid "Cannot find the request subject." msgstr "à¦à¦¨à§à¦°à§à¦§à§à¦° à¦¬à¦¿à¦·à§ à¦ªà¦¾à¦à§à¦¾ à¦¯à¦¾à¦à§à¦à§ à¦¨à¦¾" -#: src/OpenSSLUtils.cpp:2087 +#: src/OpenSSLUtils.cpp:2269 msgid "Cannot find the certificate subject." msgstr "à¦¸à¦¾à¦°à§à¦à¦¿à¦«à¦¿à¦à§à¦à§à¦° à¦¬à¦¿à¦·à§ à¦ªà¦¾à¦à§à¦¾ à¦¯à¦¾à¦à§à¦à§ à¦¨à¦¾" -#: src/OpenSSLUtils.cpp:2186 +#: src/OpenSSLUtils.cpp:2368 msgid "Invalid caName: %1." msgstr "à¦à¦¬à§à¦§ caName: %1." -#: src/OpenSSLUtils.cpp:2195 +#: src/OpenSSLUtils.cpp:2377 msgid "'%1' does not exist." msgstr "'%1' à¦¨à§à¦" -#: src/OpenSSLUtils.cpp:2205 +#: src/OpenSSLUtils.cpp:2387 msgid "%1 still exists." msgstr "à¦¤à¦¾ à¦¸à¦¤à§à¦¤à§à¦¬à§à¦ %1 à¦à¦à§" -#: src/OpenSSLUtils.cpp:2216 src/OpenSSLUtils.cpp:2264 -#: src/OpenSSLUtils.cpp:2278 src/OpenSSLUtils.cpp:2292 -#: src/OpenSSLUtils.cpp:2306 src/OpenSSLUtils.cpp:2320 +#: src/OpenSSLUtils.cpp:2398 src/OpenSSLUtils.cpp:2446 +#: src/OpenSSLUtils.cpp:2460 src/OpenSSLUtils.cpp:2474 +#: src/OpenSSLUtils.cpp:2488 src/OpenSSLUtils.cpp:2502 msgid "Cannot create directory: %1 (%2 [%3])." msgstr "à¦¡à¦¾à§à¦°à§à¦à§à¦à¦°à¦¿ à¦¤à§à¦°à§ à¦à¦°à¦¾ à¦¯à¦¾à¦à§à¦à§ à¦¨à¦¾: %1 (%2 [%3])." -#: src/OpenSSLUtils.cpp:2251 +#: src/OpenSSLUtils.cpp:2433 msgid "Cannot copy the configuration template." msgstr "à¦à¦¨à¦«à¦¿à¦à¦¾à¦°à§à¦¶à¦¨ à¦à§à¦®à§à¦ªà¦²à§à¦ à¦à¦ªà¦¿ à¦à¦°à¦¾ à¦¯à¦¾à¦à§à¦à§ à¦¨à¦¾" -#: src/OpenSSLUtils.cpp:2338 +#: src/OpenSSLUtils.cpp:2520 msgid "Cannot create the file." msgstr "à¦«à¦¾à¦à¦² à¦¤à§à¦°à§ à¦à¦°à¦¾ à¦¯à¦¾à¦à§à¦à§ à¦¨à¦¾" @@ -738,28 +757,28 @@ msgid "Invalid SubjectKeyIdentifierExt object." msgstr " SubjectKeyIdentifierExt à¦¬à¦¿à¦·à§ à¦à¦¬à§à¦§" -#: src/X509v3CertificateExtensions_Priv.cpp:394 -#: src/X509v3CertificateExtensions_Priv.cpp:450 +#: src/X509v3CertificateExtensions_Priv.cpp:395 +#: src/X509v3CertificateExtensions_Priv.cpp:452 #: src/X509v3RequestExtensions_Priv.cpp:134 #: src/X509v3RequestExtensions_Priv.cpp:189 msgid "Extension occurred more than once: %1." msgstr "à¦à¦à¦¾à¦§à¦¿à¦à¦¬à¦¾à¦° à¦à¦à§à¦¸à¦à§à¦¨à¦¶à¦¨ à¦à¦¸à§à¦à§: %1." -#: src/X509v3CertificateExtensions_Priv.cpp:401 -#: src/X509v3CertificateExtensions_Priv.cpp:457 +#: src/X509v3CertificateExtensions_Priv.cpp:402 +#: src/X509v3CertificateExtensions_Priv.cpp:459 #: src/X509v3RequestExtensions_Priv.cpp:141 #: src/X509v3RequestExtensions_Priv.cpp:196 msgid "Unable to parse the certificate (NID: %1 Crit: %2)." msgstr "à¦¸à¦¾à¦°à§à¦à¦¿à¦«à¦¿à¦à§à¦ à¦¬à¦¿à¦¶à§à¦²à§à¦·à¦£à§ à¦¬à§à¦¯à¦°à§à¦¥ (NID: %1 Crit: %2)." -#: src/X509v3CertificateExtensions_Priv.cpp:509 -#: src/X509v3CertificateExtensions_Priv.cpp:575 -#: src/X509v3CertificateExtensions_Priv.cpp:639 -#: src/X509v3CertificateExtensions_Priv.cpp:701 -#: src/X509v3CertificateExtensions_Priv.cpp:771 -#: src/X509v3CertificateExtensions_Priv.cpp:840 -#: src/X509v3CertificateExtensions_Priv.cpp:916 -#: src/X509v3CertificateExtensions_Priv.cpp:1002 +#: src/X509v3CertificateExtensions_Priv.cpp:511 +#: src/X509v3CertificateExtensions_Priv.cpp:577 +#: src/X509v3CertificateExtensions_Priv.cpp:641 +#: src/X509v3CertificateExtensions_Priv.cpp:703 +#: src/X509v3CertificateExtensions_Priv.cpp:773 +#: src/X509v3CertificateExtensions_Priv.cpp:842 +#: src/X509v3CertificateExtensions_Priv.cpp:918 +#: src/X509v3CertificateExtensions_Priv.cpp:1004 #: src/X509v3CRLExtensions_Priv.cpp:135 #: src/X509v3RequestExtensions_Priv.cpp:249 #: src/X509v3RequestExtensions_Priv.cpp:315 @@ -768,14 +787,14 @@ msgid "Extension occurred more than once." msgstr "à¦à¦à¦¾à¦§à¦¿à¦à¦¬à¦¾à¦° à¦à¦à§à¦¸à¦à§à¦¶à¦¨ à¦à¦¸à§à¦à§" -#: src/X509v3CertificateExtensions_Priv.cpp:514 -#: src/X509v3CertificateExtensions_Priv.cpp:580 -#: src/X509v3CertificateExtensions_Priv.cpp:644 -#: src/X509v3CertificateExtensions_Priv.cpp:707 -#: src/X509v3CertificateExtensions_Priv.cpp:776 -#: src/X509v3CertificateExtensions_Priv.cpp:846 -#: src/X509v3CertificateExtensions_Priv.cpp:921 -#: src/X509v3CertificateExtensions_Priv.cpp:1007 +#: src/X509v3CertificateExtensions_Priv.cpp:516 +#: src/X509v3CertificateExtensions_Priv.cpp:582 +#: src/X509v3CertificateExtensions_Priv.cpp:646 +#: src/X509v3CertificateExtensions_Priv.cpp:709 +#: src/X509v3CertificateExtensions_Priv.cpp:778 +#: src/X509v3CertificateExtensions_Priv.cpp:848 +#: src/X509v3CertificateExtensions_Priv.cpp:923 +#: src/X509v3CertificateExtensions_Priv.cpp:1009 #: src/X509v3CRLExtensions_Priv.cpp:140 #: src/X509v3RequestExtensions_Priv.cpp:254 #: src/X509v3RequestExtensions_Priv.cpp:320 @@ -784,7 +803,7 @@ msgid "Unable to parse the certificate (Crit: %1)." msgstr "à¦¸à¦¾à¦°à§à¦à¦¿à¦«à¦¿à¦à§à¦ à¦¬à¦¿à¦¶à§à¦²à§à¦·à¦£à§ à¦¬à§à¦¯à¦°à§à¦¥ (Crit: %1)." -#: src/X509v3CertificateExtensions_Priv.cpp:941 +#: src/X509v3CertificateExtensions_Priv.cpp:943 msgid "Invalid location in authorityInfoAccess." msgstr "authorityInfoAccess à¦à¦¬à§à¦§ à¦¸à§à¦¥à¦¾à¦¨" @@ -907,3 +926,6 @@ #: src/X509v3RequestExtensions.cpp:231 msgid "Invalid value for X509v3RequestExts::setSubjectAlternativeName." msgstr " X509v3RequestExts::setSubjectAlternativeName à¦à¦° à¦®à§à¦²à§à¦¯ à¦à¦¬à§à¦§" + +#~ msgid "Command returned '%1' : %2" +#~ msgstr "à¦à¦¦à§à¦¶ à¦«à§à¦°à¦¤ '%1' : %2" Modified: limal-head/limal-ca-mgm/po/ca.po URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/po/ca.po?rev=… ============================================================================== --- limal-head/limal-ca-mgm/po/ca.po (original) +++ limal-head/limal-ca-mgm/po/ca.po Mon Oct 29 11:30:37 2007 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: @PACKAGE@\n" "Report-Msgid-Bugs-To: translation(a)suse.de\n" -"POT-Creation-Date: 2007-09-28 16:31+0200\n" +"POT-Creation-Date: 2007-10-29 11:25+0100\n" "PO-Revision-Date: 2007-02-22 21:04+0100\n" "Last-Translator: Anna <blabla(a)blabla.es>\n" "Language-Team: Catalan\n" @@ -29,8 +29,8 @@ #: src/AuthorityInfoAccessExtension.cpp:259 #: src/AuthorityInfoAccessExtension.cpp:342 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:87 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:194 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:86 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:193 #: src/BasicConstraintsExtension.cpp:84 src/BasicConstraintsExtension.cpp:187 #: src/BitExtensions.cpp:134 src/BitExtensions.cpp:247 #: src/BitExtensions.cpp:374 src/BitExtensions.cpp:482 src/CA.cpp:1565 @@ -77,12 +77,12 @@ msgid "AuthorityKeyIdentifierExt is not present." msgstr "AuthorityKeyIdentifierExt no es troba." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:155 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:174 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:154 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:173 msgid "AuthorityKeyIdentifierGenerateExt is not present." msgstr "AuthorityKeyIdentifierGenerateExt no es troba." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:186 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:185 msgid "Invalid AuthorityKeyIdentifierGenerateExt object." msgstr "Objecte AuthorityKeyIdentifierGenerateExt no vÃ lid." @@ -202,7 +202,7 @@ msgid "Duplicate DN. Request already exists." msgstr "DN duplicat. La solÂ·licitud ja existeix." -#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:968 +#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:1007 msgid "Cannot parse the certificate name." msgstr "No es pot analitzar el nom del certificat." @@ -539,94 +539,113 @@ msgid "Invalid command %1." msgstr "L'ordre %1 no Ã©s vÃ lida." -#: src/OpenSSLUtils.cpp:138 src/OpenSSLUtils.cpp:241 src/OpenSSLUtils.cpp:334 -#: src/OpenSSLUtils.cpp:453 src/OpenSSLUtils.cpp:586 src/OpenSSLUtils.cpp:681 -#: src/OpenSSLUtils.cpp:761 -msgid "Command returned '%1' : %2" -msgstr "L'ordre ha tornat '%1' : %2" +#: src/OpenSSLUtils.cpp:132 src/OpenSSLUtils.cpp:240 src/OpenSSLUtils.cpp:338 +#: src/OpenSSLUtils.cpp:462 src/OpenSSLUtils.cpp:600 src/OpenSSLUtils.cpp:700 +#: src/OpenSSLUtils.cpp:782 src/OpenSSLUtils.cpp:871 src/OpenSSLUtils.cpp:952 +#: src/OpenSSLUtils.cpp:1051 src/OpenSSLUtils.cpp:1137 +#: src/OpenSSLUtils.cpp:1271 src/OpenSSLUtils.cpp:1390 +#: src/OpenSSLUtils.cpp:1493 src/OpenSSLUtils.cpp:1645 +#: src/OpenSSLUtils.cpp:1782 +msgid "Executing openssl command failed." +msgstr "" + +#: src/OpenSSLUtils.cpp:143 src/OpenSSLUtils.cpp:251 src/OpenSSLUtils.cpp:349 +#: src/OpenSSLUtils.cpp:473 src/OpenSSLUtils.cpp:611 src/OpenSSLUtils.cpp:711 +#: src/OpenSSLUtils.cpp:796 src/OpenSSLUtils.cpp:1162 +#: src/OpenSSLUtils.cpp:1311 src/OpenSSLUtils.cpp:1415 +#: src/OpenSSLUtils.cpp:1518 src/OpenSSLUtils.cpp:1682 +#: src/OpenSSLUtils.cpp:1822 +msgid "openssl command failed: %1" +msgstr "" -#: src/OpenSSLUtils.cpp:171 src/OpenSSLUtils.cpp:268 src/OpenSSLUtils.cpp:366 -#: src/OpenSSLUtils.cpp:479 src/OpenSSLUtils.cpp:613 src/OpenSSLUtils.cpp:704 +#: src/OpenSSLUtils.cpp:176 src/OpenSSLUtils.cpp:278 src/OpenSSLUtils.cpp:381 +#: src/OpenSSLUtils.cpp:499 src/OpenSSLUtils.cpp:638 src/OpenSSLUtils.cpp:734 msgid "No valid key file specified." msgstr "No s'ha especificat cap fitxer de claus vÃ lid." -#: src/OpenSSLUtils.cpp:276 src/OpenSSLUtils.cpp:374 +#: src/OpenSSLUtils.cpp:286 src/OpenSSLUtils.cpp:389 msgid "No valid request file specified." msgstr "No s'ha especificat cap fitxer de solÂ·licitud vÃ lid." -#: src/OpenSSLUtils.cpp:487 src/OpenSSLUtils.cpp:621 src/OpenSSLUtils.cpp:712 +#: src/OpenSSLUtils.cpp:507 src/OpenSSLUtils.cpp:646 src/OpenSSLUtils.cpp:742 msgid "No valid CA certificate file specified." msgstr "No s'ha especificat cap fitxer de certificat CA vÃ lid." -#: src/OpenSSLUtils.cpp:495 src/OpenSSLUtils.cpp:785 +#: src/OpenSSLUtils.cpp:515 src/OpenSSLUtils.cpp:820 msgid "No valid certificate file specified." msgstr "No s'ha especificat cap fitxer de certificat vÃ lid." -#: src/OpenSSLUtils.cpp:793 +#: src/OpenSSLUtils.cpp:828 msgid "No valid CA directory specified." msgstr "No s'ha especificat cap directori CA vÃ lid." -#: src/OpenSSLUtils.cpp:943 +#: src/OpenSSLUtils.cpp:982 msgid "Showing certificate status with serial %1 failed (%2)." msgstr "" "S'ha produÃ¯t un error en mostrar l'estat del certificat amb la sÃ¨rie %1 (%2)." -#: src/OpenSSLUtils.cpp:979 +#: src/OpenSSLUtils.cpp:1018 msgid "The key file does not exist." msgstr "El fitxer de claus no existeix." -#: src/OpenSSLUtils.cpp:1474 +#: src/OpenSSLUtils.cpp:1306 src/OpenSSLUtils.cpp:1677 +#: src/OpenSSLUtils.cpp:1817 +#, fuzzy +msgid "Invalid password." +msgstr "La contrasenya de la CA no Ã©s vÃ lida." + +#: src/OpenSSLUtils.cpp:1595 msgid "The password for encrypting the output is required." msgstr "Es requereix la contrasenya per a xifrar el resultat." -#: src/OpenSSLUtils.cpp:1579 +#: src/OpenSSLUtils.cpp:1736 msgid "The PKCS12 password is required." msgstr "Es necessita la contrasenya de PKCS12." -#: src/OpenSSLUtils.cpp:1665 src/OpenSSLUtils.cpp:1865 -#: src/OpenSSLUtils.cpp:2017 +#: src/OpenSSLUtils.cpp:1847 src/OpenSSLUtils.cpp:2047 +#: src/OpenSSLUtils.cpp:2199 msgid "Cannot read directory: %1 (%2) [%3]." msgstr "No es pot llegir el directori: %1 (%2) [%3]." -#: src/OpenSSLUtils.cpp:1715 +#: src/OpenSSLUtils.cpp:1897 msgid "No serial number found in %1." msgstr "No s'ha trobat cap nÃºmero de sÃ¨rie a %1." -#: src/OpenSSLUtils.cpp:1735 +#: src/OpenSSLUtils.cpp:1917 msgid "The request already exists." msgstr "La solÂ·licitud ja existeix." -#: src/OpenSSLUtils.cpp:1926 +#: src/OpenSSLUtils.cpp:2108 msgid "Cannot find the request subject." msgstr "No es pot trobar el tema de la solÂ·licitud." -#: src/OpenSSLUtils.cpp:2087 +#: src/OpenSSLUtils.cpp:2269 msgid "Cannot find the certificate subject." msgstr "No es pot trobar el tema del certificat." -#: src/OpenSSLUtils.cpp:2186 +#: src/OpenSSLUtils.cpp:2368 msgid "Invalid caName: %1." msgstr "caName no vÃ lid: %1." -#: src/OpenSSLUtils.cpp:2195 +#: src/OpenSSLUtils.cpp:2377 msgid "'%1' does not exist." msgstr "'%1' no existeix." -#: src/OpenSSLUtils.cpp:2205 +#: src/OpenSSLUtils.cpp:2387 msgid "%1 still exists." msgstr "%1 encara existeix." -#: src/OpenSSLUtils.cpp:2216 src/OpenSSLUtils.cpp:2264 -#: src/OpenSSLUtils.cpp:2278 src/OpenSSLUtils.cpp:2292 -#: src/OpenSSLUtils.cpp:2306 src/OpenSSLUtils.cpp:2320 +#: src/OpenSSLUtils.cpp:2398 src/OpenSSLUtils.cpp:2446 +#: src/OpenSSLUtils.cpp:2460 src/OpenSSLUtils.cpp:2474 +#: src/OpenSSLUtils.cpp:2488 src/OpenSSLUtils.cpp:2502 msgid "Cannot create directory: %1 (%2 [%3])." msgstr "No es pot crear el directori: %1 (%2 [%3])." -#: src/OpenSSLUtils.cpp:2251 +#: src/OpenSSLUtils.cpp:2433 msgid "Cannot copy the configuration template." msgstr "No es pot copiar la plantilla de configuraciÃ³." -#: src/OpenSSLUtils.cpp:2338 +#: src/OpenSSLUtils.cpp:2520 msgid "Cannot create the file." msgstr "No es pot crear el fitxer." @@ -745,28 +764,28 @@ msgid "Invalid SubjectKeyIdentifierExt object." msgstr "Objecte SubjectKeyIdentifierExt no vÃ lid." -#: src/X509v3CertificateExtensions_Priv.cpp:394 -#: src/X509v3CertificateExtensions_Priv.cpp:450 +#: src/X509v3CertificateExtensions_Priv.cpp:395 +#: src/X509v3CertificateExtensions_Priv.cpp:452 #: src/X509v3RequestExtensions_Priv.cpp:134 #: src/X509v3RequestExtensions_Priv.cpp:189 msgid "Extension occurred more than once: %1." msgstr "L'extensiÃ³ es repeteix mÃ©s d'un cop: %1." -#: src/X509v3CertificateExtensions_Priv.cpp:401 -#: src/X509v3CertificateExtensions_Priv.cpp:457 +#: src/X509v3CertificateExtensions_Priv.cpp:402 +#: src/X509v3CertificateExtensions_Priv.cpp:459 #: src/X509v3RequestExtensions_Priv.cpp:141 #: src/X509v3RequestExtensions_Priv.cpp:196 msgid "Unable to parse the certificate (NID: %1 Crit: %2)." msgstr "No s'ha pogut analitzar el certificat (NID: %1 Crit: %2)." -#: src/X509v3CertificateExtensions_Priv.cpp:509 -#: src/X509v3CertificateExtensions_Priv.cpp:575 -#: src/X509v3CertificateExtensions_Priv.cpp:639 -#: src/X509v3CertificateExtensions_Priv.cpp:701 -#: src/X509v3CertificateExtensions_Priv.cpp:771 -#: src/X509v3CertificateExtensions_Priv.cpp:840 -#: src/X509v3CertificateExtensions_Priv.cpp:916 -#: src/X509v3CertificateExtensions_Priv.cpp:1002 +#: src/X509v3CertificateExtensions_Priv.cpp:511 +#: src/X509v3CertificateExtensions_Priv.cpp:577 +#: src/X509v3CertificateExtensions_Priv.cpp:641 +#: src/X509v3CertificateExtensions_Priv.cpp:703 +#: src/X509v3CertificateExtensions_Priv.cpp:773 +#: src/X509v3CertificateExtensions_Priv.cpp:842 +#: src/X509v3CertificateExtensions_Priv.cpp:918 +#: src/X509v3CertificateExtensions_Priv.cpp:1004 #: src/X509v3CRLExtensions_Priv.cpp:135 #: src/X509v3RequestExtensions_Priv.cpp:249 #: src/X509v3RequestExtensions_Priv.cpp:315 @@ -775,14 +794,14 @@ msgid "Extension occurred more than once." msgstr "L'extensiÃ³ es repeteix mÃ©s d'un cop." -#: src/X509v3CertificateExtensions_Priv.cpp:514 -#: src/X509v3CertificateExtensions_Priv.cpp:580 -#: src/X509v3CertificateExtensions_Priv.cpp:644 -#: src/X509v3CertificateExtensions_Priv.cpp:707 -#: src/X509v3CertificateExtensions_Priv.cpp:776 -#: src/X509v3CertificateExtensions_Priv.cpp:846 -#: src/X509v3CertificateExtensions_Priv.cpp:921 -#: src/X509v3CertificateExtensions_Priv.cpp:1007 +#: src/X509v3CertificateExtensions_Priv.cpp:516 +#: src/X509v3CertificateExtensions_Priv.cpp:582 +#: src/X509v3CertificateExtensions_Priv.cpp:646 +#: src/X509v3CertificateExtensions_Priv.cpp:709 +#: src/X509v3CertificateExtensions_Priv.cpp:778 +#: src/X509v3CertificateExtensions_Priv.cpp:848 +#: src/X509v3CertificateExtensions_Priv.cpp:923 +#: src/X509v3CertificateExtensions_Priv.cpp:1009 #: src/X509v3CRLExtensions_Priv.cpp:140 #: src/X509v3RequestExtensions_Priv.cpp:254 #: src/X509v3RequestExtensions_Priv.cpp:320 @@ -791,7 +810,7 @@ msgid "Unable to parse the certificate (Crit: %1)." msgstr "No s'ha pogut analitzar el certificat (Crit: %1)." -#: src/X509v3CertificateExtensions_Priv.cpp:941 +#: src/X509v3CertificateExtensions_Priv.cpp:943 msgid "Invalid location in authorityInfoAccess." msgstr "UbicaciÃ³ no vÃ lida a authorityInfoAccess." @@ -916,3 +935,6 @@ #: src/X509v3RequestExtensions.cpp:231 msgid "Invalid value for X509v3RequestExts::setSubjectAlternativeName." msgstr "Valor d'X509v3RequestExts::setSubjectAlternativeName no vÃ lid." + +#~ msgid "Command returned '%1' : %2" +#~ msgstr "L'ordre ha tornat '%1' : %2" Modified: limal-head/limal-ca-mgm/po/cs.po URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/po/cs.po?rev=… ============================================================================== --- limal-head/limal-ca-mgm/po/cs.po (original) +++ limal-head/limal-ca-mgm/po/cs.po Mon Oct 29 11:30:37 2007 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: limal-ca-mgm\n" "Report-Msgid-Bugs-To: translation(a)suse.de\n" -"POT-Creation-Date: 2007-09-28 16:31+0200\n" +"POT-Creation-Date: 2007-10-29 11:25+0100\n" "PO-Revision-Date: 2006-09-27 14:41+0200\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" @@ -31,8 +31,8 @@ #: src/AuthorityInfoAccessExtension.cpp:259 #: src/AuthorityInfoAccessExtension.cpp:342 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:87 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:194 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:86 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:193 #: src/BasicConstraintsExtension.cpp:84 src/BasicConstraintsExtension.cpp:187 #: src/BitExtensions.cpp:134 src/BitExtensions.cpp:247 #: src/BitExtensions.cpp:374 src/BitExtensions.cpp:482 src/CA.cpp:1565 @@ -79,12 +79,12 @@ msgid "AuthorityKeyIdentifierExt is not present." msgstr "AuthorityKeyIdentifierExt nenÃ pÅÃtomen." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:155 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:174 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:154 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:173 msgid "AuthorityKeyIdentifierGenerateExt is not present." msgstr "AuthorityKeyIdentifierGenerateExt nenÃ pÅÃtomen." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:186 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:185 msgid "Invalid AuthorityKeyIdentifierGenerateExt object." msgstr "NeplatnÃ½ objekt AuthorityKeyIdentifierGenerateExt." @@ -204,7 +204,7 @@ msgid "Duplicate DN. Request already exists." msgstr "DuplicitnÃ DN. PoÅ¾adavek jiÅ¾ existuje." -#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:968 +#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:1007 msgid "Cannot parse the certificate name." msgstr "Nelze analyzovat jmÃ©no certifikÃ¡tu." @@ -541,93 +541,112 @@ msgid "Invalid command %1." msgstr "NeplatnÃ½ pÅÃkaz %1." -#: src/OpenSSLUtils.cpp:138 src/OpenSSLUtils.cpp:241 src/OpenSSLUtils.cpp:334 -#: src/OpenSSLUtils.cpp:453 src/OpenSSLUtils.cpp:586 src/OpenSSLUtils.cpp:681 -#: src/OpenSSLUtils.cpp:761 -msgid "Command returned '%1' : %2" -msgstr "PÅÃkaz vrÃ¡til '%1' : %2" +#: src/OpenSSLUtils.cpp:132 src/OpenSSLUtils.cpp:240 src/OpenSSLUtils.cpp:338 +#: src/OpenSSLUtils.cpp:462 src/OpenSSLUtils.cpp:600 src/OpenSSLUtils.cpp:700 +#: src/OpenSSLUtils.cpp:782 src/OpenSSLUtils.cpp:871 src/OpenSSLUtils.cpp:952 +#: src/OpenSSLUtils.cpp:1051 src/OpenSSLUtils.cpp:1137 +#: src/OpenSSLUtils.cpp:1271 src/OpenSSLUtils.cpp:1390 +#: src/OpenSSLUtils.cpp:1493 src/OpenSSLUtils.cpp:1645 +#: src/OpenSSLUtils.cpp:1782 +msgid "Executing openssl command failed." +msgstr "" + +#: src/OpenSSLUtils.cpp:143 src/OpenSSLUtils.cpp:251 src/OpenSSLUtils.cpp:349 +#: src/OpenSSLUtils.cpp:473 src/OpenSSLUtils.cpp:611 src/OpenSSLUtils.cpp:711 +#: src/OpenSSLUtils.cpp:796 src/OpenSSLUtils.cpp:1162 +#: src/OpenSSLUtils.cpp:1311 src/OpenSSLUtils.cpp:1415 +#: src/OpenSSLUtils.cpp:1518 src/OpenSSLUtils.cpp:1682 +#: src/OpenSSLUtils.cpp:1822 +msgid "openssl command failed: %1" +msgstr "" -#: src/OpenSSLUtils.cpp:171 src/OpenSSLUtils.cpp:268 src/OpenSSLUtils.cpp:366 -#: src/OpenSSLUtils.cpp:479 src/OpenSSLUtils.cpp:613 src/OpenSSLUtils.cpp:704 +#: src/OpenSSLUtils.cpp:176 src/OpenSSLUtils.cpp:278 src/OpenSSLUtils.cpp:381 +#: src/OpenSSLUtils.cpp:499 src/OpenSSLUtils.cpp:638 src/OpenSSLUtils.cpp:734 msgid "No valid key file specified." msgstr "Nebyl zadÃ¡n platnÃ½ soubor klÃÄe." -#: src/OpenSSLUtils.cpp:276 src/OpenSSLUtils.cpp:374 +#: src/OpenSSLUtils.cpp:286 src/OpenSSLUtils.cpp:389 msgid "No valid request file specified." msgstr "Nebyl zadÃ¡n platnÃ½ soubor poÅ¾adavku." -#: src/OpenSSLUtils.cpp:487 src/OpenSSLUtils.cpp:621 src/OpenSSLUtils.cpp:712 +#: src/OpenSSLUtils.cpp:507 src/OpenSSLUtils.cpp:646 src/OpenSSLUtils.cpp:742 msgid "No valid CA certificate file specified." msgstr "Nebyl zadÃ¡n platnÃ½ soubor certifikÃ¡tu CA." -#: src/OpenSSLUtils.cpp:495 src/OpenSSLUtils.cpp:785 +#: src/OpenSSLUtils.cpp:515 src/OpenSSLUtils.cpp:820 msgid "No valid certificate file specified." msgstr "Nebyl zadÃ¡n platnÃ½ soubor certifikÃ¡tu." -#: src/OpenSSLUtils.cpp:793 +#: src/OpenSSLUtils.cpp:828 msgid "No valid CA directory specified." msgstr "Nebyl zadÃ¡n platnÃ½ adresÃ¡Å CA." -#: src/OpenSSLUtils.cpp:943 +#: src/OpenSSLUtils.cpp:982 msgid "Showing certificate status with serial %1 failed (%2)." msgstr "ZobrazenÃ statutu certifikÃ¡tu se sÃ©riovÃ½m ÄÃslem '%1' selhalo.(%2)." -#: src/OpenSSLUtils.cpp:979 +#: src/OpenSSLUtils.cpp:1018 msgid "The key file does not exist." msgstr "KlÃÄovÃ½ soubor neexistuje." -#: src/OpenSSLUtils.cpp:1474 +#: src/OpenSSLUtils.cpp:1306 src/OpenSSLUtils.cpp:1677 +#: src/OpenSSLUtils.cpp:1817 +#, fuzzy +msgid "Invalid password." +msgstr "NeplatnÃ© heslo CA." + +#: src/OpenSSLUtils.cpp:1595 msgid "The password for encrypting the output is required." msgstr "Je vyÅ¾adovÃ¡no heslo k Å¡ifrovÃ¡nÃ vÃ½stupu." -#: src/OpenSSLUtils.cpp:1579 +#: src/OpenSSLUtils.cpp:1736 msgid "The PKCS12 password is required." msgstr "Je vyÅ¾adovÃ¡no heslo PKCS12." -#: src/OpenSSLUtils.cpp:1665 src/OpenSSLUtils.cpp:1865 -#: src/OpenSSLUtils.cpp:2017 +#: src/OpenSSLUtils.cpp:1847 src/OpenSSLUtils.cpp:2047 +#: src/OpenSSLUtils.cpp:2199 msgid "Cannot read directory: %1 (%2) [%3]." msgstr "Nelze ÄÃst adresÃ¡Å: %1 (%2) [%3]." -#: src/OpenSSLUtils.cpp:1715 +#: src/OpenSSLUtils.cpp:1897 msgid "No serial number found in %1." msgstr "V %1 nebylo nalezeno sÃ©riovÃ© ÄÃslo." -#: src/OpenSSLUtils.cpp:1735 +#: src/OpenSSLUtils.cpp:1917 msgid "The request already exists." msgstr "PoÅ¾adavek jiÅ¾ existuje." -#: src/OpenSSLUtils.cpp:1926 +#: src/OpenSSLUtils.cpp:2108 msgid "Cannot find the request subject." msgstr "Nelze nalÃ©zt pÅedmÄt poÅ¾adavku." -#: src/OpenSSLUtils.cpp:2087 +#: src/OpenSSLUtils.cpp:2269 msgid "Cannot find the certificate subject." msgstr "Nelze nalÃ©zt pÅedmÄt certifikÃ¡tu." -#: src/OpenSSLUtils.cpp:2186 +#: src/OpenSSLUtils.cpp:2368 msgid "Invalid caName: %1." msgstr "NeplatnÃ½ nÃ¡zev caName: %1." -#: src/OpenSSLUtils.cpp:2195 +#: src/OpenSSLUtils.cpp:2377 msgid "'%1' does not exist." msgstr "%1 neexistuje." -#: src/OpenSSLUtils.cpp:2205 +#: src/OpenSSLUtils.cpp:2387 msgid "%1 still exists." msgstr "%1 jiÅ¾ existuje." -#: src/OpenSSLUtils.cpp:2216 src/OpenSSLUtils.cpp:2264 -#: src/OpenSSLUtils.cpp:2278 src/OpenSSLUtils.cpp:2292 -#: src/OpenSSLUtils.cpp:2306 src/OpenSSLUtils.cpp:2320 +#: src/OpenSSLUtils.cpp:2398 src/OpenSSLUtils.cpp:2446 +#: src/OpenSSLUtils.cpp:2460 src/OpenSSLUtils.cpp:2474 +#: src/OpenSSLUtils.cpp:2488 src/OpenSSLUtils.cpp:2502 msgid "Cannot create directory: %1 (%2 [%3])." msgstr "Nelze vytvoÅit adresÃ¡Å: %1 (%2 [%3])." -#: src/OpenSSLUtils.cpp:2251 +#: src/OpenSSLUtils.cpp:2433 msgid "Cannot copy the configuration template." msgstr "Nelze zkopÃrovat Å¡ablonu konfigurace." -#: src/OpenSSLUtils.cpp:2338 +#: src/OpenSSLUtils.cpp:2520 msgid "Cannot create the file." msgstr "Nelze vytvoÅit soubor." @@ -746,29 +765,29 @@ msgid "Invalid SubjectKeyIdentifierExt object." msgstr "NeplatnÃ½ objekt SubjectKeyIdentifierExt." -#: src/X509v3CertificateExtensions_Priv.cpp:394 -#: src/X509v3CertificateExtensions_Priv.cpp:450 +#: src/X509v3CertificateExtensions_Priv.cpp:395 +#: src/X509v3CertificateExtensions_Priv.cpp:452 #: src/X509v3RequestExtensions_Priv.cpp:134 #: src/X509v3RequestExtensions_Priv.cpp:189 msgid "Extension occurred more than once: %1." msgstr "RozÅ¡ÃÅenÃ se vyskytlo vÃce neÅ¾ jednou: %1." -#: src/X509v3CertificateExtensions_Priv.cpp:401 -#: src/X509v3CertificateExtensions_Priv.cpp:457 +#: src/X509v3CertificateExtensions_Priv.cpp:402 +#: src/X509v3CertificateExtensions_Priv.cpp:459 #: src/X509v3RequestExtensions_Priv.cpp:141 #: src/X509v3RequestExtensions_Priv.cpp:196 msgid "Unable to parse the certificate (NID: %1 Crit: %2)." msgstr "Nelze analyzovat certifikÃ¡t (NID: %1 Krit: %2)." # 51125 AttribValues/label -#: src/X509v3CertificateExtensions_Priv.cpp:509 -#: src/X509v3CertificateExtensions_Priv.cpp:575 -#: src/X509v3CertificateExtensions_Priv.cpp:639 -#: src/X509v3CertificateExtensions_Priv.cpp:701 -#: src/X509v3CertificateExtensions_Priv.cpp:771 -#: src/X509v3CertificateExtensions_Priv.cpp:840 -#: src/X509v3CertificateExtensions_Priv.cpp:916 -#: src/X509v3CertificateExtensions_Priv.cpp:1002 +#: src/X509v3CertificateExtensions_Priv.cpp:511 +#: src/X509v3CertificateExtensions_Priv.cpp:577 +#: src/X509v3CertificateExtensions_Priv.cpp:641 +#: src/X509v3CertificateExtensions_Priv.cpp:703 +#: src/X509v3CertificateExtensions_Priv.cpp:773 +#: src/X509v3CertificateExtensions_Priv.cpp:842 +#: src/X509v3CertificateExtensions_Priv.cpp:918 +#: src/X509v3CertificateExtensions_Priv.cpp:1004 #: src/X509v3CRLExtensions_Priv.cpp:135 #: src/X509v3RequestExtensions_Priv.cpp:249 #: src/X509v3RequestExtensions_Priv.cpp:315 @@ -777,14 +796,14 @@ msgid "Extension occurred more than once." msgstr "RozÅ¡ÃÅenÃ se vyskytlo vÃce neÅ¾ jednou." -#: src/X509v3CertificateExtensions_Priv.cpp:514 -#: src/X509v3CertificateExtensions_Priv.cpp:580 -#: src/X509v3CertificateExtensions_Priv.cpp:644 -#: src/X509v3CertificateExtensions_Priv.cpp:707 -#: src/X509v3CertificateExtensions_Priv.cpp:776 -#: src/X509v3CertificateExtensions_Priv.cpp:846 -#: src/X509v3CertificateExtensions_Priv.cpp:921 -#: src/X509v3CertificateExtensions_Priv.cpp:1007 +#: src/X509v3CertificateExtensions_Priv.cpp:516 +#: src/X509v3CertificateExtensions_Priv.cpp:582 +#: src/X509v3CertificateExtensions_Priv.cpp:646 +#: src/X509v3CertificateExtensions_Priv.cpp:709 +#: src/X509v3CertificateExtensions_Priv.cpp:778 +#: src/X509v3CertificateExtensions_Priv.cpp:848 +#: src/X509v3CertificateExtensions_Priv.cpp:923 +#: src/X509v3CertificateExtensions_Priv.cpp:1009 #: src/X509v3CRLExtensions_Priv.cpp:140 #: src/X509v3RequestExtensions_Priv.cpp:254 #: src/X509v3RequestExtensions_Priv.cpp:320 @@ -793,7 +812,7 @@ msgid "Unable to parse the certificate (Crit: %1)." msgstr "Nelze analyzovat certifikÃ¡t (Krit: %1)." -#: src/X509v3CertificateExtensions_Priv.cpp:941 +#: src/X509v3CertificateExtensions_Priv.cpp:943 msgid "Invalid location in authorityInfoAccess." msgstr "NeplatnÃ© mÃsto v authorityInfoAccess." @@ -925,3 +944,6 @@ #: src/X509v3RequestExtensions.cpp:231 msgid "Invalid value for X509v3RequestExts::setSubjectAlternativeName." msgstr "NeplatnÃ¡ hodnota pro X509v3RequestExts::setSubjectAlternativeName." + +#~ msgid "Command returned '%1' : %2" +#~ msgstr "PÅÃkaz vrÃ¡til '%1' : %2" Modified: limal-head/limal-ca-mgm/po/da.po URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/po/da.po?rev=… ============================================================================== --- limal-head/limal-ca-mgm/po/da.po (original) +++ limal-head/limal-ca-mgm/po/da.po Mon Oct 29 11:30:37 2007 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: limal-ca-mgm\n" "Report-Msgid-Bugs-To: translation(a)suse.de\n" -"POT-Creation-Date: 2007-09-28 16:31+0200\n" +"POT-Creation-Date: 2007-10-29 11:25+0100\n" "PO-Revision-Date: 2007-08-06 21:05+0200\n" "Last-Translator: Ib Larsen <i.la(a)tele2adsl.dk>\n" "Language-Team: <opensuse-translation(a)opensuse.org>\n" @@ -31,8 +31,8 @@ #: src/AuthorityInfoAccessExtension.cpp:259 #: src/AuthorityInfoAccessExtension.cpp:342 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:87 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:194 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:86 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:193 #: src/BasicConstraintsExtension.cpp:84 src/BasicConstraintsExtension.cpp:187 #: src/BitExtensions.cpp:134 src/BitExtensions.cpp:247 #: src/BitExtensions.cpp:374 src/BitExtensions.cpp:482 src/CA.cpp:1565 @@ -79,12 +79,12 @@ msgid "AuthorityKeyIdentifierExt is not present." msgstr "AuthorityKeyIdentifierExt findes ikke." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:155 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:174 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:154 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:173 msgid "AuthorityKeyIdentifierGenerateExt is not present." msgstr "AuthorityKeyIdentifierGenerateExt findes ikke." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:186 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:185 msgid "Invalid AuthorityKeyIdentifierGenerateExt object." msgstr "Ugyldigt AuthorityKeyIdentifierGenerateExt-emne." @@ -204,7 +204,7 @@ msgid "Duplicate DN. Request already exists." msgstr "Duplikeret DN. EfterspÃ¸rgsel findes allerede." -#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:968 +#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:1007 msgid "Cannot parse the certificate name." msgstr "Kan ikke fortolke certifikatnavnet." @@ -542,93 +542,112 @@ msgid "Invalid command %1." msgstr "Ugyldig kommando %1." -#: src/OpenSSLUtils.cpp:138 src/OpenSSLUtils.cpp:241 src/OpenSSLUtils.cpp:334 -#: src/OpenSSLUtils.cpp:453 src/OpenSSLUtils.cpp:586 src/OpenSSLUtils.cpp:681 -#: src/OpenSSLUtils.cpp:761 -msgid "Command returned '%1' : %2" -msgstr "Kommando returnerede '%1': %2" +#: src/OpenSSLUtils.cpp:132 src/OpenSSLUtils.cpp:240 src/OpenSSLUtils.cpp:338 +#: src/OpenSSLUtils.cpp:462 src/OpenSSLUtils.cpp:600 src/OpenSSLUtils.cpp:700 +#: src/OpenSSLUtils.cpp:782 src/OpenSSLUtils.cpp:871 src/OpenSSLUtils.cpp:952 +#: src/OpenSSLUtils.cpp:1051 src/OpenSSLUtils.cpp:1137 +#: src/OpenSSLUtils.cpp:1271 src/OpenSSLUtils.cpp:1390 +#: src/OpenSSLUtils.cpp:1493 src/OpenSSLUtils.cpp:1645 +#: src/OpenSSLUtils.cpp:1782 +msgid "Executing openssl command failed." +msgstr "" + +#: src/OpenSSLUtils.cpp:143 src/OpenSSLUtils.cpp:251 src/OpenSSLUtils.cpp:349 +#: src/OpenSSLUtils.cpp:473 src/OpenSSLUtils.cpp:611 src/OpenSSLUtils.cpp:711 +#: src/OpenSSLUtils.cpp:796 src/OpenSSLUtils.cpp:1162 +#: src/OpenSSLUtils.cpp:1311 src/OpenSSLUtils.cpp:1415 +#: src/OpenSSLUtils.cpp:1518 src/OpenSSLUtils.cpp:1682 +#: src/OpenSSLUtils.cpp:1822 +msgid "openssl command failed: %1" +msgstr "" -#: src/OpenSSLUtils.cpp:171 src/OpenSSLUtils.cpp:268 src/OpenSSLUtils.cpp:366 -#: src/OpenSSLUtils.cpp:479 src/OpenSSLUtils.cpp:613 src/OpenSSLUtils.cpp:704 +#: src/OpenSSLUtils.cpp:176 src/OpenSSLUtils.cpp:278 src/OpenSSLUtils.cpp:381 +#: src/OpenSSLUtils.cpp:499 src/OpenSSLUtils.cpp:638 src/OpenSSLUtils.cpp:734 msgid "No valid key file specified." msgstr "Der er ikke angivet en gyldig nÃ¸glefil." -#: src/OpenSSLUtils.cpp:276 src/OpenSSLUtils.cpp:374 +#: src/OpenSSLUtils.cpp:286 src/OpenSSLUtils.cpp:389 msgid "No valid request file specified." msgstr "Der er ikke angivet en gyldig efterspÃ¸rgselsfil." -#: src/OpenSSLUtils.cpp:487 src/OpenSSLUtils.cpp:621 src/OpenSSLUtils.cpp:712 +#: src/OpenSSLUtils.cpp:507 src/OpenSSLUtils.cpp:646 src/OpenSSLUtils.cpp:742 msgid "No valid CA certificate file specified." msgstr "Der er ikke angivet et gyldigt CA-certifikat." -#: src/OpenSSLUtils.cpp:495 src/OpenSSLUtils.cpp:785 +#: src/OpenSSLUtils.cpp:515 src/OpenSSLUtils.cpp:820 msgid "No valid certificate file specified." msgstr "Der er ikke angivet en gyldig certifikatfil." -#: src/OpenSSLUtils.cpp:793 +#: src/OpenSSLUtils.cpp:828 msgid "No valid CA directory specified." msgstr "Der er ikke angivet en gyldig CA-mappe." -#: src/OpenSSLUtils.cpp:943 +#: src/OpenSSLUtils.cpp:982 msgid "Showing certificate status with serial %1 failed (%2)." msgstr "At vise certifikatstatus med serienummer %1 fejlede (%2)." -#: src/OpenSSLUtils.cpp:979 +#: src/OpenSSLUtils.cpp:1018 msgid "The key file does not exist." msgstr "Den angivne nÃ¸glefil eksisterer ikke." -#: src/OpenSSLUtils.cpp:1474 +#: src/OpenSSLUtils.cpp:1306 src/OpenSSLUtils.cpp:1677 +#: src/OpenSSLUtils.cpp:1817 +#, fuzzy +msgid "Invalid password." +msgstr "Ugyldig CA-adgangskode." + +#: src/OpenSSLUtils.cpp:1595 msgid "The password for encrypting the output is required." msgstr "Adgangskoden til kryptering af output er pÃ¥krÃ¦vet." -#: src/OpenSSLUtils.cpp:1579 +#: src/OpenSSLUtils.cpp:1736 msgid "The PKCS12 password is required." msgstr "PKCS12-adgangskoden er pÃ¥krÃ¦vet." -#: src/OpenSSLUtils.cpp:1665 src/OpenSSLUtils.cpp:1865 -#: src/OpenSSLUtils.cpp:2017 +#: src/OpenSSLUtils.cpp:1847 src/OpenSSLUtils.cpp:2047 +#: src/OpenSSLUtils.cpp:2199 msgid "Cannot read directory: %1 (%2) [%3]." msgstr "Bibliotek kan ikke lÃ¦ses: %1 (%2) [%3]." -#: src/OpenSSLUtils.cpp:1715 +#: src/OpenSSLUtils.cpp:1897 msgid "No serial number found in %1." msgstr "Der blev ikke fundet et serienummer i %1." -#: src/OpenSSLUtils.cpp:1735 +#: src/OpenSSLUtils.cpp:1917 msgid "The request already exists." msgstr "Anmodningen eksisterer allerede." -#: src/OpenSSLUtils.cpp:1926 +#: src/OpenSSLUtils.cpp:2108 msgid "Cannot find the request subject." msgstr "Anmodningens emne blev ikke fundet." -#: src/OpenSSLUtils.cpp:2087 +#: src/OpenSSLUtils.cpp:2269 msgid "Cannot find the certificate subject." msgstr "Certifikatemnet blev ikke fundet." -#: src/OpenSSLUtils.cpp:2186 +#: src/OpenSSLUtils.cpp:2368 msgid "Invalid caName: %1." msgstr "caName er ugyldigt: %1." -#: src/OpenSSLUtils.cpp:2195 +#: src/OpenSSLUtils.cpp:2377 msgid "'%1' does not exist." msgstr "'%1' findes ikke." -#: src/OpenSSLUtils.cpp:2205 +#: src/OpenSSLUtils.cpp:2387 msgid "%1 still exists." msgstr "%1 findes stadig." -#: src/OpenSSLUtils.cpp:2216 src/OpenSSLUtils.cpp:2264 -#: src/OpenSSLUtils.cpp:2278 src/OpenSSLUtils.cpp:2292 -#: src/OpenSSLUtils.cpp:2306 src/OpenSSLUtils.cpp:2320 +#: src/OpenSSLUtils.cpp:2398 src/OpenSSLUtils.cpp:2446 +#: src/OpenSSLUtils.cpp:2460 src/OpenSSLUtils.cpp:2474 +#: src/OpenSSLUtils.cpp:2488 src/OpenSSLUtils.cpp:2502 msgid "Cannot create directory: %1 (%2 [%3])." msgstr "Biblioteket kan ikke oprettes: %1 (%2 [%3])." -#: src/OpenSSLUtils.cpp:2251 +#: src/OpenSSLUtils.cpp:2433 msgid "Cannot copy the configuration template." msgstr "Konfigurationsskabelonen kan ikke kopieres." -#: src/OpenSSLUtils.cpp:2338 +#: src/OpenSSLUtils.cpp:2520 msgid "Cannot create the file." msgstr "Filen kan ikke oprettes." @@ -747,28 +766,28 @@ msgid "Invalid SubjectKeyIdentifierExt object." msgstr "Ugyldigt SubjectKeyIdentifierExt-objekt." -#: src/X509v3CertificateExtensions_Priv.cpp:394 -#: src/X509v3CertificateExtensions_Priv.cpp:450 +#: src/X509v3CertificateExtensions_Priv.cpp:395 +#: src/X509v3CertificateExtensions_Priv.cpp:452 #: src/X509v3RequestExtensions_Priv.cpp:134 #: src/X509v3RequestExtensions_Priv.cpp:189 msgid "Extension occurred more than once: %1." msgstr "Udvidelsen forekom flere gange: %1." -#: src/X509v3CertificateExtensions_Priv.cpp:401 -#: src/X509v3CertificateExtensions_Priv.cpp:457 +#: src/X509v3CertificateExtensions_Priv.cpp:402 +#: src/X509v3CertificateExtensions_Priv.cpp:459 #: src/X509v3RequestExtensions_Priv.cpp:141 #: src/X509v3RequestExtensions_Priv.cpp:196 msgid "Unable to parse the certificate (NID: %1 Crit: %2)." msgstr "Det var ikke muligt at fortolke certifikatet (NID: %1 Crit: %2)." -#: src/X509v3CertificateExtensions_Priv.cpp:509 -#: src/X509v3CertificateExtensions_Priv.cpp:575 -#: src/X509v3CertificateExtensions_Priv.cpp:639 -#: src/X509v3CertificateExtensions_Priv.cpp:701 -#: src/X509v3CertificateExtensions_Priv.cpp:771 -#: src/X509v3CertificateExtensions_Priv.cpp:840 -#: src/X509v3CertificateExtensions_Priv.cpp:916 -#: src/X509v3CertificateExtensions_Priv.cpp:1002 +#: src/X509v3CertificateExtensions_Priv.cpp:511 +#: src/X509v3CertificateExtensions_Priv.cpp:577 +#: src/X509v3CertificateExtensions_Priv.cpp:641 +#: src/X509v3CertificateExtensions_Priv.cpp:703 +#: src/X509v3CertificateExtensions_Priv.cpp:773 +#: src/X509v3CertificateExtensions_Priv.cpp:842 +#: src/X509v3CertificateExtensions_Priv.cpp:918 +#: src/X509v3CertificateExtensions_Priv.cpp:1004 #: src/X509v3CRLExtensions_Priv.cpp:135 #: src/X509v3RequestExtensions_Priv.cpp:249 #: src/X509v3RequestExtensions_Priv.cpp:315 @@ -777,14 +796,14 @@ msgid "Extension occurred more than once." msgstr "Udvidelsen forekom flere gange." -#: src/X509v3CertificateExtensions_Priv.cpp:514 -#: src/X509v3CertificateExtensions_Priv.cpp:580 -#: src/X509v3CertificateExtensions_Priv.cpp:644 -#: src/X509v3CertificateExtensions_Priv.cpp:707 -#: src/X509v3CertificateExtensions_Priv.cpp:776 -#: src/X509v3CertificateExtensions_Priv.cpp:846 -#: src/X509v3CertificateExtensions_Priv.cpp:921 -#: src/X509v3CertificateExtensions_Priv.cpp:1007 +#: src/X509v3CertificateExtensions_Priv.cpp:516 +#: src/X509v3CertificateExtensions_Priv.cpp:582 +#: src/X509v3CertificateExtensions_Priv.cpp:646 +#: src/X509v3CertificateExtensions_Priv.cpp:709 +#: src/X509v3CertificateExtensions_Priv.cpp:778 +#: src/X509v3CertificateExtensions_Priv.cpp:848 +#: src/X509v3CertificateExtensions_Priv.cpp:923 +#: src/X509v3CertificateExtensions_Priv.cpp:1009 #: src/X509v3CRLExtensions_Priv.cpp:140 #: src/X509v3RequestExtensions_Priv.cpp:254 #: src/X509v3RequestExtensions_Priv.cpp:320 @@ -793,7 +812,7 @@ msgid "Unable to parse the certificate (Crit: %1)." msgstr "Det var ikke muligt at fortolke certifikatet (Crit: %1)." -#: src/X509v3CertificateExtensions_Priv.cpp:941 +#: src/X509v3CertificateExtensions_Priv.cpp:943 msgid "Invalid location in authorityInfoAccess." msgstr "Ugyldig placering i authorityInfoAccess." @@ -920,3 +939,6 @@ #: src/X509v3RequestExtensions.cpp:231 msgid "Invalid value for X509v3RequestExts::setSubjectAlternativeName." msgstr "Ugyldig vÃ¦rdi for X509v3RequestExts::setSubjectAlternativeName." + +#~ msgid "Command returned '%1' : %2" +#~ msgstr "Kommando returnerede '%1': %2" Modified: limal-head/limal-ca-mgm/po/de.po URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/po/de.po?rev=… ============================================================================== --- limal-head/limal-ca-mgm/po/de.po (original) +++ limal-head/limal-ca-mgm/po/de.po Mon Oct 29 11:30:37 2007 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: @PACKAGE@\n" "Report-Msgid-Bugs-To: translation(a)suse.de\n" -"POT-Creation-Date: 2007-09-28 16:31+0200\n" +"POT-Creation-Date: 2007-10-29 11:25+0100\n" "PO-Revision-Date: 2005-03-09 13:54+0100\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" @@ -29,8 +29,8 @@ #: src/AuthorityInfoAccessExtension.cpp:259 #: src/AuthorityInfoAccessExtension.cpp:342 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:87 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:194 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:86 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:193 #: src/BasicConstraintsExtension.cpp:84 src/BasicConstraintsExtension.cpp:187 #: src/BitExtensions.cpp:134 src/BitExtensions.cpp:247 #: src/BitExtensions.cpp:374 src/BitExtensions.cpp:482 src/CA.cpp:1565 @@ -78,12 +78,12 @@ msgid "AuthorityKeyIdentifierExt is not present." msgstr "AuthorityKeyIdentifierExt ist nicht vorhanden." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:155 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:174 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:154 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:173 msgid "AuthorityKeyIdentifierGenerateExt is not present." msgstr "AuthorityKeyIdentifierGenerateExt ist nicht vorhanden." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:186 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:185 msgid "Invalid AuthorityKeyIdentifierGenerateExt object." msgstr "UngÃ¼ltiges AuthorityKeyIdentifierGenerateExt-Objekt." @@ -203,7 +203,7 @@ msgid "Duplicate DN. Request already exists." msgstr "Doppelter DN. Anfrage ist bereits vorhanden." -#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:968 +#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:1007 msgid "Cannot parse the certificate name." msgstr "Der Zertifikatname kann nicht analysiert werden." @@ -540,94 +540,113 @@ msgid "Invalid command %1." msgstr "UngÃ¼ltiger Befehl %1." -#: src/OpenSSLUtils.cpp:138 src/OpenSSLUtils.cpp:241 src/OpenSSLUtils.cpp:334 -#: src/OpenSSLUtils.cpp:453 src/OpenSSLUtils.cpp:586 src/OpenSSLUtils.cpp:681 -#: src/OpenSSLUtils.cpp:761 -msgid "Command returned '%1' : %2" -msgstr "BefehlsrÃ¼ckgabe '%1' : %2" +#: src/OpenSSLUtils.cpp:132 src/OpenSSLUtils.cpp:240 src/OpenSSLUtils.cpp:338 +#: src/OpenSSLUtils.cpp:462 src/OpenSSLUtils.cpp:600 src/OpenSSLUtils.cpp:700 +#: src/OpenSSLUtils.cpp:782 src/OpenSSLUtils.cpp:871 src/OpenSSLUtils.cpp:952 +#: src/OpenSSLUtils.cpp:1051 src/OpenSSLUtils.cpp:1137 +#: src/OpenSSLUtils.cpp:1271 src/OpenSSLUtils.cpp:1390 +#: src/OpenSSLUtils.cpp:1493 src/OpenSSLUtils.cpp:1645 +#: src/OpenSSLUtils.cpp:1782 +msgid "Executing openssl command failed." +msgstr "" + +#: src/OpenSSLUtils.cpp:143 src/OpenSSLUtils.cpp:251 src/OpenSSLUtils.cpp:349 +#: src/OpenSSLUtils.cpp:473 src/OpenSSLUtils.cpp:611 src/OpenSSLUtils.cpp:711 +#: src/OpenSSLUtils.cpp:796 src/OpenSSLUtils.cpp:1162 +#: src/OpenSSLUtils.cpp:1311 src/OpenSSLUtils.cpp:1415 +#: src/OpenSSLUtils.cpp:1518 src/OpenSSLUtils.cpp:1682 +#: src/OpenSSLUtils.cpp:1822 +msgid "openssl command failed: %1" +msgstr "" -#: src/OpenSSLUtils.cpp:171 src/OpenSSLUtils.cpp:268 src/OpenSSLUtils.cpp:366 -#: src/OpenSSLUtils.cpp:479 src/OpenSSLUtils.cpp:613 src/OpenSSLUtils.cpp:704 +#: src/OpenSSLUtils.cpp:176 src/OpenSSLUtils.cpp:278 src/OpenSSLUtils.cpp:381 +#: src/OpenSSLUtils.cpp:499 src/OpenSSLUtils.cpp:638 src/OpenSSLUtils.cpp:734 msgid "No valid key file specified." msgstr "Keine gÃ¼ltige SchlÃ¼sseldatei angegeben." -#: src/OpenSSLUtils.cpp:276 src/OpenSSLUtils.cpp:374 +#: src/OpenSSLUtils.cpp:286 src/OpenSSLUtils.cpp:389 msgid "No valid request file specified." msgstr "Keine gÃ¼ltige Anfragedatei angegeben." -#: src/OpenSSLUtils.cpp:487 src/OpenSSLUtils.cpp:621 src/OpenSSLUtils.cpp:712 +#: src/OpenSSLUtils.cpp:507 src/OpenSSLUtils.cpp:646 src/OpenSSLUtils.cpp:742 msgid "No valid CA certificate file specified." msgstr "Keine gÃ¼ltige CA-Zertifikatdatei angegeben." -#: src/OpenSSLUtils.cpp:495 src/OpenSSLUtils.cpp:785 +#: src/OpenSSLUtils.cpp:515 src/OpenSSLUtils.cpp:820 msgid "No valid certificate file specified." msgstr "Keine gÃ¼ltige Zertifikatdatei angegeben." -#: src/OpenSSLUtils.cpp:793 +#: src/OpenSSLUtils.cpp:828 msgid "No valid CA directory specified." msgstr "Kein gÃ¼ltiges CA-Verzeichnis angegeben." -#: src/OpenSSLUtils.cpp:943 +#: src/OpenSSLUtils.cpp:982 msgid "Showing certificate status with serial %1 failed (%2)." msgstr "" "Zertifikatstatus mit Seriennummer %1 konnte nicht angezeigt werden (%2)." -#: src/OpenSSLUtils.cpp:979 +#: src/OpenSSLUtils.cpp:1018 msgid "The key file does not exist." msgstr "Die SchlÃ¼sseldatei ist nicht vorhanden." -#: src/OpenSSLUtils.cpp:1474 +#: src/OpenSSLUtils.cpp:1306 src/OpenSSLUtils.cpp:1677 +#: src/OpenSSLUtils.cpp:1817 +#, fuzzy +msgid "Invalid password." +msgstr "UngÃ¼ltiges CA-Passwort." + +#: src/OpenSSLUtils.cpp:1595 msgid "The password for encrypting the output is required." msgstr "Das Passwort zum VerschlÃ¼sseln der Ausgabe muss angegeben werden." -#: src/OpenSSLUtils.cpp:1579 +#: src/OpenSSLUtils.cpp:1736 msgid "The PKCS12 password is required." msgstr "Das PKCS12-Passwort muss angegeben werden." -#: src/OpenSSLUtils.cpp:1665 src/OpenSSLUtils.cpp:1865 -#: src/OpenSSLUtils.cpp:2017 +#: src/OpenSSLUtils.cpp:1847 src/OpenSSLUtils.cpp:2047 +#: src/OpenSSLUtils.cpp:2199 msgid "Cannot read directory: %1 (%2) [%3]." msgstr "Verzeichnis kann nicht glesen werden: %1 (%2) [%3]." -#: src/OpenSSLUtils.cpp:1715 +#: src/OpenSSLUtils.cpp:1897 msgid "No serial number found in %1." msgstr "Keine Seriennummer in %1 gefunden." -#: src/OpenSSLUtils.cpp:1735 +#: src/OpenSSLUtils.cpp:1917 msgid "The request already exists." msgstr "Die Anforderung ist bereits vorhanden." -#: src/OpenSSLUtils.cpp:1926 +#: src/OpenSSLUtils.cpp:2108 msgid "Cannot find the request subject." msgstr "EmpfÃ¤nger der Anforderung wurde nicht gefunden." -#: src/OpenSSLUtils.cpp:2087 +#: src/OpenSSLUtils.cpp:2269 msgid "Cannot find the certificate subject." msgstr "EmpfÃ¤nger des Zertifikats wurde nicht gefunden." -#: src/OpenSSLUtils.cpp:2186 +#: src/OpenSSLUtils.cpp:2368 msgid "Invalid caName: %1." msgstr "caName ungÃ¼ltig: %1." -#: src/OpenSSLUtils.cpp:2195 +#: src/OpenSSLUtils.cpp:2377 msgid "'%1' does not exist." msgstr "'%1' ist nicht vorhanden." -#: src/OpenSSLUtils.cpp:2205 +#: src/OpenSSLUtils.cpp:2387 msgid "%1 still exists." msgstr "%1 ist nach wie vor vorhanden." -#: src/OpenSSLUtils.cpp:2216 src/OpenSSLUtils.cpp:2264 -#: src/OpenSSLUtils.cpp:2278 src/OpenSSLUtils.cpp:2292 -#: src/OpenSSLUtils.cpp:2306 src/OpenSSLUtils.cpp:2320 +#: src/OpenSSLUtils.cpp:2398 src/OpenSSLUtils.cpp:2446 +#: src/OpenSSLUtils.cpp:2460 src/OpenSSLUtils.cpp:2474 +#: src/OpenSSLUtils.cpp:2488 src/OpenSSLUtils.cpp:2502 msgid "Cannot create directory: %1 (%2 [%3])." msgstr "Verzeichnis kann nicht erstellt werden: %1 (%2 [%3])." -#: src/OpenSSLUtils.cpp:2251 +#: src/OpenSSLUtils.cpp:2433 msgid "Cannot copy the configuration template." msgstr "Konfigurationsvorlage kann nicht kopiert werden." -#: src/OpenSSLUtils.cpp:2338 +#: src/OpenSSLUtils.cpp:2520 msgid "Cannot create the file." msgstr "Datei kann nicht erstellt werden." @@ -746,28 +765,28 @@ msgid "Invalid SubjectKeyIdentifierExt object." msgstr "UngÃ¼ltiges SubjectKeyIdentifierExt-Objekt." -#: src/X509v3CertificateExtensions_Priv.cpp:394 -#: src/X509v3CertificateExtensions_Priv.cpp:450 +#: src/X509v3CertificateExtensions_Priv.cpp:395 +#: src/X509v3CertificateExtensions_Priv.cpp:452 #: src/X509v3RequestExtensions_Priv.cpp:134 #: src/X509v3RequestExtensions_Priv.cpp:189 msgid "Extension occurred more than once: %1." msgstr "Erweiterung kam mehrmals vor: %1." -#: src/X509v3CertificateExtensions_Priv.cpp:401 -#: src/X509v3CertificateExtensions_Priv.cpp:457 +#: src/X509v3CertificateExtensions_Priv.cpp:402 +#: src/X509v3CertificateExtensions_Priv.cpp:459 #: src/X509v3RequestExtensions_Priv.cpp:141 #: src/X509v3RequestExtensions_Priv.cpp:196 msgid "Unable to parse the certificate (NID: %1 Crit: %2)." msgstr "Zertifikat kann nicht analysiert werden (NID: %1 Krit: %2)." -#: src/X509v3CertificateExtensions_Priv.cpp:509 -#: src/X509v3CertificateExtensions_Priv.cpp:575 -#: src/X509v3CertificateExtensions_Priv.cpp:639 -#: src/X509v3CertificateExtensions_Priv.cpp:701 -#: src/X509v3CertificateExtensions_Priv.cpp:771 -#: src/X509v3CertificateExtensions_Priv.cpp:840 -#: src/X509v3CertificateExtensions_Priv.cpp:916 -#: src/X509v3CertificateExtensions_Priv.cpp:1002 +#: src/X509v3CertificateExtensions_Priv.cpp:511 +#: src/X509v3CertificateExtensions_Priv.cpp:577 +#: src/X509v3CertificateExtensions_Priv.cpp:641 +#: src/X509v3CertificateExtensions_Priv.cpp:703 +#: src/X509v3CertificateExtensions_Priv.cpp:773 +#: src/X509v3CertificateExtensions_Priv.cpp:842 +#: src/X509v3CertificateExtensions_Priv.cpp:918 +#: src/X509v3CertificateExtensions_Priv.cpp:1004 #: src/X509v3CRLExtensions_Priv.cpp:135 #: src/X509v3RequestExtensions_Priv.cpp:249 #: src/X509v3RequestExtensions_Priv.cpp:315 @@ -776,14 +795,14 @@ msgid "Extension occurred more than once." msgstr "Erweiterung kam mehrmals vor." -#: src/X509v3CertificateExtensions_Priv.cpp:514 -#: src/X509v3CertificateExtensions_Priv.cpp:580 -#: src/X509v3CertificateExtensions_Priv.cpp:644 -#: src/X509v3CertificateExtensions_Priv.cpp:707 -#: src/X509v3CertificateExtensions_Priv.cpp:776 -#: src/X509v3CertificateExtensions_Priv.cpp:846 -#: src/X509v3CertificateExtensions_Priv.cpp:921 -#: src/X509v3CertificateExtensions_Priv.cpp:1007 +#: src/X509v3CertificateExtensions_Priv.cpp:516 +#: src/X509v3CertificateExtensions_Priv.cpp:582 +#: src/X509v3CertificateExtensions_Priv.cpp:646 +#: src/X509v3CertificateExtensions_Priv.cpp:709 +#: src/X509v3CertificateExtensions_Priv.cpp:778 +#: src/X509v3CertificateExtensions_Priv.cpp:848 +#: src/X509v3CertificateExtensions_Priv.cpp:923 +#: src/X509v3CertificateExtensions_Priv.cpp:1009 #: src/X509v3CRLExtensions_Priv.cpp:140 #: src/X509v3RequestExtensions_Priv.cpp:254 #: src/X509v3RequestExtensions_Priv.cpp:320 @@ -792,7 +811,7 @@ msgid "Unable to parse the certificate (Crit: %1)." msgstr "Zertifikat kann nicht analysiert werden (Krit: %1)." -#: src/X509v3CertificateExtensions_Priv.cpp:941 +#: src/X509v3CertificateExtensions_Priv.cpp:943 msgid "Invalid location in authorityInfoAccess." msgstr "UngÃ¼ltiger Ort in authorityInfoAccess." @@ -925,3 +944,6 @@ #: src/X509v3RequestExtensions.cpp:231 msgid "Invalid value for X509v3RequestExts::setSubjectAlternativeName." msgstr "UnzulÃ¤ssiger Wert fÃ¼r X509v3RequestExts::setSubjectAlternativeName." + +#~ msgid "Command returned '%1' : %2" +#~ msgstr "BefehlsrÃ¼ckgabe '%1' : %2" Modified: limal-head/limal-ca-mgm/po/el.po URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/po/el.po?rev=… ============================================================================== --- limal-head/limal-ca-mgm/po/el.po (original) +++ limal-head/limal-ca-mgm/po/el.po Mon Oct 29 11:30:37 2007 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: limal-ca-mgm.el\n" "Report-Msgid-Bugs-To: translation(a)suse.de\n" -"POT-Creation-Date: 2007-09-28 16:31+0200\n" +"POT-Creation-Date: 2007-10-29 11:25+0100\n" "PO-Revision-Date: 2007-08-07 16:15+0300\n" "Last-Translator: Kostas Boukouvalas <quantis(a)hellug.gr>\n" "Language-Team: Greek <i18ngr(a)lists.hellug.gr>\n" @@ -31,8 +31,8 @@ #: src/AuthorityInfoAccessExtension.cpp:259 #: src/AuthorityInfoAccessExtension.cpp:342 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:87 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:194 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:86 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:193 #: src/BasicConstraintsExtension.cpp:84 src/BasicConstraintsExtension.cpp:187 #: src/BitExtensions.cpp:134 src/BitExtensions.cpp:247 #: src/BitExtensions.cpp:374 src/BitExtensions.cpp:482 src/CA.cpp:1565 @@ -79,12 +79,12 @@ msgid "AuthorityKeyIdentifierExt is not present." msgstr "Î AuthorityKeyIdentifierExt Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÏÎ±ÏÏÎ½." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:155 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:174 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:154 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:173 msgid "AuthorityKeyIdentifierGenerateExt is not present." msgstr "Î¤Î¿ AuthorityKeyIdentifierGenerateExt Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÏÎ±ÏÏÎ½." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:186 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:185 msgid "Invalid AuthorityKeyIdentifierGenerateExt object." msgstr "ÎÎ±Î½Î¸Î±ÏÎ¼ÎÎ½Î¿ Î±Î½ÏÎ¹ÎºÎµÎ¯Î¼ÎµÎ½Î¿ AuthorityKeyIdentifierGenerateExt" @@ -205,7 +205,7 @@ msgid "Duplicate DN. Request already exists." msgstr "ÎÎ½ÏÎ¹Î³ÏÎ±ÏÎ® DN. Î Î±Î¯ÏÎ·ÏÎ· ÏÏÎ¬ÏÏÎµÎ¹ Î®Î´Î·." -#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:968 +#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:1007 msgid "Cannot parse the certificate name." msgstr "ÎÎ´ÏÎ½Î±Î¼Î¯Î± Î±Î½Î¬Î»ÏÏÎ·Ï ÏÎ¿Ï Î¿Î½ÏÎ¼Î±ÏÎ¿Ï ÏÎ¹ÏÏÎ¿ÏÎ¿Î¹Î·ÏÎ¹ÎºÎ¿Ï." @@ -545,93 +545,112 @@ msgid "Invalid command %1." msgstr "ÎÎ±Î½Î¸Î±ÏÎ¼ÎÎ½Î· ÎµÎ½ÏÎ¿Î»Î® %1." -#: src/OpenSSLUtils.cpp:138 src/OpenSSLUtils.cpp:241 src/OpenSSLUtils.cpp:334 -#: src/OpenSSLUtils.cpp:453 src/OpenSSLUtils.cpp:586 src/OpenSSLUtils.cpp:681 -#: src/OpenSSLUtils.cpp:761 -msgid "Command returned '%1' : %2" -msgstr "Î ÎµÎ½ÏÎ¿Î»Î® ÎÎ´ÏÏÎµ '%1' : %2" +#: src/OpenSSLUtils.cpp:132 src/OpenSSLUtils.cpp:240 src/OpenSSLUtils.cpp:338 +#: src/OpenSSLUtils.cpp:462 src/OpenSSLUtils.cpp:600 src/OpenSSLUtils.cpp:700 +#: src/OpenSSLUtils.cpp:782 src/OpenSSLUtils.cpp:871 src/OpenSSLUtils.cpp:952 +#: src/OpenSSLUtils.cpp:1051 src/OpenSSLUtils.cpp:1137 +#: src/OpenSSLUtils.cpp:1271 src/OpenSSLUtils.cpp:1390 +#: src/OpenSSLUtils.cpp:1493 src/OpenSSLUtils.cpp:1645 +#: src/OpenSSLUtils.cpp:1782 +msgid "Executing openssl command failed." +msgstr "" + +#: src/OpenSSLUtils.cpp:143 src/OpenSSLUtils.cpp:251 src/OpenSSLUtils.cpp:349 +#: src/OpenSSLUtils.cpp:473 src/OpenSSLUtils.cpp:611 src/OpenSSLUtils.cpp:711 +#: src/OpenSSLUtils.cpp:796 src/OpenSSLUtils.cpp:1162 +#: src/OpenSSLUtils.cpp:1311 src/OpenSSLUtils.cpp:1415 +#: src/OpenSSLUtils.cpp:1518 src/OpenSSLUtils.cpp:1682 +#: src/OpenSSLUtils.cpp:1822 +msgid "openssl command failed: %1" +msgstr "" -#: src/OpenSSLUtils.cpp:171 src/OpenSSLUtils.cpp:268 src/OpenSSLUtils.cpp:366 -#: src/OpenSSLUtils.cpp:479 src/OpenSSLUtils.cpp:613 src/OpenSSLUtils.cpp:704 +#: src/OpenSSLUtils.cpp:176 src/OpenSSLUtils.cpp:278 src/OpenSSLUtils.cpp:381 +#: src/OpenSSLUtils.cpp:499 src/OpenSSLUtils.cpp:638 src/OpenSSLUtils.cpp:734 msgid "No valid key file specified." msgstr "ÎÎµÎ½ ÎºÎ±Î¸Î¿ÏÎ¯ÏÏÎ·ÎºÎµ ÎÎ³ÎºÏÏÎ¿ ÎºÎ»ÎµÎ¹Î´Î¯." -#: src/OpenSSLUtils.cpp:276 src/OpenSSLUtils.cpp:374 +#: src/OpenSSLUtils.cpp:286 src/OpenSSLUtils.cpp:389 msgid "No valid request file specified." msgstr "ÎÎµÎ½ ÎºÎ±Î¸Î¿ÏÎ¯ÏÏÎ·ÎºÎµ ÎÎ³ÎºÏÏÎ¿ Î±ÏÏÎµÎ¯Î¿ Î±Î¯ÏÎ·ÏÎ·Ï." -#: src/OpenSSLUtils.cpp:487 src/OpenSSLUtils.cpp:621 src/OpenSSLUtils.cpp:712 +#: src/OpenSSLUtils.cpp:507 src/OpenSSLUtils.cpp:646 src/OpenSSLUtils.cpp:742 msgid "No valid CA certificate file specified." msgstr "ÎÎµÎ½ ÎºÎ±Î¸Î¿ÏÎ¯ÏÏÎ·ÎºÎµ ÎÎ³ÎºÏÏÎ¿ ÏÎ¹ÏÏÎ¿ÏÎ¿Î¹Î·ÏÎ¹ÎºÏ Î±ÏÏÎµÎ¯Î¿ Î±ÏÏÎ®Ï ÏÎ¹ÏÏÎ¿ÏÎ¿Î¯Î·ÏÎ·Ï." -#: src/OpenSSLUtils.cpp:495 src/OpenSSLUtils.cpp:785 +#: src/OpenSSLUtils.cpp:515 src/OpenSSLUtils.cpp:820 msgid "No valid certificate file specified." msgstr "ÎÎµÎ½ ÎºÎ±Î¸Î¿ÏÎ¯ÏÏÎ·ÎºÎµ ÎÎ³ÎºÏÏÎ¿ ÏÎ¹ÏÏÎ¿ÏÎ¿Î¹Î·ÏÎ¹ÎºÏ Î±ÏÏÎµÎ¯Î¿." -#: src/OpenSSLUtils.cpp:793 +#: src/OpenSSLUtils.cpp:828 msgid "No valid CA directory specified." msgstr "ÎÎµÎ½ ÎºÎ±Î¸Î¿ÏÎ¯ÏÏÎ·ÎºÎµ ÎÎ³ÎºÏÏÎ¿Ï ÎºÎ±ÏÎ¬Î»Î¿Î³Î¿Ï ÏÎ·Ï Î±ÏÏÎ®Ï ÏÎ¹ÏÏÎ¿ÏÎ¿Î¯Î·ÏÎ·Ï." -#: src/OpenSSLUtils.cpp:943 +#: src/OpenSSLUtils.cpp:982 msgid "Showing certificate status with serial %1 failed (%2)." msgstr "Î ÏÎ¿ÏÎ¿Î»Î® ÏÎ·Ï ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·Ï ÏÎ¹ÏÏÎ¿ÏÎ¿Î¹Î·ÏÎ¹ÎºÎ¿Ï Î¼Îµ ÏÎµÎ¹ÏÎ¹Î±ÎºÏ %1 Î±ÏÎÏÏÏÎµ (%2)." -#: src/OpenSSLUtils.cpp:979 +#: src/OpenSSLUtils.cpp:1018 msgid "The key file does not exist." msgstr "Î¤Î¿ Î±ÏÏÎµÎ¯Î¿ ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï Î´ÎµÎ½ ÏÏÎ¬ÏÏÎµÎ¹." -#: src/OpenSSLUtils.cpp:1474 +#: src/OpenSSLUtils.cpp:1306 src/OpenSSLUtils.cpp:1677 +#: src/OpenSSLUtils.cpp:1817 +#, fuzzy +msgid "Invalid password." +msgstr "ÎÎ±Î½Î¸Î±ÏÎ¼ÎÎ½Î¿ ÏÏÎ½Î¸Î·Î¼Î±ÏÎ¹ÎºÏ CA." + +#: src/OpenSSLUtils.cpp:1595 msgid "The password for encrypting the output is required." msgstr "ÎÏÎ±Î¹ÏÎµÎ¯ÏÎ±Î¹ ÏÎ¿ ÏÏÎ½Î¸Î·Î¼Î±ÏÎ¹ÎºÏ Î³Î¹Î± ÎºÏÏÏÏÎ¿Î³ÏÎ¬ÏÎ·ÏÎ· ÏÎ·Ï ÎµÎ¾ÏÎ´Î¿Ï." -#: src/OpenSSLUtils.cpp:1579 +#: src/OpenSSLUtils.cpp:1736 msgid "The PKCS12 password is required." msgstr "ÎÏÎ±Î¹ÏÎµÎ¯ÏÎ±Î¹ ÏÎ¿ ÏÏÎ½Î¸Î·Î¼Î±ÏÎ¹ÎºÏ PKCS12." -#: src/OpenSSLUtils.cpp:1665 src/OpenSSLUtils.cpp:1865 -#: src/OpenSSLUtils.cpp:2017 +#: src/OpenSSLUtils.cpp:1847 src/OpenSSLUtils.cpp:2047 +#: src/OpenSSLUtils.cpp:2199 msgid "Cannot read directory: %1 (%2) [%3]." msgstr "ÎÎ´ÏÎ½Î±Î¼Î¯Î± Î±Î½Î¬Î³Î½ÏÏÎ·Ï ÎºÎ±ÏÎ±Î»ÏÎ³Î¿Ï: %1 (%2) [%3]." -#: src/OpenSSLUtils.cpp:1715 +#: src/OpenSSLUtils.cpp:1897 msgid "No serial number found in %1." msgstr "ÎÎµÎ½ Î²ÏÎÎ¸Î·ÎºÎµ ÏÎµÎ¹ÏÎ¹Î±ÎºÏÏ Î±ÏÎ¹Î¸Î¼ÏÏ ÏÏÎ¿ %1." -#: src/OpenSSLUtils.cpp:1735 +#: src/OpenSSLUtils.cpp:1917 msgid "The request already exists." msgstr "Î Î±Î¯ÏÎ·ÏÎ· ÏÏÎ¬ÏÏÎµÎ¹ Î®Î´Î·." -#: src/OpenSSLUtils.cpp:1926 +#: src/OpenSSLUtils.cpp:2108 msgid "Cannot find the request subject." msgstr "ÎÎ´ÏÎ½Î±Î¼Î¯Î± ÎµÏÏÎµÏÎ·Ï ÏÎ¿Ï Î¸ÎÎ¼Î±ÏÎ¿Ï Î±Î¯ÏÎ·ÏÎ·Ï." -#: src/OpenSSLUtils.cpp:2087 +#: src/OpenSSLUtils.cpp:2269 msgid "Cannot find the certificate subject." msgstr "ÎÎ´ÏÎ½Î±Î¼Î¯Î± ÎµÏÏÎµÏÎ·Ï ÏÎ¿Ï Î¸ÎÎ¼Î±ÏÎ¿Ï ÏÎ¹ÏÏÎ¿ÏÎ¿Î¹Î·ÏÎ¹ÎºÎ¿Ï." -#: src/OpenSSLUtils.cpp:2186 +#: src/OpenSSLUtils.cpp:2368 msgid "Invalid caName: %1." msgstr "ÎÎ±Î½Î¸Î±ÏÎ¼ÎÎ½Î¿ caName: %1." -#: src/OpenSSLUtils.cpp:2195 +#: src/OpenSSLUtils.cpp:2377 msgid "'%1' does not exist." msgstr "'%1' Î´ÎµÎ½ ÏÏÎ¬ÏÏÎµÎ¹." -#: src/OpenSSLUtils.cpp:2205 +#: src/OpenSSLUtils.cpp:2387 msgid "%1 still exists." msgstr "%1 Î±ÎºÏÎ¼Î± ÏÏÎ¬ÏÏÎµÎ¹." -#: src/OpenSSLUtils.cpp:2216 src/OpenSSLUtils.cpp:2264 -#: src/OpenSSLUtils.cpp:2278 src/OpenSSLUtils.cpp:2292 -#: src/OpenSSLUtils.cpp:2306 src/OpenSSLUtils.cpp:2320 +#: src/OpenSSLUtils.cpp:2398 src/OpenSSLUtils.cpp:2446 +#: src/OpenSSLUtils.cpp:2460 src/OpenSSLUtils.cpp:2474 +#: src/OpenSSLUtils.cpp:2488 src/OpenSSLUtils.cpp:2502 msgid "Cannot create directory: %1 (%2 [%3])." msgstr "ÎÎ´ÏÎ½Î±Î¼Î¯Î± Î´Î·Î¼Î¹Î¿ÏÏÎ³Î¯Î±Ï ÎºÎ±ÏÎ±Î»ÏÎ³Î¿Ï %1 (%2 [%3])." -#: src/OpenSSLUtils.cpp:2251 +#: src/OpenSSLUtils.cpp:2433 msgid "Cannot copy the configuration template." msgstr "ÎÎ´ÏÎ½Î±Î¼Î¯Î± Î±Î½ÏÎ¹Î³ÏÎ±ÏÎ®Ï ÏÎ¿Ï ÏÏÎ¿ÏÏÏÎ¿Ï ÏÏÎ¸Î¼Î¹ÏÎ·Ï." -#: src/OpenSSLUtils.cpp:2338 +#: src/OpenSSLUtils.cpp:2520 msgid "Cannot create the file." msgstr "ÎÎ´ÏÎ½Î±Î¼Î¯Î± Î´Î·Î¼Î¹Î¿ÏÏÎ³Î¯Î±Ï ÏÎ¿Ï Î±ÏÏÎµÎ¯Î¿Ï." @@ -750,28 +769,28 @@ msgid "Invalid SubjectKeyIdentifierExt object." msgstr "ÎÎ±Î½Î¸Î±ÏÎ¼ÎÎ½Î¿ Î±Î½ÏÎ¹ÎºÎµÎ¯Î¼ÎµÎ½Î¿ SubjectKeyIdentifierExt." -#: src/X509v3CertificateExtensions_Priv.cpp:394 -#: src/X509v3CertificateExtensions_Priv.cpp:450 +#: src/X509v3CertificateExtensions_Priv.cpp:395 +#: src/X509v3CertificateExtensions_Priv.cpp:452 #: src/X509v3RequestExtensions_Priv.cpp:134 #: src/X509v3RequestExtensions_Priv.cpp:189 msgid "Extension occurred more than once: %1." msgstr "Î ÎµÏÎÎºÏÎ±ÏÎ· ÎµÎ¼ÏÎ±Î½Î¯ÏÏÎ·ÎºÎµ ÏÎµÏÎ¹ÏÏÏÏÎµÏÎ¿ Î±ÏÏ Î¼Î¹Î± ÏÎ¿Î± %1." -#: src/X509v3CertificateExtensions_Priv.cpp:401 -#: src/X509v3CertificateExtensions_Priv.cpp:457 +#: src/X509v3CertificateExtensions_Priv.cpp:402 +#: src/X509v3CertificateExtensions_Priv.cpp:459 #: src/X509v3RequestExtensions_Priv.cpp:141 #: src/X509v3RequestExtensions_Priv.cpp:196 msgid "Unable to parse the certificate (NID: %1 Crit: %2)." msgstr "ÎÎ´ÏÎ½Î±Î¼Î¯Î± Î±Î½Î¬Î»ÏÏÎ·Ï ÏÎ¿Ï ÏÎ¹ÏÏÎ¿ÏÎ¿Î¹Î·ÏÎ¹ÎºÎ¿Ï (NID: %1 Crit: %2)." -#: src/X509v3CertificateExtensions_Priv.cpp:509 -#: src/X509v3CertificateExtensions_Priv.cpp:575 -#: src/X509v3CertificateExtensions_Priv.cpp:639 -#: src/X509v3CertificateExtensions_Priv.cpp:701 -#: src/X509v3CertificateExtensions_Priv.cpp:771 -#: src/X509v3CertificateExtensions_Priv.cpp:840 -#: src/X509v3CertificateExtensions_Priv.cpp:916 -#: src/X509v3CertificateExtensions_Priv.cpp:1002 +#: src/X509v3CertificateExtensions_Priv.cpp:511 +#: src/X509v3CertificateExtensions_Priv.cpp:577 +#: src/X509v3CertificateExtensions_Priv.cpp:641 +#: src/X509v3CertificateExtensions_Priv.cpp:703 +#: src/X509v3CertificateExtensions_Priv.cpp:773 +#: src/X509v3CertificateExtensions_Priv.cpp:842 +#: src/X509v3CertificateExtensions_Priv.cpp:918 +#: src/X509v3CertificateExtensions_Priv.cpp:1004 #: src/X509v3CRLExtensions_Priv.cpp:135 #: src/X509v3RequestExtensions_Priv.cpp:249 #: src/X509v3RequestExtensions_Priv.cpp:315 @@ -780,14 +799,14 @@ msgid "Extension occurred more than once." msgstr "Î ÎµÏÎÎºÏÎ±ÏÎ· ÎµÎ¼ÏÎ±Î½Î¯ÏÏÎ·ÎºÎµ ÏÎµÏÎ¹ÏÏÏÏÎµÏÎ¿ Î±ÏÏ Î¼Î¹Î± ÏÎ¿ÏÎ¬" -#: src/X509v3CertificateExtensions_Priv.cpp:514 -#: src/X509v3CertificateExtensions_Priv.cpp:580 -#: src/X509v3CertificateExtensions_Priv.cpp:644 -#: src/X509v3CertificateExtensions_Priv.cpp:707 -#: src/X509v3CertificateExtensions_Priv.cpp:776 -#: src/X509v3CertificateExtensions_Priv.cpp:846 -#: src/X509v3CertificateExtensions_Priv.cpp:921 -#: src/X509v3CertificateExtensions_Priv.cpp:1007 +#: src/X509v3CertificateExtensions_Priv.cpp:516 +#: src/X509v3CertificateExtensions_Priv.cpp:582 +#: src/X509v3CertificateExtensions_Priv.cpp:646 +#: src/X509v3CertificateExtensions_Priv.cpp:709 +#: src/X509v3CertificateExtensions_Priv.cpp:778 +#: src/X509v3CertificateExtensions_Priv.cpp:848 +#: src/X509v3CertificateExtensions_Priv.cpp:923 +#: src/X509v3CertificateExtensions_Priv.cpp:1009 #: src/X509v3CRLExtensions_Priv.cpp:140 #: src/X509v3RequestExtensions_Priv.cpp:254 #: src/X509v3RequestExtensions_Priv.cpp:320 @@ -796,7 +815,7 @@ msgid "Unable to parse the certificate (Crit: %1)." msgstr "ÎÎ´ÏÎ½Î±Î¼Î¯Î± Î±Î½Î¬Î»ÏÏÎ·Ï ÏÎ¿Ï ÏÎ¹ÏÏÎ¿ÏÎ¿Î¹Î·ÏÎ¹ÎºÎ¿Ï (Crit: %1)." -#: src/X509v3CertificateExtensions_Priv.cpp:941 +#: src/X509v3CertificateExtensions_Priv.cpp:943 msgid "Invalid location in authorityInfoAccess." msgstr "ÎÎ±Î½Î¸Î±ÏÎ¼ÎÎ½Î· ÏÎ¿ÏÎ¿Î¸ÎµÏÎ¯Î± ÏÏÎ¿ authorityInfoAccess." @@ -927,3 +946,6 @@ #: src/X509v3RequestExtensions.cpp:231 msgid "Invalid value for X509v3RequestExts::setSubjectAlternativeName." msgstr "ÎÎ±Î½Î¸Î±ÏÎ¼ÎÎ½Î· ÏÎ¹Î¼Î® Î³Î¹Î± X509v3RequestExts::setSubjectAlternativeName." + +#~ msgid "Command returned '%1' : %2" +#~ msgstr "Î ÎµÎ½ÏÎ¿Î»Î® ÎÎ´ÏÏÎµ '%1' : %2" Modified: limal-head/limal-ca-mgm/po/en_GB.po URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/po/en_GB.po?r… ============================================================================== --- limal-head/limal-ca-mgm/po/en_GB.po (original) +++ limal-head/limal-ca-mgm/po/en_GB.po Mon Oct 29 11:30:37 2007 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: limal-ca-mgm\n" "Report-Msgid-Bugs-To: translation(a)suse.de\n" -"POT-Creation-Date: 2007-09-28 16:31+0200\n" +"POT-Creation-Date: 2007-10-29 11:25+0100\n" "PO-Revision-Date: 2007-05-25 21:04+0100\n" "Last-Translator: Benjamin Weber <b.weber(a)warwick.ac.uk>\n" "Language-Team: <en(a)li.org>\n" @@ -31,8 +31,8 @@ #: src/AuthorityInfoAccessExtension.cpp:259 #: src/AuthorityInfoAccessExtension.cpp:342 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:87 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:194 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:86 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:193 #: src/BasicConstraintsExtension.cpp:84 src/BasicConstraintsExtension.cpp:187 #: src/BitExtensions.cpp:134 src/BitExtensions.cpp:247 #: src/BitExtensions.cpp:374 src/BitExtensions.cpp:482 src/CA.cpp:1565 @@ -79,12 +79,12 @@ msgid "AuthorityKeyIdentifierExt is not present." msgstr "AuthorityKeyIdentifierExt is not present." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:155 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:174 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:154 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:173 msgid "AuthorityKeyIdentifierGenerateExt is not present." msgstr "AuthorityKeyIdentifierGenerateExt is not present." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:186 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:185 msgid "Invalid AuthorityKeyIdentifierGenerateExt object." msgstr "Invalid AuthorityKeyIdentifierGenerateExt object." @@ -204,7 +204,7 @@ msgid "Duplicate DN. Request already exists." msgstr "Duplicate DN. Request already exists." -#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:968 +#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:1007 msgid "Cannot parse the certificate name." msgstr "Cannot parse the certificate name." @@ -541,93 +541,112 @@ msgid "Invalid command %1." msgstr "Invalid command %1." -#: src/OpenSSLUtils.cpp:138 src/OpenSSLUtils.cpp:241 src/OpenSSLUtils.cpp:334 -#: src/OpenSSLUtils.cpp:453 src/OpenSSLUtils.cpp:586 src/OpenSSLUtils.cpp:681 -#: src/OpenSSLUtils.cpp:761 -msgid "Command returned '%1' : %2" -msgstr "Command returned '%1' : %2" +#: src/OpenSSLUtils.cpp:132 src/OpenSSLUtils.cpp:240 src/OpenSSLUtils.cpp:338 +#: src/OpenSSLUtils.cpp:462 src/OpenSSLUtils.cpp:600 src/OpenSSLUtils.cpp:700 +#: src/OpenSSLUtils.cpp:782 src/OpenSSLUtils.cpp:871 src/OpenSSLUtils.cpp:952 +#: src/OpenSSLUtils.cpp:1051 src/OpenSSLUtils.cpp:1137 +#: src/OpenSSLUtils.cpp:1271 src/OpenSSLUtils.cpp:1390 +#: src/OpenSSLUtils.cpp:1493 src/OpenSSLUtils.cpp:1645 +#: src/OpenSSLUtils.cpp:1782 +msgid "Executing openssl command failed." +msgstr "" + +#: src/OpenSSLUtils.cpp:143 src/OpenSSLUtils.cpp:251 src/OpenSSLUtils.cpp:349 +#: src/OpenSSLUtils.cpp:473 src/OpenSSLUtils.cpp:611 src/OpenSSLUtils.cpp:711 +#: src/OpenSSLUtils.cpp:796 src/OpenSSLUtils.cpp:1162 +#: src/OpenSSLUtils.cpp:1311 src/OpenSSLUtils.cpp:1415 +#: src/OpenSSLUtils.cpp:1518 src/OpenSSLUtils.cpp:1682 +#: src/OpenSSLUtils.cpp:1822 +msgid "openssl command failed: %1" +msgstr "" -#: src/OpenSSLUtils.cpp:171 src/OpenSSLUtils.cpp:268 src/OpenSSLUtils.cpp:366 -#: src/OpenSSLUtils.cpp:479 src/OpenSSLUtils.cpp:613 src/OpenSSLUtils.cpp:704 +#: src/OpenSSLUtils.cpp:176 src/OpenSSLUtils.cpp:278 src/OpenSSLUtils.cpp:381 +#: src/OpenSSLUtils.cpp:499 src/OpenSSLUtils.cpp:638 src/OpenSSLUtils.cpp:734 msgid "No valid key file specified." msgstr "No valid key file specified." -#: src/OpenSSLUtils.cpp:276 src/OpenSSLUtils.cpp:374 +#: src/OpenSSLUtils.cpp:286 src/OpenSSLUtils.cpp:389 msgid "No valid request file specified." msgstr "No valid request file specified." -#: src/OpenSSLUtils.cpp:487 src/OpenSSLUtils.cpp:621 src/OpenSSLUtils.cpp:712 +#: src/OpenSSLUtils.cpp:507 src/OpenSSLUtils.cpp:646 src/OpenSSLUtils.cpp:742 msgid "No valid CA certificate file specified." msgstr "No valid CA certificate file specified." -#: src/OpenSSLUtils.cpp:495 src/OpenSSLUtils.cpp:785 +#: src/OpenSSLUtils.cpp:515 src/OpenSSLUtils.cpp:820 msgid "No valid certificate file specified." msgstr "No valid certificate file specified." -#: src/OpenSSLUtils.cpp:793 +#: src/OpenSSLUtils.cpp:828 msgid "No valid CA directory specified." msgstr "No valid CA directory specified." -#: src/OpenSSLUtils.cpp:943 +#: src/OpenSSLUtils.cpp:982 msgid "Showing certificate status with serial %1 failed (%2)." msgstr "Showing certificate status with serial %1 failed (%2)." -#: src/OpenSSLUtils.cpp:979 +#: src/OpenSSLUtils.cpp:1018 msgid "The key file does not exist." msgstr "The key file does not exist." -#: src/OpenSSLUtils.cpp:1474 +#: src/OpenSSLUtils.cpp:1306 src/OpenSSLUtils.cpp:1677 +#: src/OpenSSLUtils.cpp:1817 +#, fuzzy +msgid "Invalid password." +msgstr "Invalid CA password." + +#: src/OpenSSLUtils.cpp:1595 msgid "The password for encrypting the output is required." msgstr "The password for encrypting the output is required." -#: src/OpenSSLUtils.cpp:1579 +#: src/OpenSSLUtils.cpp:1736 msgid "The PKCS12 password is required." msgstr "The PKCS12 password is required." -#: src/OpenSSLUtils.cpp:1665 src/OpenSSLUtils.cpp:1865 -#: src/OpenSSLUtils.cpp:2017 +#: src/OpenSSLUtils.cpp:1847 src/OpenSSLUtils.cpp:2047 +#: src/OpenSSLUtils.cpp:2199 msgid "Cannot read directory: %1 (%2) [%3]." msgstr "Cannot read directory: %1 (%2) [%3]." -#: src/OpenSSLUtils.cpp:1715 +#: src/OpenSSLUtils.cpp:1897 msgid "No serial number found in %1." msgstr "No serial number found in %1." -#: src/OpenSSLUtils.cpp:1735 +#: src/OpenSSLUtils.cpp:1917 msgid "The request already exists." msgstr "The request already exists." -#: src/OpenSSLUtils.cpp:1926 +#: src/OpenSSLUtils.cpp:2108 msgid "Cannot find the request subject." msgstr "Cannot find the request subject." -#: src/OpenSSLUtils.cpp:2087 +#: src/OpenSSLUtils.cpp:2269 msgid "Cannot find the certificate subject." msgstr "Cannot find the certificate subject." -#: src/OpenSSLUtils.cpp:2186 +#: src/OpenSSLUtils.cpp:2368 msgid "Invalid caName: %1." msgstr "Invalid caName: %1." -#: src/OpenSSLUtils.cpp:2195 +#: src/OpenSSLUtils.cpp:2377 msgid "'%1' does not exist." msgstr "'%1' does not exist." -#: src/OpenSSLUtils.cpp:2205 +#: src/OpenSSLUtils.cpp:2387 msgid "%1 still exists." msgstr "%1 still exists." -#: src/OpenSSLUtils.cpp:2216 src/OpenSSLUtils.cpp:2264 -#: src/OpenSSLUtils.cpp:2278 src/OpenSSLUtils.cpp:2292 -#: src/OpenSSLUtils.cpp:2306 src/OpenSSLUtils.cpp:2320 +#: src/OpenSSLUtils.cpp:2398 src/OpenSSLUtils.cpp:2446 +#: src/OpenSSLUtils.cpp:2460 src/OpenSSLUtils.cpp:2474 +#: src/OpenSSLUtils.cpp:2488 src/OpenSSLUtils.cpp:2502 msgid "Cannot create directory: %1 (%2 [%3])." msgstr "Cannot create directory: %1 (%2 [%3])." -#: src/OpenSSLUtils.cpp:2251 +#: src/OpenSSLUtils.cpp:2433 msgid "Cannot copy the configuration template." msgstr "Cannot copy the configuration template." -#: src/OpenSSLUtils.cpp:2338 +#: src/OpenSSLUtils.cpp:2520 msgid "Cannot create the file." msgstr "Cannot create the file." @@ -746,28 +765,28 @@ msgid "Invalid SubjectKeyIdentifierExt object." msgstr "Invalid SubjectKeyIdentifierExt object." -#: src/X509v3CertificateExtensions_Priv.cpp:394 -#: src/X509v3CertificateExtensions_Priv.cpp:450 +#: src/X509v3CertificateExtensions_Priv.cpp:395 +#: src/X509v3CertificateExtensions_Priv.cpp:452 #: src/X509v3RequestExtensions_Priv.cpp:134 #: src/X509v3RequestExtensions_Priv.cpp:189 msgid "Extension occurred more than once: %1." msgstr "Extension occurred more than once: %1." -#: src/X509v3CertificateExtensions_Priv.cpp:401 -#: src/X509v3CertificateExtensions_Priv.cpp:457 +#: src/X509v3CertificateExtensions_Priv.cpp:402 +#: src/X509v3CertificateExtensions_Priv.cpp:459 #: src/X509v3RequestExtensions_Priv.cpp:141 #: src/X509v3RequestExtensions_Priv.cpp:196 msgid "Unable to parse the certificate (NID: %1 Crit: %2)." msgstr "Unable to parse the certificate (NID: %1 Crit: %2)." -#: src/X509v3CertificateExtensions_Priv.cpp:509 -#: src/X509v3CertificateExtensions_Priv.cpp:575 -#: src/X509v3CertificateExtensions_Priv.cpp:639 -#: src/X509v3CertificateExtensions_Priv.cpp:701 -#: src/X509v3CertificateExtensions_Priv.cpp:771 -#: src/X509v3CertificateExtensions_Priv.cpp:840 -#: src/X509v3CertificateExtensions_Priv.cpp:916 -#: src/X509v3CertificateExtensions_Priv.cpp:1002 +#: src/X509v3CertificateExtensions_Priv.cpp:511 +#: src/X509v3CertificateExtensions_Priv.cpp:577 +#: src/X509v3CertificateExtensions_Priv.cpp:641 +#: src/X509v3CertificateExtensions_Priv.cpp:703 +#: src/X509v3CertificateExtensions_Priv.cpp:773 +#: src/X509v3CertificateExtensions_Priv.cpp:842 +#: src/X509v3CertificateExtensions_Priv.cpp:918 +#: src/X509v3CertificateExtensions_Priv.cpp:1004 #: src/X509v3CRLExtensions_Priv.cpp:135 #: src/X509v3RequestExtensions_Priv.cpp:249 #: src/X509v3RequestExtensions_Priv.cpp:315 @@ -776,14 +795,14 @@ msgid "Extension occurred more than once." msgstr "Extension occurred more than once." -#: src/X509v3CertificateExtensions_Priv.cpp:514 -#: src/X509v3CertificateExtensions_Priv.cpp:580 -#: src/X509v3CertificateExtensions_Priv.cpp:644 -#: src/X509v3CertificateExtensions_Priv.cpp:707 -#: src/X509v3CertificateExtensions_Priv.cpp:776 -#: src/X509v3CertificateExtensions_Priv.cpp:846 -#: src/X509v3CertificateExtensions_Priv.cpp:921 -#: src/X509v3CertificateExtensions_Priv.cpp:1007 +#: src/X509v3CertificateExtensions_Priv.cpp:516 +#: src/X509v3CertificateExtensions_Priv.cpp:582 +#: src/X509v3CertificateExtensions_Priv.cpp:646 +#: src/X509v3CertificateExtensions_Priv.cpp:709 +#: src/X509v3CertificateExtensions_Priv.cpp:778 +#: src/X509v3CertificateExtensions_Priv.cpp:848 +#: src/X509v3CertificateExtensions_Priv.cpp:923 +#: src/X509v3CertificateExtensions_Priv.cpp:1009 #: src/X509v3CRLExtensions_Priv.cpp:140 #: src/X509v3RequestExtensions_Priv.cpp:254 #: src/X509v3RequestExtensions_Priv.cpp:320 @@ -792,7 +811,7 @@ msgid "Unable to parse the certificate (Crit: %1)." msgstr "Unable to parse the certificate (Crit: %1)." -#: src/X509v3CertificateExtensions_Priv.cpp:941 +#: src/X509v3CertificateExtensions_Priv.cpp:943 msgid "Invalid location in authorityInfoAccess." msgstr "Invalid location in authorityInfoAccess." @@ -919,3 +938,6 @@ #: src/X509v3RequestExtensions.cpp:231 msgid "Invalid value for X509v3RequestExts::setSubjectAlternativeName." msgstr "Invalid value for X509v3RequestExts::setSubjectAlternativeName." + +#~ msgid "Command returned '%1' : %2" +#~ msgstr "Command returned '%1' : %2" Modified: limal-head/limal-ca-mgm/po/es.po URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/po/es.po?rev=… ============================================================================== --- limal-head/limal-ca-mgm/po/es.po (original) +++ limal-head/limal-ca-mgm/po/es.po Mon Oct 29 11:30:37 2007 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: limal-ca-mgm\n" "Report-Msgid-Bugs-To: translation(a)suse.de\n" -"POT-Creation-Date: 2007-09-28 16:31+0200\n" +"POT-Creation-Date: 2007-10-29 11:25+0100\n" "PO-Revision-Date: 2006-11-20 10:07\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" @@ -25,8 +25,8 @@ #: src/AuthorityInfoAccessExtension.cpp:259 #: src/AuthorityInfoAccessExtension.cpp:342 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:87 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:194 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:86 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:193 #: src/BasicConstraintsExtension.cpp:84 src/BasicConstraintsExtension.cpp:187 #: src/BitExtensions.cpp:134 src/BitExtensions.cpp:247 #: src/BitExtensions.cpp:374 src/BitExtensions.cpp:482 src/CA.cpp:1565 @@ -73,12 +73,12 @@ msgid "AuthorityKeyIdentifierExt is not present." msgstr "AuthorityKeyIdentifierExt no estÃ¡ presente." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:155 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:174 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:154 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:173 msgid "AuthorityKeyIdentifierGenerateExt is not present." msgstr "AuthorityKeyIdentifierGenerateExt no estÃ¡ presente." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:186 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:185 msgid "Invalid AuthorityKeyIdentifierGenerateExt object." msgstr "Objeto AuthorityKeyIdentifierGenerateExt no vÃ¡lido." @@ -198,7 +198,7 @@ msgid "Duplicate DN. Request already exists." msgstr "DN duplicado. La solicitud ya existe." -#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:968 +#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:1007 msgid "Cannot parse the certificate name." msgstr "No es posible analizar el nombre del certificado." @@ -536,94 +536,113 @@ msgid "Invalid command %1." msgstr "Comando %1 no vÃ¡lido." -#: src/OpenSSLUtils.cpp:138 src/OpenSSLUtils.cpp:241 src/OpenSSLUtils.cpp:334 -#: src/OpenSSLUtils.cpp:453 src/OpenSSLUtils.cpp:586 src/OpenSSLUtils.cpp:681 -#: src/OpenSSLUtils.cpp:761 -msgid "Command returned '%1' : %2" -msgstr "Comando devuelto %1: %2" +#: src/OpenSSLUtils.cpp:132 src/OpenSSLUtils.cpp:240 src/OpenSSLUtils.cpp:338 +#: src/OpenSSLUtils.cpp:462 src/OpenSSLUtils.cpp:600 src/OpenSSLUtils.cpp:700 +#: src/OpenSSLUtils.cpp:782 src/OpenSSLUtils.cpp:871 src/OpenSSLUtils.cpp:952 +#: src/OpenSSLUtils.cpp:1051 src/OpenSSLUtils.cpp:1137 +#: src/OpenSSLUtils.cpp:1271 src/OpenSSLUtils.cpp:1390 +#: src/OpenSSLUtils.cpp:1493 src/OpenSSLUtils.cpp:1645 +#: src/OpenSSLUtils.cpp:1782 +msgid "Executing openssl command failed." +msgstr "" + +#: src/OpenSSLUtils.cpp:143 src/OpenSSLUtils.cpp:251 src/OpenSSLUtils.cpp:349 +#: src/OpenSSLUtils.cpp:473 src/OpenSSLUtils.cpp:611 src/OpenSSLUtils.cpp:711 +#: src/OpenSSLUtils.cpp:796 src/OpenSSLUtils.cpp:1162 +#: src/OpenSSLUtils.cpp:1311 src/OpenSSLUtils.cpp:1415 +#: src/OpenSSLUtils.cpp:1518 src/OpenSSLUtils.cpp:1682 +#: src/OpenSSLUtils.cpp:1822 +msgid "openssl command failed: %1" +msgstr "" -#: src/OpenSSLUtils.cpp:171 src/OpenSSLUtils.cpp:268 src/OpenSSLUtils.cpp:366 -#: src/OpenSSLUtils.cpp:479 src/OpenSSLUtils.cpp:613 src/OpenSSLUtils.cpp:704 +#: src/OpenSSLUtils.cpp:176 src/OpenSSLUtils.cpp:278 src/OpenSSLUtils.cpp:381 +#: src/OpenSSLUtils.cpp:499 src/OpenSSLUtils.cpp:638 src/OpenSSLUtils.cpp:734 msgid "No valid key file specified." msgstr "No se ha especificado ningÃºn archivo de clave vÃ¡lido." -#: src/OpenSSLUtils.cpp:276 src/OpenSSLUtils.cpp:374 +#: src/OpenSSLUtils.cpp:286 src/OpenSSLUtils.cpp:389 msgid "No valid request file specified." msgstr "No se ha especificado ningÃºn archivo de solicitud vÃ¡lido." -#: src/OpenSSLUtils.cpp:487 src/OpenSSLUtils.cpp:621 src/OpenSSLUtils.cpp:712 +#: src/OpenSSLUtils.cpp:507 src/OpenSSLUtils.cpp:646 src/OpenSSLUtils.cpp:742 msgid "No valid CA certificate file specified." msgstr "No se ha especificado ningÃºn archivo de certificado de CA vÃ¡lido." -#: src/OpenSSLUtils.cpp:495 src/OpenSSLUtils.cpp:785 +#: src/OpenSSLUtils.cpp:515 src/OpenSSLUtils.cpp:820 msgid "No valid certificate file specified." msgstr "No se ha especificado ningÃºn archivo de certificado vÃ¡lido." -#: src/OpenSSLUtils.cpp:793 +#: src/OpenSSLUtils.cpp:828 msgid "No valid CA directory specified." msgstr "No se ha especificado ningÃºn directorio de CA vÃ¡lido." -#: src/OpenSSLUtils.cpp:943 +#: src/OpenSSLUtils.cpp:982 msgid "Showing certificate status with serial %1 failed (%2)." msgstr "" "Error al mostrar el estado del certificado con nÃºmero de serie %1 (%2)." -#: src/OpenSSLUtils.cpp:979 +#: src/OpenSSLUtils.cpp:1018 msgid "The key file does not exist." msgstr "El archivo de clave no existe." -#: src/OpenSSLUtils.cpp:1474 +#: src/OpenSSLUtils.cpp:1306 src/OpenSSLUtils.cpp:1677 +#: src/OpenSSLUtils.cpp:1817 +#, fuzzy +msgid "Invalid password." +msgstr "ContraseÃ±a de CA no vÃ¡lida." + +#: src/OpenSSLUtils.cpp:1595 msgid "The password for encrypting the output is required." msgstr "Se necesita la contraseÃ±a para cifrar el resultado." -#: src/OpenSSLUtils.cpp:1579 +#: src/OpenSSLUtils.cpp:1736 msgid "The PKCS12 password is required." msgstr "Se necesita la contraseÃ±a PKCS12." -#: src/OpenSSLUtils.cpp:1665 src/OpenSSLUtils.cpp:1865 -#: src/OpenSSLUtils.cpp:2017 +#: src/OpenSSLUtils.cpp:1847 src/OpenSSLUtils.cpp:2047 +#: src/OpenSSLUtils.cpp:2199 msgid "Cannot read directory: %1 (%2) [%3]." msgstr "No es posible leer el directorio: %1 (%2) [%3]." -#: src/OpenSSLUtils.cpp:1715 +#: src/OpenSSLUtils.cpp:1897 msgid "No serial number found in %1." msgstr "No se ha detectado ningÃºn nÃºmero de serie en %1." -#: src/OpenSSLUtils.cpp:1735 +#: src/OpenSSLUtils.cpp:1917 msgid "The request already exists." msgstr "La peticiÃ³n ya existe." -#: src/OpenSSLUtils.cpp:1926 +#: src/OpenSSLUtils.cpp:2108 msgid "Cannot find the request subject." msgstr "No es posible encontrar el tema pedido." -#: src/OpenSSLUtils.cpp:2087 +#: src/OpenSSLUtils.cpp:2269 msgid "Cannot find the certificate subject." msgstr "No es posible encontrar el tema de certificado." -#: src/OpenSSLUtils.cpp:2186 +#: src/OpenSSLUtils.cpp:2368 msgid "Invalid caName: %1." msgstr "caName incorrecto: %1." -#: src/OpenSSLUtils.cpp:2195 +#: src/OpenSSLUtils.cpp:2377 msgid "'%1' does not exist." msgstr "%1 no existe." -#: src/OpenSSLUtils.cpp:2205 +#: src/OpenSSLUtils.cpp:2387 msgid "%1 still exists." msgstr "%1 todavÃa existe." -#: src/OpenSSLUtils.cpp:2216 src/OpenSSLUtils.cpp:2264 -#: src/OpenSSLUtils.cpp:2278 src/OpenSSLUtils.cpp:2292 -#: src/OpenSSLUtils.cpp:2306 src/OpenSSLUtils.cpp:2320 +#: src/OpenSSLUtils.cpp:2398 src/OpenSSLUtils.cpp:2446 +#: src/OpenSSLUtils.cpp:2460 src/OpenSSLUtils.cpp:2474 +#: src/OpenSSLUtils.cpp:2488 src/OpenSSLUtils.cpp:2502 msgid "Cannot create directory: %1 (%2 [%3])." msgstr "No es posible crear el directorio: %1 (%2 [%3])." -#: src/OpenSSLUtils.cpp:2251 +#: src/OpenSSLUtils.cpp:2433 msgid "Cannot copy the configuration template." msgstr "No es posible copiar la plantilla de configuraciÃ³n." -#: src/OpenSSLUtils.cpp:2338 +#: src/OpenSSLUtils.cpp:2520 msgid "Cannot create the file." msgstr "No es posible crear el archivo." @@ -742,28 +761,28 @@ msgid "Invalid SubjectKeyIdentifierExt object." msgstr "Objeto SubjectKeyIdentifierExt incorrecto." -#: src/X509v3CertificateExtensions_Priv.cpp:394 -#: src/X509v3CertificateExtensions_Priv.cpp:450 +#: src/X509v3CertificateExtensions_Priv.cpp:395 +#: src/X509v3CertificateExtensions_Priv.cpp:452 #: src/X509v3RequestExtensions_Priv.cpp:134 #: src/X509v3RequestExtensions_Priv.cpp:189 msgid "Extension occurred more than once: %1." msgstr "La extensiÃ³n se ha producido mÃ¡s de una vez: %1." -#: src/X509v3CertificateExtensions_Priv.cpp:401 -#: src/X509v3CertificateExtensions_Priv.cpp:457 +#: src/X509v3CertificateExtensions_Priv.cpp:402 +#: src/X509v3CertificateExtensions_Priv.cpp:459 #: src/X509v3RequestExtensions_Priv.cpp:141 #: src/X509v3RequestExtensions_Priv.cpp:196 msgid "Unable to parse the certificate (NID: %1 Crit: %2)." msgstr "No es posible analizar el certificado (NID: %1 CrÃt.: %2)." -#: src/X509v3CertificateExtensions_Priv.cpp:509 -#: src/X509v3CertificateExtensions_Priv.cpp:575 -#: src/X509v3CertificateExtensions_Priv.cpp:639 -#: src/X509v3CertificateExtensions_Priv.cpp:701 -#: src/X509v3CertificateExtensions_Priv.cpp:771 -#: src/X509v3CertificateExtensions_Priv.cpp:840 -#: src/X509v3CertificateExtensions_Priv.cpp:916 -#: src/X509v3CertificateExtensions_Priv.cpp:1002 +#: src/X509v3CertificateExtensions_Priv.cpp:511 +#: src/X509v3CertificateExtensions_Priv.cpp:577 +#: src/X509v3CertificateExtensions_Priv.cpp:641 +#: src/X509v3CertificateExtensions_Priv.cpp:703 +#: src/X509v3CertificateExtensions_Priv.cpp:773 +#: src/X509v3CertificateExtensions_Priv.cpp:842 +#: src/X509v3CertificateExtensions_Priv.cpp:918 +#: src/X509v3CertificateExtensions_Priv.cpp:1004 #: src/X509v3CRLExtensions_Priv.cpp:135 #: src/X509v3RequestExtensions_Priv.cpp:249 #: src/X509v3RequestExtensions_Priv.cpp:315 @@ -772,14 +791,14 @@ msgid "Extension occurred more than once." msgstr "La extensiÃ³n se ha producido mÃ¡s de una vez." -#: src/X509v3CertificateExtensions_Priv.cpp:514 -#: src/X509v3CertificateExtensions_Priv.cpp:580 -#: src/X509v3CertificateExtensions_Priv.cpp:644 -#: src/X509v3CertificateExtensions_Priv.cpp:707 -#: src/X509v3CertificateExtensions_Priv.cpp:776 -#: src/X509v3CertificateExtensions_Priv.cpp:846 -#: src/X509v3CertificateExtensions_Priv.cpp:921 -#: src/X509v3CertificateExtensions_Priv.cpp:1007 +#: src/X509v3CertificateExtensions_Priv.cpp:516 +#: src/X509v3CertificateExtensions_Priv.cpp:582 +#: src/X509v3CertificateExtensions_Priv.cpp:646 +#: src/X509v3CertificateExtensions_Priv.cpp:709 +#: src/X509v3CertificateExtensions_Priv.cpp:778 +#: src/X509v3CertificateExtensions_Priv.cpp:848 +#: src/X509v3CertificateExtensions_Priv.cpp:923 +#: src/X509v3CertificateExtensions_Priv.cpp:1009 #: src/X509v3CRLExtensions_Priv.cpp:140 #: src/X509v3RequestExtensions_Priv.cpp:254 #: src/X509v3RequestExtensions_Priv.cpp:320 @@ -788,7 +807,7 @@ msgid "Unable to parse the certificate (Crit: %1)." msgstr "No es posible analizar el certificado (CrÃt.: %1)." -#: src/X509v3CertificateExtensions_Priv.cpp:941 +#: src/X509v3CertificateExtensions_Priv.cpp:943 msgid "Invalid location in authorityInfoAccess." msgstr "UbicaciÃ³n incorrecta en authorityInfoAccess." @@ -919,3 +938,6 @@ #: src/X509v3RequestExtensions.cpp:231 msgid "Invalid value for X509v3RequestExts::setSubjectAlternativeName." msgstr "Valor de X509v3RequestExts::setSubjectAlternativeName incorrecto." + +#~ msgid "Command returned '%1' : %2" +#~ msgstr "Comando devuelto %1: %2" Modified: limal-head/limal-ca-mgm/po/et.po URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/po/et.po?rev=… ============================================================================== --- limal-head/limal-ca-mgm/po/et.po (original) +++ limal-head/limal-ca-mgm/po/et.po Mon Oct 29 11:30:37 2007 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: limal-ca-mgm.et\n" "Report-Msgid-Bugs-To: translation(a)suse.de\n" -"POT-Creation-Date: 2007-09-28 16:31+0200\n" +"POT-Creation-Date: 2007-10-29 11:25+0100\n" "PO-Revision-Date: 2007-07-30 18:12+0300\n" "Last-Translator: Ain Vagula <avagula(a)gmail.com>\n" "Language-Team: Estonian <linux-ee(a)lists.eenet.ee>\n" @@ -30,8 +30,8 @@ #: src/AuthorityInfoAccessExtension.cpp:259 #: src/AuthorityInfoAccessExtension.cpp:342 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:87 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:194 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:86 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:193 #: src/BasicConstraintsExtension.cpp:84 src/BasicConstraintsExtension.cpp:187 #: src/BitExtensions.cpp:134 src/BitExtensions.cpp:247 #: src/BitExtensions.cpp:374 src/BitExtensions.cpp:482 src/CA.cpp:1565 @@ -78,12 +78,12 @@ msgid "AuthorityKeyIdentifierExt is not present." msgstr "" -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:155 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:174 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:154 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:173 msgid "AuthorityKeyIdentifierGenerateExt is not present." msgstr "" -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:186 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:185 msgid "Invalid AuthorityKeyIdentifierGenerateExt object." msgstr "" @@ -203,7 +203,7 @@ msgid "Duplicate DN. Request already exists." msgstr "" -#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:968 +#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:1007 msgid "Cannot parse the certificate name." msgstr "Sertifikaadi nime ei saa parsida." @@ -536,93 +536,112 @@ msgid "Invalid command %1." msgstr "Vigane kÃ¤sk %1." -#: src/OpenSSLUtils.cpp:138 src/OpenSSLUtils.cpp:241 src/OpenSSLUtils.cpp:334 -#: src/OpenSSLUtils.cpp:453 src/OpenSSLUtils.cpp:586 src/OpenSSLUtils.cpp:681 -#: src/OpenSSLUtils.cpp:761 -msgid "Command returned '%1' : %2" -msgstr "KÃ¤sk tagastas '%1' : %2" +#: src/OpenSSLUtils.cpp:132 src/OpenSSLUtils.cpp:240 src/OpenSSLUtils.cpp:338 +#: src/OpenSSLUtils.cpp:462 src/OpenSSLUtils.cpp:600 src/OpenSSLUtils.cpp:700 +#: src/OpenSSLUtils.cpp:782 src/OpenSSLUtils.cpp:871 src/OpenSSLUtils.cpp:952 +#: src/OpenSSLUtils.cpp:1051 src/OpenSSLUtils.cpp:1137 +#: src/OpenSSLUtils.cpp:1271 src/OpenSSLUtils.cpp:1390 +#: src/OpenSSLUtils.cpp:1493 src/OpenSSLUtils.cpp:1645 +#: src/OpenSSLUtils.cpp:1782 +msgid "Executing openssl command failed." +msgstr "" + +#: src/OpenSSLUtils.cpp:143 src/OpenSSLUtils.cpp:251 src/OpenSSLUtils.cpp:349 +#: src/OpenSSLUtils.cpp:473 src/OpenSSLUtils.cpp:611 src/OpenSSLUtils.cpp:711 +#: src/OpenSSLUtils.cpp:796 src/OpenSSLUtils.cpp:1162 +#: src/OpenSSLUtils.cpp:1311 src/OpenSSLUtils.cpp:1415 +#: src/OpenSSLUtils.cpp:1518 src/OpenSSLUtils.cpp:1682 +#: src/OpenSSLUtils.cpp:1822 +msgid "openssl command failed: %1" +msgstr "" -#: src/OpenSSLUtils.cpp:171 src/OpenSSLUtils.cpp:268 src/OpenSSLUtils.cpp:366 -#: src/OpenSSLUtils.cpp:479 src/OpenSSLUtils.cpp:613 src/OpenSSLUtils.cpp:704 +#: src/OpenSSLUtils.cpp:176 src/OpenSSLUtils.cpp:278 src/OpenSSLUtils.cpp:381 +#: src/OpenSSLUtils.cpp:499 src/OpenSSLUtils.cpp:638 src/OpenSSLUtils.cpp:734 msgid "No valid key file specified." msgstr "" -#: src/OpenSSLUtils.cpp:276 src/OpenSSLUtils.cpp:374 +#: src/OpenSSLUtils.cpp:286 src/OpenSSLUtils.cpp:389 msgid "No valid request file specified." msgstr "" -#: src/OpenSSLUtils.cpp:487 src/OpenSSLUtils.cpp:621 src/OpenSSLUtils.cpp:712 +#: src/OpenSSLUtils.cpp:507 src/OpenSSLUtils.cpp:646 src/OpenSSLUtils.cpp:742 msgid "No valid CA certificate file specified." msgstr "" -#: src/OpenSSLUtils.cpp:495 src/OpenSSLUtils.cpp:785 +#: src/OpenSSLUtils.cpp:515 src/OpenSSLUtils.cpp:820 msgid "No valid certificate file specified." msgstr "" -#: src/OpenSSLUtils.cpp:793 +#: src/OpenSSLUtils.cpp:828 msgid "No valid CA directory specified." msgstr "" -#: src/OpenSSLUtils.cpp:943 +#: src/OpenSSLUtils.cpp:982 msgid "Showing certificate status with serial %1 failed (%2)." msgstr "" -#: src/OpenSSLUtils.cpp:979 +#: src/OpenSSLUtils.cpp:1018 msgid "The key file does not exist." msgstr "VÃµtmefaili pole olemas." -#: src/OpenSSLUtils.cpp:1474 +#: src/OpenSSLUtils.cpp:1306 src/OpenSSLUtils.cpp:1677 +#: src/OpenSSLUtils.cpp:1817 +#, fuzzy +msgid "Invalid password." +msgstr "Vigane SK parool." + +#: src/OpenSSLUtils.cpp:1595 msgid "The password for encrypting the output is required." msgstr "" -#: src/OpenSSLUtils.cpp:1579 +#: src/OpenSSLUtils.cpp:1736 msgid "The PKCS12 password is required." msgstr "Vajalik on PKCS12 parool." -#: src/OpenSSLUtils.cpp:1665 src/OpenSSLUtils.cpp:1865 -#: src/OpenSSLUtils.cpp:2017 +#: src/OpenSSLUtils.cpp:1847 src/OpenSSLUtils.cpp:2047 +#: src/OpenSSLUtils.cpp:2199 msgid "Cannot read directory: %1 (%2) [%3]." msgstr "Kataloogi ei saa lugeda: %1 (%2) [%3]." -#: src/OpenSSLUtils.cpp:1715 +#: src/OpenSSLUtils.cpp:1897 msgid "No serial number found in %1." msgstr "Asukohast %1 ei leitud seerianumbrit." -#: src/OpenSSLUtils.cpp:1735 +#: src/OpenSSLUtils.cpp:1917 msgid "The request already exists." msgstr "PÃ¤ring on juba olemas." -#: src/OpenSSLUtils.cpp:1926 +#: src/OpenSSLUtils.cpp:2108 msgid "Cannot find the request subject." msgstr "PÃ¤ringu subjekti ei leitud." -#: src/OpenSSLUtils.cpp:2087 +#: src/OpenSSLUtils.cpp:2269 msgid "Cannot find the certificate subject." msgstr "Sertifikaadi subjekti ei leitud." -#: src/OpenSSLUtils.cpp:2186 +#: src/OpenSSLUtils.cpp:2368 msgid "Invalid caName: %1." msgstr "Vigane caName: %1." -#: src/OpenSSLUtils.cpp:2195 +#: src/OpenSSLUtils.cpp:2377 msgid "'%1' does not exist." msgstr "'%1' pole olemas." -#: src/OpenSSLUtils.cpp:2205 +#: src/OpenSSLUtils.cpp:2387 msgid "%1 still exists." msgstr "%1 on olemas." -#: src/OpenSSLUtils.cpp:2216 src/OpenSSLUtils.cpp:2264 -#: src/OpenSSLUtils.cpp:2278 src/OpenSSLUtils.cpp:2292 -#: src/OpenSSLUtils.cpp:2306 src/OpenSSLUtils.cpp:2320 +#: src/OpenSSLUtils.cpp:2398 src/OpenSSLUtils.cpp:2446 +#: src/OpenSSLUtils.cpp:2460 src/OpenSSLUtils.cpp:2474 +#: src/OpenSSLUtils.cpp:2488 src/OpenSSLUtils.cpp:2502 msgid "Cannot create directory: %1 (%2 [%3])." msgstr "Ei saa luua kataloogi: %1 (%2 [%3])." -#: src/OpenSSLUtils.cpp:2251 +#: src/OpenSSLUtils.cpp:2433 msgid "Cannot copy the configuration template." msgstr "HÃ¤Ã¤lestuse malli pole vÃµimalik kopeerida." -#: src/OpenSSLUtils.cpp:2338 +#: src/OpenSSLUtils.cpp:2520 msgid "Cannot create the file." msgstr "Faili ei sa luua." @@ -741,28 +760,28 @@ msgid "Invalid SubjectKeyIdentifierExt object." msgstr "Vigane SubjectKeyIdentifierExt objekt." -#: src/X509v3CertificateExtensions_Priv.cpp:394 -#: src/X509v3CertificateExtensions_Priv.cpp:450 +#: src/X509v3CertificateExtensions_Priv.cpp:395 +#: src/X509v3CertificateExtensions_Priv.cpp:452 #: src/X509v3RequestExtensions_Priv.cpp:134 #: src/X509v3RequestExtensions_Priv.cpp:189 msgid "Extension occurred more than once: %1." msgstr "" -#: src/X509v3CertificateExtensions_Priv.cpp:401 -#: src/X509v3CertificateExtensions_Priv.cpp:457 +#: src/X509v3CertificateExtensions_Priv.cpp:402 +#: src/X509v3CertificateExtensions_Priv.cpp:459 #: src/X509v3RequestExtensions_Priv.cpp:141 #: src/X509v3RequestExtensions_Priv.cpp:196 msgid "Unable to parse the certificate (NID: %1 Crit: %2)." msgstr "Sertifikaati pole vÃµimalik parsida (NID: %1 Crit: %2)." -#: src/X509v3CertificateExtensions_Priv.cpp:509 -#: src/X509v3CertificateExtensions_Priv.cpp:575 -#: src/X509v3CertificateExtensions_Priv.cpp:639 -#: src/X509v3CertificateExtensions_Priv.cpp:701 -#: src/X509v3CertificateExtensions_Priv.cpp:771 -#: src/X509v3CertificateExtensions_Priv.cpp:840 -#: src/X509v3CertificateExtensions_Priv.cpp:916 -#: src/X509v3CertificateExtensions_Priv.cpp:1002 +#: src/X509v3CertificateExtensions_Priv.cpp:511 +#: src/X509v3CertificateExtensions_Priv.cpp:577 +#: src/X509v3CertificateExtensions_Priv.cpp:641 +#: src/X509v3CertificateExtensions_Priv.cpp:703 +#: src/X509v3CertificateExtensions_Priv.cpp:773 +#: src/X509v3CertificateExtensions_Priv.cpp:842 +#: src/X509v3CertificateExtensions_Priv.cpp:918 +#: src/X509v3CertificateExtensions_Priv.cpp:1004 #: src/X509v3CRLExtensions_Priv.cpp:135 #: src/X509v3RequestExtensions_Priv.cpp:249 #: src/X509v3RequestExtensions_Priv.cpp:315 @@ -771,14 +790,14 @@ msgid "Extension occurred more than once." msgstr "" -#: src/X509v3CertificateExtensions_Priv.cpp:514 -#: src/X509v3CertificateExtensions_Priv.cpp:580 -#: src/X509v3CertificateExtensions_Priv.cpp:644 -#: src/X509v3CertificateExtensions_Priv.cpp:707 -#: src/X509v3CertificateExtensions_Priv.cpp:776 -#: src/X509v3CertificateExtensions_Priv.cpp:846 -#: src/X509v3CertificateExtensions_Priv.cpp:921 -#: src/X509v3CertificateExtensions_Priv.cpp:1007 +#: src/X509v3CertificateExtensions_Priv.cpp:516 +#: src/X509v3CertificateExtensions_Priv.cpp:582 +#: src/X509v3CertificateExtensions_Priv.cpp:646 +#: src/X509v3CertificateExtensions_Priv.cpp:709 +#: src/X509v3CertificateExtensions_Priv.cpp:778 +#: src/X509v3CertificateExtensions_Priv.cpp:848 +#: src/X509v3CertificateExtensions_Priv.cpp:923 +#: src/X509v3CertificateExtensions_Priv.cpp:1009 #: src/X509v3CRLExtensions_Priv.cpp:140 #: src/X509v3RequestExtensions_Priv.cpp:254 #: src/X509v3RequestExtensions_Priv.cpp:320 @@ -787,7 +806,7 @@ msgid "Unable to parse the certificate (Crit: %1)." msgstr "Sertifikaati pole vÃµimalik parsida (Crit: %1)." -#: src/X509v3CertificateExtensions_Priv.cpp:941 +#: src/X509v3CertificateExtensions_Priv.cpp:943 msgid "Invalid location in authorityInfoAccess." msgstr "" @@ -910,3 +929,6 @@ #: src/X509v3RequestExtensions.cpp:231 msgid "Invalid value for X509v3RequestExts::setSubjectAlternativeName." msgstr "Vigane X509v3RequestExts::setSubjectAlternativeName vÃ¤Ã¤rtus." + +#~ msgid "Command returned '%1' : %2" +#~ msgstr "KÃ¤sk tagastas '%1' : %2" Modified: limal-head/limal-ca-mgm/po/fi.po URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/po/fi.po?rev=… ============================================================================== --- limal-head/limal-ca-mgm/po/fi.po (original) +++ limal-head/limal-ca-mgm/po/fi.po Mon Oct 29 11:30:37 2007 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: limal-ca-mgm.fi\n" "Report-Msgid-Bugs-To: translation(a)suse.de\n" -"POT-Creation-Date: 2007-09-28 16:31+0200\n" +"POT-Creation-Date: 2007-10-29 11:25+0100\n" "PO-Revision-Date: 2007-09-12 21:14+0300\n" "Last-Translator: Jyri Palokangas <jmp(a)opensuse.fi>\n" "Language-Team: Suomi <fi(a)li.org>\n" @@ -32,8 +32,8 @@ #: src/AuthorityInfoAccessExtension.cpp:259 #: src/AuthorityInfoAccessExtension.cpp:342 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:87 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:194 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:86 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:193 #: src/BasicConstraintsExtension.cpp:84 src/BasicConstraintsExtension.cpp:187 #: src/BitExtensions.cpp:134 src/BitExtensions.cpp:247 #: src/BitExtensions.cpp:374 src/BitExtensions.cpp:482 src/CA.cpp:1565 @@ -80,12 +80,12 @@ msgid "AuthorityKeyIdentifierExt is not present." msgstr "AuthorityKeyIdentifierExt:ia ei lÃ¶ydetty." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:155 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:174 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:154 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:173 msgid "AuthorityKeyIdentifierGenerateExt is not present." msgstr "AuthorityKeyIdentifierGenerateExt:ia ei lÃ¶ydetty." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:186 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:185 msgid "Invalid AuthorityKeyIdentifierGenerateExt object." msgstr "Virheellinen AuthorityKeyIdentifierGenerateExt objekti." @@ -205,7 +205,7 @@ msgid "Duplicate DN. Request already exists." msgstr "Duplikaatti DN. PyyntÃ¶ on jo olemassa." -#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:968 +#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:1007 msgid "Cannot parse the certificate name." msgstr "Ei voitu koostaa varmenteen nimeÃ¤." @@ -544,93 +544,112 @@ msgid "Invalid command %1." msgstr "Virheellinen komento %1." -#: src/OpenSSLUtils.cpp:138 src/OpenSSLUtils.cpp:241 src/OpenSSLUtils.cpp:334 -#: src/OpenSSLUtils.cpp:453 src/OpenSSLUtils.cpp:586 src/OpenSSLUtils.cpp:681 -#: src/OpenSSLUtils.cpp:761 -msgid "Command returned '%1' : %2" -msgstr "Komento palautti '%1' : %2" +#: src/OpenSSLUtils.cpp:132 src/OpenSSLUtils.cpp:240 src/OpenSSLUtils.cpp:338 +#: src/OpenSSLUtils.cpp:462 src/OpenSSLUtils.cpp:600 src/OpenSSLUtils.cpp:700 +#: src/OpenSSLUtils.cpp:782 src/OpenSSLUtils.cpp:871 src/OpenSSLUtils.cpp:952 +#: src/OpenSSLUtils.cpp:1051 src/OpenSSLUtils.cpp:1137 +#: src/OpenSSLUtils.cpp:1271 src/OpenSSLUtils.cpp:1390 +#: src/OpenSSLUtils.cpp:1493 src/OpenSSLUtils.cpp:1645 +#: src/OpenSSLUtils.cpp:1782 +msgid "Executing openssl command failed." +msgstr "" + +#: src/OpenSSLUtils.cpp:143 src/OpenSSLUtils.cpp:251 src/OpenSSLUtils.cpp:349 +#: src/OpenSSLUtils.cpp:473 src/OpenSSLUtils.cpp:611 src/OpenSSLUtils.cpp:711 +#: src/OpenSSLUtils.cpp:796 src/OpenSSLUtils.cpp:1162 +#: src/OpenSSLUtils.cpp:1311 src/OpenSSLUtils.cpp:1415 +#: src/OpenSSLUtils.cpp:1518 src/OpenSSLUtils.cpp:1682 +#: src/OpenSSLUtils.cpp:1822 +msgid "openssl command failed: %1" +msgstr "" -#: src/OpenSSLUtils.cpp:171 src/OpenSSLUtils.cpp:268 src/OpenSSLUtils.cpp:366 -#: src/OpenSSLUtils.cpp:479 src/OpenSSLUtils.cpp:613 src/OpenSSLUtils.cpp:704 +#: src/OpenSSLUtils.cpp:176 src/OpenSSLUtils.cpp:278 src/OpenSSLUtils.cpp:381 +#: src/OpenSSLUtils.cpp:499 src/OpenSSLUtils.cpp:638 src/OpenSSLUtils.cpp:734 msgid "No valid key file specified." msgstr "Kelvollista avain -tiedostoa ei ole mÃ¤Ã¤ritetty." -#: src/OpenSSLUtils.cpp:276 src/OpenSSLUtils.cpp:374 +#: src/OpenSSLUtils.cpp:286 src/OpenSSLUtils.cpp:389 msgid "No valid request file specified." msgstr "Kelvollista pyyntÃ¶ -tiedostoa ei ole mÃ¤Ã¤ritetty." -#: src/OpenSSLUtils.cpp:487 src/OpenSSLUtils.cpp:621 src/OpenSSLUtils.cpp:712 +#: src/OpenSSLUtils.cpp:507 src/OpenSSLUtils.cpp:646 src/OpenSSLUtils.cpp:742 msgid "No valid CA certificate file specified." msgstr "Kelvollista CA-varmennetiedostoa ei ole mÃ¤Ã¤ritetty." -#: src/OpenSSLUtils.cpp:495 src/OpenSSLUtils.cpp:785 +#: src/OpenSSLUtils.cpp:515 src/OpenSSLUtils.cpp:820 msgid "No valid certificate file specified." msgstr "Kelvollista varmennetiedostoa ei ole mÃ¤Ã¤ritetty." -#: src/OpenSSLUtils.cpp:793 +#: src/OpenSSLUtils.cpp:828 msgid "No valid CA directory specified." msgstr "Kelvollista CA-hakemistoa ei ole mÃ¤Ã¤ritetty." -#: src/OpenSSLUtils.cpp:943 +#: src/OpenSSLUtils.cpp:982 msgid "Showing certificate status with serial %1 failed (%2)." msgstr "Varmenteen tilan nÃ¤yttÃ¤minen sarjalla (serial) %1 epÃ¤onnistui (%2)." -#: src/OpenSSLUtils.cpp:979 +#: src/OpenSSLUtils.cpp:1018 msgid "The key file does not exist." msgstr "Avaintiedostoa ei ole olemassa." -#: src/OpenSSLUtils.cpp:1474 +#: src/OpenSSLUtils.cpp:1306 src/OpenSSLUtils.cpp:1677 +#: src/OpenSSLUtils.cpp:1817 +#, fuzzy +msgid "Invalid password." +msgstr "VÃ¤Ã¤rÃ¤ CA-salasana" + +#: src/OpenSSLUtils.cpp:1595 msgid "The password for encrypting the output is required." msgstr "Tulosteen salaamisen salasana on pakollinen." -#: src/OpenSSLUtils.cpp:1579 +#: src/OpenSSLUtils.cpp:1736 msgid "The PKCS12 password is required." msgstr "PKCS12-salasana on pakollinen." -#: src/OpenSSLUtils.cpp:1665 src/OpenSSLUtils.cpp:1865 -#: src/OpenSSLUtils.cpp:2017 +#: src/OpenSSLUtils.cpp:1847 src/OpenSSLUtils.cpp:2047 +#: src/OpenSSLUtils.cpp:2199 msgid "Cannot read directory: %1 (%2) [%3]." msgstr "Hakemistoa ei voi lukea: %1 (%2) [%3]." -#: src/OpenSSLUtils.cpp:1715 +#: src/OpenSSLUtils.cpp:1897 msgid "No serial number found in %1." msgstr "Sarjanumeroa ei lÃ¶ydetty kohteesta %1." -#: src/OpenSSLUtils.cpp:1735 +#: src/OpenSSLUtils.cpp:1917 msgid "The request already exists." msgstr "PyyntÃ¶ on jo olemassa." -#: src/OpenSSLUtils.cpp:1926 +#: src/OpenSSLUtils.cpp:2108 msgid "Cannot find the request subject." msgstr "PyyntÃ¶aihetta (request subject) ei lÃ¶ydy." -#: src/OpenSSLUtils.cpp:2087 +#: src/OpenSSLUtils.cpp:2269 msgid "Cannot find the certificate subject." msgstr "Varmenneaihetta (certificate subject) ei lÃ¶ydy ." -#: src/OpenSSLUtils.cpp:2186 +#: src/OpenSSLUtils.cpp:2368 msgid "Invalid caName: %1." msgstr "Virheellinen caName: %1." -#: src/OpenSSLUtils.cpp:2195 +#: src/OpenSSLUtils.cpp:2377 msgid "'%1' does not exist." msgstr "'%1' ei ole olemassa." -#: src/OpenSSLUtils.cpp:2205 +#: src/OpenSSLUtils.cpp:2387 msgid "%1 still exists." msgstr "%1 on yhÃ¤ olemassa." -#: src/OpenSSLUtils.cpp:2216 src/OpenSSLUtils.cpp:2264 -#: src/OpenSSLUtils.cpp:2278 src/OpenSSLUtils.cpp:2292 -#: src/OpenSSLUtils.cpp:2306 src/OpenSSLUtils.cpp:2320 +#: src/OpenSSLUtils.cpp:2398 src/OpenSSLUtils.cpp:2446 +#: src/OpenSSLUtils.cpp:2460 src/OpenSSLUtils.cpp:2474 +#: src/OpenSSLUtils.cpp:2488 src/OpenSSLUtils.cpp:2502 msgid "Cannot create directory: %1 (%2 [%3])." msgstr "Hakemistoa ei voi luoda: %1 (%2 [%3])." -#: src/OpenSSLUtils.cpp:2251 +#: src/OpenSSLUtils.cpp:2433 msgid "Cannot copy the configuration template." msgstr "MÃ¤Ã¤ritysmallia ei voi kopioida." -#: src/OpenSSLUtils.cpp:2338 +#: src/OpenSSLUtils.cpp:2520 msgid "Cannot create the file." msgstr "Tiedostoa ei voi luoda." @@ -749,28 +768,28 @@ msgid "Invalid SubjectKeyIdentifierExt object." msgstr "Virheellinen SubjectKeyIdentifierExt-objekti." -#: src/X509v3CertificateExtensions_Priv.cpp:394 -#: src/X509v3CertificateExtensions_Priv.cpp:450 +#: src/X509v3CertificateExtensions_Priv.cpp:395 +#: src/X509v3CertificateExtensions_Priv.cpp:452 #: src/X509v3RequestExtensions_Priv.cpp:134 #: src/X509v3RequestExtensions_Priv.cpp:189 msgid "Extension occurred more than once: %1." msgstr "Laajennus ilmeni useita kertoja: %1." -#: src/X509v3CertificateExtensions_Priv.cpp:401 -#: src/X509v3CertificateExtensions_Priv.cpp:457 +#: src/X509v3CertificateExtensions_Priv.cpp:402 +#: src/X509v3CertificateExtensions_Priv.cpp:459 #: src/X509v3RequestExtensions_Priv.cpp:141 #: src/X509v3RequestExtensions_Priv.cpp:196 msgid "Unable to parse the certificate (NID: %1 Crit: %2)." msgstr "Varmennetta ei voi jÃ¤sentÃ¤Ã¤ (NID: %1 Krit: %2)." -#: src/X509v3CertificateExtensions_Priv.cpp:509 -#: src/X509v3CertificateExtensions_Priv.cpp:575 -#: src/X509v3CertificateExtensions_Priv.cpp:639 -#: src/X509v3CertificateExtensions_Priv.cpp:701 -#: src/X509v3CertificateExtensions_Priv.cpp:771 -#: src/X509v3CertificateExtensions_Priv.cpp:840 -#: src/X509v3CertificateExtensions_Priv.cpp:916 -#: src/X509v3CertificateExtensions_Priv.cpp:1002 +#: src/X509v3CertificateExtensions_Priv.cpp:511 +#: src/X509v3CertificateExtensions_Priv.cpp:577 +#: src/X509v3CertificateExtensions_Priv.cpp:641 +#: src/X509v3CertificateExtensions_Priv.cpp:703 +#: src/X509v3CertificateExtensions_Priv.cpp:773 +#: src/X509v3CertificateExtensions_Priv.cpp:842 +#: src/X509v3CertificateExtensions_Priv.cpp:918 +#: src/X509v3CertificateExtensions_Priv.cpp:1004 #: src/X509v3CRLExtensions_Priv.cpp:135 #: src/X509v3RequestExtensions_Priv.cpp:249 #: src/X509v3RequestExtensions_Priv.cpp:315 @@ -779,14 +798,14 @@ msgid "Extension occurred more than once." msgstr "Laajennus ilmeni useita kertoja." -#: src/X509v3CertificateExtensions_Priv.cpp:514 -#: src/X509v3CertificateExtensions_Priv.cpp:580 -#: src/X509v3CertificateExtensions_Priv.cpp:644 -#: src/X509v3CertificateExtensions_Priv.cpp:707 -#: src/X509v3CertificateExtensions_Priv.cpp:776 -#: src/X509v3CertificateExtensions_Priv.cpp:846 -#: src/X509v3CertificateExtensions_Priv.cpp:921 -#: src/X509v3CertificateExtensions_Priv.cpp:1007 +#: src/X509v3CertificateExtensions_Priv.cpp:516 +#: src/X509v3CertificateExtensions_Priv.cpp:582 +#: src/X509v3CertificateExtensions_Priv.cpp:646 +#: src/X509v3CertificateExtensions_Priv.cpp:709 +#: src/X509v3CertificateExtensions_Priv.cpp:778 +#: src/X509v3CertificateExtensions_Priv.cpp:848 +#: src/X509v3CertificateExtensions_Priv.cpp:923 +#: src/X509v3CertificateExtensions_Priv.cpp:1009 #: src/X509v3CRLExtensions_Priv.cpp:140 #: src/X509v3RequestExtensions_Priv.cpp:254 #: src/X509v3RequestExtensions_Priv.cpp:320 @@ -795,7 +814,7 @@ msgid "Unable to parse the certificate (Crit: %1)." msgstr "Varmennetta ei voi jÃ¤sentÃ¤Ã¤ (Krit: %1)." -#: src/X509v3CertificateExtensions_Priv.cpp:941 +#: src/X509v3CertificateExtensions_Priv.cpp:943 msgid "Invalid location in authorityInfoAccess." msgstr "Virheellinen sijainti kohteessa authorityInfoAccess." @@ -922,3 +941,6 @@ #: src/X509v3RequestExtensions.cpp:231 msgid "Invalid value for X509v3RequestExts::setSubjectAlternativeName." msgstr "Virheellinen X509v3RequestExts::setSubjectAlternativeName-arvo." + +#~ msgid "Command returned '%1' : %2" +#~ msgstr "Komento palautti '%1' : %2" Modified: limal-head/limal-ca-mgm/po/fr.po URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/po/fr.po?rev=… ============================================================================== --- limal-head/limal-ca-mgm/po/fr.po (original) +++ limal-head/limal-ca-mgm/po/fr.po Mon Oct 29 11:30:37 2007 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: limal-ca-mgm\n" "Report-Msgid-Bugs-To: translation(a)suse.de\n" -"POT-Creation-Date: 2007-09-28 16:31+0200\n" +"POT-Creation-Date: 2007-10-29 11:25+0100\n" "PO-Revision-Date: 2006-11-02 14:16\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" @@ -25,8 +25,8 @@ #: src/AuthorityInfoAccessExtension.cpp:259 #: src/AuthorityInfoAccessExtension.cpp:342 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:87 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:194 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:86 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:193 #: src/BasicConstraintsExtension.cpp:84 src/BasicConstraintsExtension.cpp:187 #: src/BitExtensions.cpp:134 src/BitExtensions.cpp:247 #: src/BitExtensions.cpp:374 src/BitExtensions.cpp:482 src/CA.cpp:1565 @@ -75,12 +75,12 @@ msgid "AuthorityKeyIdentifierExt is not present." msgstr "AuthorityKeyIdentifierExt absent." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:155 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:174 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:154 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:173 msgid "AuthorityKeyIdentifierGenerateExt is not present." msgstr "AuthorityKeyIdentifierGenerateExt absent." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:186 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:185 msgid "Invalid AuthorityKeyIdentifierGenerateExt object." msgstr "Objet AuthorityKeyIdentifierGenerateExt non valide." @@ -200,7 +200,7 @@ msgid "Duplicate DN. Request already exists." msgstr "Nom distinctif en double. La requÃªte existe dÃ©jÃ ." -#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:968 +#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:1007 msgid "Cannot parse the certificate name." msgstr "Impossible d'analyser le nom de certificat." @@ -537,94 +537,113 @@ msgid "Invalid command %1." msgstr "Commande %1 non valide." -#: src/OpenSSLUtils.cpp:138 src/OpenSSLUtils.cpp:241 src/OpenSSLUtils.cpp:334 -#: src/OpenSSLUtils.cpp:453 src/OpenSSLUtils.cpp:586 src/OpenSSLUtils.cpp:681 -#: src/OpenSSLUtils.cpp:761 -msgid "Command returned '%1' : %2" -msgstr "La commande a renvoyÃ© %1 : %2" +#: src/OpenSSLUtils.cpp:132 src/OpenSSLUtils.cpp:240 src/OpenSSLUtils.cpp:338 +#: src/OpenSSLUtils.cpp:462 src/OpenSSLUtils.cpp:600 src/OpenSSLUtils.cpp:700 +#: src/OpenSSLUtils.cpp:782 src/OpenSSLUtils.cpp:871 src/OpenSSLUtils.cpp:952 +#: src/OpenSSLUtils.cpp:1051 src/OpenSSLUtils.cpp:1137 +#: src/OpenSSLUtils.cpp:1271 src/OpenSSLUtils.cpp:1390 +#: src/OpenSSLUtils.cpp:1493 src/OpenSSLUtils.cpp:1645 +#: src/OpenSSLUtils.cpp:1782 +msgid "Executing openssl command failed." +msgstr "" + +#: src/OpenSSLUtils.cpp:143 src/OpenSSLUtils.cpp:251 src/OpenSSLUtils.cpp:349 +#: src/OpenSSLUtils.cpp:473 src/OpenSSLUtils.cpp:611 src/OpenSSLUtils.cpp:711 +#: src/OpenSSLUtils.cpp:796 src/OpenSSLUtils.cpp:1162 +#: src/OpenSSLUtils.cpp:1311 src/OpenSSLUtils.cpp:1415 +#: src/OpenSSLUtils.cpp:1518 src/OpenSSLUtils.cpp:1682 +#: src/OpenSSLUtils.cpp:1822 +msgid "openssl command failed: %1" +msgstr "" -#: src/OpenSSLUtils.cpp:171 src/OpenSSLUtils.cpp:268 src/OpenSSLUtils.cpp:366 -#: src/OpenSSLUtils.cpp:479 src/OpenSSLUtils.cpp:613 src/OpenSSLUtils.cpp:704 +#: src/OpenSSLUtils.cpp:176 src/OpenSSLUtils.cpp:278 src/OpenSSLUtils.cpp:381 +#: src/OpenSSLUtils.cpp:499 src/OpenSSLUtils.cpp:638 src/OpenSSLUtils.cpp:734 msgid "No valid key file specified." msgstr "Aucun fichier de clÃ© valide n'a Ã©tÃ© spÃ©cifiÃ©." -#: src/OpenSSLUtils.cpp:276 src/OpenSSLUtils.cpp:374 +#: src/OpenSSLUtils.cpp:286 src/OpenSSLUtils.cpp:389 msgid "No valid request file specified." msgstr "Aucun fichier de requÃªte valide n'a Ã©tÃ© spÃ©cifiÃ©." -#: src/OpenSSLUtils.cpp:487 src/OpenSSLUtils.cpp:621 src/OpenSSLUtils.cpp:712 +#: src/OpenSSLUtils.cpp:507 src/OpenSSLUtils.cpp:646 src/OpenSSLUtils.cpp:742 msgid "No valid CA certificate file specified." msgstr "Aucun fichier de certificat CA valide n'a Ã©tÃ© spÃ©cifiÃ©." -#: src/OpenSSLUtils.cpp:495 src/OpenSSLUtils.cpp:785 +#: src/OpenSSLUtils.cpp:515 src/OpenSSLUtils.cpp:820 msgid "No valid certificate file specified." msgstr "Aucun fichier de certificat valide n'a Ã©tÃ© spÃ©cifiÃ©." -#: src/OpenSSLUtils.cpp:793 +#: src/OpenSSLUtils.cpp:828 msgid "No valid CA directory specified." msgstr "Aucun rÃ©pertoire CA valide n'a Ã©tÃ© spÃ©cifiÃ©." -#: src/OpenSSLUtils.cpp:943 +#: src/OpenSSLUtils.cpp:982 msgid "Showing certificate status with serial %1 failed (%2)." msgstr "" "Ãchec d'affichage de l'Ã©tat du certificat avec le numÃ©ro de sÃ©rie %1 (%2)." -#: src/OpenSSLUtils.cpp:979 +#: src/OpenSSLUtils.cpp:1018 msgid "The key file does not exist." msgstr "Le fichier de clÃ© n'existe pas." -#: src/OpenSSLUtils.cpp:1474 +#: src/OpenSSLUtils.cpp:1306 src/OpenSSLUtils.cpp:1677 +#: src/OpenSSLUtils.cpp:1817 +#, fuzzy +msgid "Invalid password." +msgstr "Mot de passe CA non valide." + +#: src/OpenSSLUtils.cpp:1595 msgid "The password for encrypting the output is required." msgstr "Le mot de passe pour coder la sortie est requis." -#: src/OpenSSLUtils.cpp:1579 +#: src/OpenSSLUtils.cpp:1736 msgid "The PKCS12 password is required." msgstr "Le mot de passe PKCS12 est requis." -#: src/OpenSSLUtils.cpp:1665 src/OpenSSLUtils.cpp:1865 -#: src/OpenSSLUtils.cpp:2017 +#: src/OpenSSLUtils.cpp:1847 src/OpenSSLUtils.cpp:2047 +#: src/OpenSSLUtils.cpp:2199 msgid "Cannot read directory: %1 (%2) [%3]." msgstr "Impossible de lire le rÃ©pertoire : %1 (%2) [%3]." -#: src/OpenSSLUtils.cpp:1715 +#: src/OpenSSLUtils.cpp:1897 msgid "No serial number found in %1." msgstr "Aucun numÃ©ro de sÃ©rie n'a Ã©tÃ© trouvÃ© dans %1." -#: src/OpenSSLUtils.cpp:1735 +#: src/OpenSSLUtils.cpp:1917 msgid "The request already exists." msgstr "La requÃªte existe dÃ©jÃ ." -#: src/OpenSSLUtils.cpp:1926 +#: src/OpenSSLUtils.cpp:2108 msgid "Cannot find the request subject." msgstr "Le sujet de la requÃªte est introuvable." -#: src/OpenSSLUtils.cpp:2087 +#: src/OpenSSLUtils.cpp:2269 msgid "Cannot find the certificate subject." msgstr "Le sujet du certificat est introuvable." -#: src/OpenSSLUtils.cpp:2186 +#: src/OpenSSLUtils.cpp:2368 msgid "Invalid caName: %1." msgstr "caName non valide : %1." -#: src/OpenSSLUtils.cpp:2195 +#: src/OpenSSLUtils.cpp:2377 msgid "'%1' does not exist." msgstr "'%1' n'existe pas." -#: src/OpenSSLUtils.cpp:2205 +#: src/OpenSSLUtils.cpp:2387 msgid "%1 still exists." msgstr "%1 existe toujours." -#: src/OpenSSLUtils.cpp:2216 src/OpenSSLUtils.cpp:2264 -#: src/OpenSSLUtils.cpp:2278 src/OpenSSLUtils.cpp:2292 -#: src/OpenSSLUtils.cpp:2306 src/OpenSSLUtils.cpp:2320 +#: src/OpenSSLUtils.cpp:2398 src/OpenSSLUtils.cpp:2446 +#: src/OpenSSLUtils.cpp:2460 src/OpenSSLUtils.cpp:2474 +#: src/OpenSSLUtils.cpp:2488 src/OpenSSLUtils.cpp:2502 msgid "Cannot create directory: %1 (%2 [%3])." msgstr "Impossible de crÃ©er le rÃ©pertoire : %1 (%2 [%3])." -#: src/OpenSSLUtils.cpp:2251 +#: src/OpenSSLUtils.cpp:2433 msgid "Cannot copy the configuration template." msgstr "Impossible de crÃ©er le modÃ¨le de configuration." -#: src/OpenSSLUtils.cpp:2338 +#: src/OpenSSLUtils.cpp:2520 msgid "Cannot create the file." msgstr "Impossible de crÃ©er le fichier." @@ -743,28 +762,28 @@ msgid "Invalid SubjectKeyIdentifierExt object." msgstr "Objet SubjectKeyIdentifierExt non valide." -#: src/X509v3CertificateExtensions_Priv.cpp:394 -#: src/X509v3CertificateExtensions_Priv.cpp:450 +#: src/X509v3CertificateExtensions_Priv.cpp:395 +#: src/X509v3CertificateExtensions_Priv.cpp:452 #: src/X509v3RequestExtensions_Priv.cpp:134 #: src/X509v3RequestExtensions_Priv.cpp:189 msgid "Extension occurred more than once: %1." msgstr "Une extension s'est prÃ©sentÃ©e plusieurs fois : %1." -#: src/X509v3CertificateExtensions_Priv.cpp:401 -#: src/X509v3CertificateExtensions_Priv.cpp:457 +#: src/X509v3CertificateExtensions_Priv.cpp:402 +#: src/X509v3CertificateExtensions_Priv.cpp:459 #: src/X509v3RequestExtensions_Priv.cpp:141 #: src/X509v3RequestExtensions_Priv.cpp:196 msgid "Unable to parse the certificate (NID: %1 Crit: %2)." msgstr "Impossible d'analyser le certificat (NID : %1 Crit : %2)." -#: src/X509v3CertificateExtensions_Priv.cpp:509 -#: src/X509v3CertificateExtensions_Priv.cpp:575 -#: src/X509v3CertificateExtensions_Priv.cpp:639 -#: src/X509v3CertificateExtensions_Priv.cpp:701 -#: src/X509v3CertificateExtensions_Priv.cpp:771 -#: src/X509v3CertificateExtensions_Priv.cpp:840 -#: src/X509v3CertificateExtensions_Priv.cpp:916 -#: src/X509v3CertificateExtensions_Priv.cpp:1002 +#: src/X509v3CertificateExtensions_Priv.cpp:511 +#: src/X509v3CertificateExtensions_Priv.cpp:577 +#: src/X509v3CertificateExtensions_Priv.cpp:641 +#: src/X509v3CertificateExtensions_Priv.cpp:703 +#: src/X509v3CertificateExtensions_Priv.cpp:773 +#: src/X509v3CertificateExtensions_Priv.cpp:842 +#: src/X509v3CertificateExtensions_Priv.cpp:918 +#: src/X509v3CertificateExtensions_Priv.cpp:1004 #: src/X509v3CRLExtensions_Priv.cpp:135 #: src/X509v3RequestExtensions_Priv.cpp:249 #: src/X509v3RequestExtensions_Priv.cpp:315 @@ -773,14 +792,14 @@ msgid "Extension occurred more than once." msgstr "Une extension s'est prÃ©sentÃ©e plusieurs fois." -#: src/X509v3CertificateExtensions_Priv.cpp:514 -#: src/X509v3CertificateExtensions_Priv.cpp:580 -#: src/X509v3CertificateExtensions_Priv.cpp:644 -#: src/X509v3CertificateExtensions_Priv.cpp:707 -#: src/X509v3CertificateExtensions_Priv.cpp:776 -#: src/X509v3CertificateExtensions_Priv.cpp:846 -#: src/X509v3CertificateExtensions_Priv.cpp:921 -#: src/X509v3CertificateExtensions_Priv.cpp:1007 +#: src/X509v3CertificateExtensions_Priv.cpp:516 +#: src/X509v3CertificateExtensions_Priv.cpp:582 +#: src/X509v3CertificateExtensions_Priv.cpp:646 +#: src/X509v3CertificateExtensions_Priv.cpp:709 +#: src/X509v3CertificateExtensions_Priv.cpp:778 +#: src/X509v3CertificateExtensions_Priv.cpp:848 +#: src/X509v3CertificateExtensions_Priv.cpp:923 +#: src/X509v3CertificateExtensions_Priv.cpp:1009 #: src/X509v3CRLExtensions_Priv.cpp:140 #: src/X509v3RequestExtensions_Priv.cpp:254 #: src/X509v3RequestExtensions_Priv.cpp:320 @@ -789,7 +808,7 @@ msgid "Unable to parse the certificate (Crit: %1)." msgstr "Impossible d'analyser le certificat (Crit : %1)." -#: src/X509v3CertificateExtensions_Priv.cpp:941 +#: src/X509v3CertificateExtensions_Priv.cpp:943 msgid "Invalid location in authorityInfoAccess." msgstr "Emplacement non valide dans authorityInfoAccess." @@ -924,3 +943,6 @@ #: src/X509v3RequestExtensions.cpp:231 msgid "Invalid value for X509v3RequestExts::setSubjectAlternativeName." msgstr "Valeur non valide pour X509v3RequestExts::setSubjectAlternativeName." + +#~ msgid "Command returned '%1' : %2" +#~ msgstr "La commande a renvoyÃ© %1 : %2" Modified: limal-head/limal-ca-mgm/po/gu.po URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/po/gu.po?rev=… ============================================================================== --- limal-head/limal-ca-mgm/po/gu.po (original) +++ limal-head/limal-ca-mgm/po/gu.po Mon Oct 29 11:30:37 2007 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: nis\n" "Report-Msgid-Bugs-To: translation(a)suse.de\n" -"POT-Creation-Date: 2007-09-28 16:31+0200\n" +"POT-Creation-Date: 2007-10-29 11:25+0100\n" "PO-Revision-Date: 2006-11-11 18:41+0530\n" "Last-Translator: Priyavert Sharma<priyavert.sharma(a)agreeya.com>\n" "Language-Team: AgreeYa Solutions<linux_team(a)agreeya.com>\n" @@ -23,8 +23,8 @@ #: src/AuthorityInfoAccessExtension.cpp:259 #: src/AuthorityInfoAccessExtension.cpp:342 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:87 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:194 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:86 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:193 #: src/BasicConstraintsExtension.cpp:84 src/BasicConstraintsExtension.cpp:187 #: src/BitExtensions.cpp:134 src/BitExtensions.cpp:247 #: src/BitExtensions.cpp:374 src/BitExtensions.cpp:482 src/CA.cpp:1565 @@ -71,12 +71,12 @@ msgid "AuthorityKeyIdentifierExt is not present." msgstr "AuthorityKeyIdentifierExt àª®à«àªà«àª¦ àª¨àª¥à«." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:155 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:174 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:154 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:173 msgid "AuthorityKeyIdentifierGenerateExt is not present." msgstr "AuthorityKeyIdentifierGenerateExt àª®à«àªà«àª¦ àª¨àª¥à«." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:186 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:185 msgid "Invalid AuthorityKeyIdentifierGenerateExt object." msgstr "AuthorityKeyIdentifierGenerateExt àªàª¬àªà«àªà«àª àªàª®àª¾àª¨à«àª¯." @@ -196,7 +196,7 @@ msgid "Duplicate DN. Request already exists." msgstr "DN àª¸àª°àªà«àª àª àªà«. àª°àª¿àªà«àªµà«àª¸à«àª àªàª¸à«àª¤àª¿àª¤à«àªµàª®àª¾àª àªà« àª." -#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:968 +#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:1007 msgid "Cannot parse the certificate name." msgstr "àª¸àª°à«àªàª«à«àªà«àª àª¨àª¾àª® àªªàª¾àª°à«àª¸ àªàª°à« àª¶àªàª¾àª¯à«àª àª¨àª¹à«àª." @@ -533,93 +533,112 @@ msgid "Invalid command %1." msgstr "àªàª®àª¾àª¨à«àª¡ àªàª®àª¾àª¨à«àª¯ %1." -#: src/OpenSSLUtils.cpp:138 src/OpenSSLUtils.cpp:241 src/OpenSSLUtils.cpp:334 -#: src/OpenSSLUtils.cpp:453 src/OpenSSLUtils.cpp:586 src/OpenSSLUtils.cpp:681 -#: src/OpenSSLUtils.cpp:761 -msgid "Command returned '%1' : %2" -msgstr "àªàª®àª¾àª¨à«àª¡ àªªàª¾àªà«àª àªàªªà« àªà« '%1' : %2" +#: src/OpenSSLUtils.cpp:132 src/OpenSSLUtils.cpp:240 src/OpenSSLUtils.cpp:338 +#: src/OpenSSLUtils.cpp:462 src/OpenSSLUtils.cpp:600 src/OpenSSLUtils.cpp:700 +#: src/OpenSSLUtils.cpp:782 src/OpenSSLUtils.cpp:871 src/OpenSSLUtils.cpp:952 +#: src/OpenSSLUtils.cpp:1051 src/OpenSSLUtils.cpp:1137 +#: src/OpenSSLUtils.cpp:1271 src/OpenSSLUtils.cpp:1390 +#: src/OpenSSLUtils.cpp:1493 src/OpenSSLUtils.cpp:1645 +#: src/OpenSSLUtils.cpp:1782 +msgid "Executing openssl command failed." +msgstr "" + +#: src/OpenSSLUtils.cpp:143 src/OpenSSLUtils.cpp:251 src/OpenSSLUtils.cpp:349 +#: src/OpenSSLUtils.cpp:473 src/OpenSSLUtils.cpp:611 src/OpenSSLUtils.cpp:711 +#: src/OpenSSLUtils.cpp:796 src/OpenSSLUtils.cpp:1162 +#: src/OpenSSLUtils.cpp:1311 src/OpenSSLUtils.cpp:1415 +#: src/OpenSSLUtils.cpp:1518 src/OpenSSLUtils.cpp:1682 +#: src/OpenSSLUtils.cpp:1822 +msgid "openssl command failed: %1" +msgstr "" -#: src/OpenSSLUtils.cpp:171 src/OpenSSLUtils.cpp:268 src/OpenSSLUtils.cpp:366 -#: src/OpenSSLUtils.cpp:479 src/OpenSSLUtils.cpp:613 src/OpenSSLUtils.cpp:704 +#: src/OpenSSLUtils.cpp:176 src/OpenSSLUtils.cpp:278 src/OpenSSLUtils.cpp:381 +#: src/OpenSSLUtils.cpp:499 src/OpenSSLUtils.cpp:638 src/OpenSSLUtils.cpp:734 msgid "No valid key file specified." msgstr "àªà«àª àª®àª¾àª¨à«àª¯ àªà« àª«àª¾àªàª² àªàª£àª¾àªµàª¾àª àª¨àª¥à«." -#: src/OpenSSLUtils.cpp:276 src/OpenSSLUtils.cpp:374 +#: src/OpenSSLUtils.cpp:286 src/OpenSSLUtils.cpp:389 msgid "No valid request file specified." msgstr "àªà«àª àª®àª¾àª¨à«àª¯ àª°àª¿àªà«àªµà«àª¸à«àª àª«àª¾àªàª² àªàª£àª¾àªµàª¾àª àª¨àª¥à«." -#: src/OpenSSLUtils.cpp:487 src/OpenSSLUtils.cpp:621 src/OpenSSLUtils.cpp:712 +#: src/OpenSSLUtils.cpp:507 src/OpenSSLUtils.cpp:646 src/OpenSSLUtils.cpp:742 msgid "No valid CA certificate file specified." msgstr "àªà«àª àª®àª¾àª¨à«àª¯ CA àª¸àª°à«àªàª¿àª«à«àªà«àª àª«àª¾àªàª² àªàª£àª¾àªµàª¾àª àª¨àª¥à«." -#: src/OpenSSLUtils.cpp:495 src/OpenSSLUtils.cpp:785 +#: src/OpenSSLUtils.cpp:515 src/OpenSSLUtils.cpp:820 msgid "No valid certificate file specified." msgstr "àªà«àª àª®àª¾àª¨à«àª¯ àª¸àª°à«àªàª¿àª«à«àªà«àª àª«àª¾àªàª² àªàª£àª¾àªµàª¾àª àª¨àª¥à«." -#: src/OpenSSLUtils.cpp:793 +#: src/OpenSSLUtils.cpp:828 msgid "No valid CA directory specified." msgstr "àªà«àª àª®àª¾àª¨à«àª¯ CA àª¡àª¿àª°à«àªà«àªàª°à« àªàª£àª¾àªµàª¾àª àª¨àª¥à«." -#: src/OpenSSLUtils.cpp:943 +#: src/OpenSSLUtils.cpp:982 msgid "Showing certificate status with serial %1 failed (%2)." msgstr "àª¸à«àª°à«àªàª² %1 àª¸àª¾àª¥à« àª¬àª¤àª¾àªµà«àª² àª¸à«àª¥àª¿àª¤àª¿ àª¨àª¿àª·à«àª«àª³(%2)." -#: src/OpenSSLUtils.cpp:979 +#: src/OpenSSLUtils.cpp:1018 msgid "The key file does not exist." msgstr "àªà« àª«àª¾àªàª² àªàª¸à«àª¤àª¿àª¤à«àªµàª®àª¾àª àª¨àª¥à«." -#: src/OpenSSLUtils.cpp:1474 +#: src/OpenSSLUtils.cpp:1306 src/OpenSSLUtils.cpp:1677 +#: src/OpenSSLUtils.cpp:1817 +#, fuzzy +msgid "Invalid password." +msgstr "CA àªªàª¾àª¸àªµàª°à«àª¡ àªàª®àª¾àª¨à«àª¯." + +#: src/OpenSSLUtils.cpp:1595 msgid "The password for encrypting the output is required." msgstr "àªàªàªàªªà«àª àªàª¨à«àªà«àª°à«àªªà«àª àªàª°àªµàª¾ àª®àª¾àªà« àªªàª¾àª¸àªµàª°à«àª¡ àªàª°à«àª°à« àªà«." -#: src/OpenSSLUtils.cpp:1579 +#: src/OpenSSLUtils.cpp:1736 msgid "The PKCS12 password is required." msgstr "PKCS12 àªªàª¾àª¸àªµàª°à«àª¡ àªàª°à«àª°à« àªà«." -#: src/OpenSSLUtils.cpp:1665 src/OpenSSLUtils.cpp:1865 -#: src/OpenSSLUtils.cpp:2017 +#: src/OpenSSLUtils.cpp:1847 src/OpenSSLUtils.cpp:2047 +#: src/OpenSSLUtils.cpp:2199 msgid "Cannot read directory: %1 (%2) [%3]." msgstr "àª¡àª¿àª°à«àªà«àªàª°à« àªµàª¾àªàªà« àª¶àªàª¾àª¤à« àª¨àª¥à«: %1 (%2) [%3]." -#: src/OpenSSLUtils.cpp:1715 +#: src/OpenSSLUtils.cpp:1897 msgid "No serial number found in %1." msgstr "àªà«àª àª¸à«àª°à«àªàª² àª¨àªàª¬àª° àª®àª³à«àª¯à« àª¨àª¥à« %1." -#: src/OpenSSLUtils.cpp:1735 +#: src/OpenSSLUtils.cpp:1917 msgid "The request already exists." msgstr "àª°àª¿àªà«àªµà«àª¸à«àª àªàª¸à«àª¤àª¿àª¤à«àªµàª®àª¾àª àªà« àª." -#: src/OpenSSLUtils.cpp:1926 +#: src/OpenSSLUtils.cpp:2108 msgid "Cannot find the request subject." msgstr "àª°àª¿àªà«àªµà«àª¸à«àª àªµàª¿àª·àª¯ àª®àª³à« àª¶àªàª¤à« àª¨àª¥à«." -#: src/OpenSSLUtils.cpp:2087 +#: src/OpenSSLUtils.cpp:2269 msgid "Cannot find the certificate subject." msgstr "àª¸àª°à«àªàª¿àª«à«àªà«àª àªµàª¿àª·àª¯ àª®àª³à« àª¶àªàª¤à« àª¨àª¥à«." -#: src/OpenSSLUtils.cpp:2186 +#: src/OpenSSLUtils.cpp:2368 msgid "Invalid caName: %1." msgstr "àªàª®àª¾àª¨à«àª¯ caName: %1." -#: src/OpenSSLUtils.cpp:2195 +#: src/OpenSSLUtils.cpp:2377 msgid "'%1' does not exist." msgstr "'%1' àªàª¸à«àª¤àª¿àª¤à«àªµ àª§àª°àª¾àªµàª¤à« àª¨àª¥à«." -#: src/OpenSSLUtils.cpp:2205 +#: src/OpenSSLUtils.cpp:2387 msgid "%1 still exists." msgstr "%1 àªàª¸à«àª¤àª¿àª¤à«àªµ àª§àª°àª¾àªµà« àªà«." -#: src/OpenSSLUtils.cpp:2216 src/OpenSSLUtils.cpp:2264 -#: src/OpenSSLUtils.cpp:2278 src/OpenSSLUtils.cpp:2292 -#: src/OpenSSLUtils.cpp:2306 src/OpenSSLUtils.cpp:2320 +#: src/OpenSSLUtils.cpp:2398 src/OpenSSLUtils.cpp:2446 +#: src/OpenSSLUtils.cpp:2460 src/OpenSSLUtils.cpp:2474 +#: src/OpenSSLUtils.cpp:2488 src/OpenSSLUtils.cpp:2502 msgid "Cannot create directory: %1 (%2 [%3])." msgstr "àª¡àª¿àª°à«àªà«àªàª°à« àª¬àª¨àª¾àªµà« àª¶àªàª¾àª àª¨àª¥à«: %1 (%2 [%3])." -#: src/OpenSSLUtils.cpp:2251 +#: src/OpenSSLUtils.cpp:2433 msgid "Cannot copy the configuration template." msgstr "àªàª¨à«àª«àª¿àªà«àª¯à«àª°à«àª¶àª¨ àªà«àª®à«àªªà«àª²à«àª àªà«àªªà« àªàª°à« àª¶àªàª¾àª¤à«àª àª¨àª¥à«." -#: src/OpenSSLUtils.cpp:2338 +#: src/OpenSSLUtils.cpp:2520 msgid "Cannot create the file." msgstr "àª«àª¾àªàª² àª¬àª¨àª¾àªµà« àª¶àªàª¾àª¤à« àª¨àª¥à«." @@ -738,28 +757,28 @@ msgid "Invalid SubjectKeyIdentifierExt object." msgstr "SubjectKeyIdentifierExt àªàª¬àªà«àªà«àª àªàª®àª¾àª¨à«àª¯." -#: src/X509v3CertificateExtensions_Priv.cpp:394 -#: src/X509v3CertificateExtensions_Priv.cpp:450 +#: src/X509v3CertificateExtensions_Priv.cpp:395 +#: src/X509v3CertificateExtensions_Priv.cpp:452 #: src/X509v3RequestExtensions_Priv.cpp:134 #: src/X509v3RequestExtensions_Priv.cpp:189 msgid "Extension occurred more than once: %1." msgstr "àªàªà«àª¸àªà«àª¨à«àª¶àª¨ àªàª àªàª°àª¤àª¾àª àªµàª§àª¾àª°à« àªµàª¾àª° àª¥àª¯à«àª: %1." -#: src/X509v3CertificateExtensions_Priv.cpp:401 -#: src/X509v3CertificateExtensions_Priv.cpp:457 +#: src/X509v3CertificateExtensions_Priv.cpp:402 +#: src/X509v3CertificateExtensions_Priv.cpp:459 #: src/X509v3RequestExtensions_Priv.cpp:141 #: src/X509v3RequestExtensions_Priv.cpp:196 msgid "Unable to parse the certificate (NID: %1 Crit: %2)." msgstr "àª¸àª°à«àªàª¿àª«à«àªà«àª àªªàª¾àª°à«àª¸ àªàª°à« àª¶àªàª¾àª¤à«àª àª¨àª¥à« (NID: %1 Crit: %2)." -#: src/X509v3CertificateExtensions_Priv.cpp:509 -#: src/X509v3CertificateExtensions_Priv.cpp:575 -#: src/X509v3CertificateExtensions_Priv.cpp:639 -#: src/X509v3CertificateExtensions_Priv.cpp:701 -#: src/X509v3CertificateExtensions_Priv.cpp:771 -#: src/X509v3CertificateExtensions_Priv.cpp:840 -#: src/X509v3CertificateExtensions_Priv.cpp:916 -#: src/X509v3CertificateExtensions_Priv.cpp:1002 +#: src/X509v3CertificateExtensions_Priv.cpp:511 +#: src/X509v3CertificateExtensions_Priv.cpp:577 +#: src/X509v3CertificateExtensions_Priv.cpp:641 +#: src/X509v3CertificateExtensions_Priv.cpp:703 +#: src/X509v3CertificateExtensions_Priv.cpp:773 +#: src/X509v3CertificateExtensions_Priv.cpp:842 +#: src/X509v3CertificateExtensions_Priv.cpp:918 +#: src/X509v3CertificateExtensions_Priv.cpp:1004 #: src/X509v3CRLExtensions_Priv.cpp:135 #: src/X509v3RequestExtensions_Priv.cpp:249 #: src/X509v3RequestExtensions_Priv.cpp:315 @@ -768,14 +787,14 @@ msgid "Extension occurred more than once." msgstr "àªàªà«àª¸àªà«àª¨à«àª¶àª¨ àªàª àªàª°àª¤àª¾àª àªµàª§àª¾àª°à« àªµàª¾àª° àª¥àª¯à«àª." -#: src/X509v3CertificateExtensions_Priv.cpp:514 -#: src/X509v3CertificateExtensions_Priv.cpp:580 -#: src/X509v3CertificateExtensions_Priv.cpp:644 -#: src/X509v3CertificateExtensions_Priv.cpp:707 -#: src/X509v3CertificateExtensions_Priv.cpp:776 -#: src/X509v3CertificateExtensions_Priv.cpp:846 -#: src/X509v3CertificateExtensions_Priv.cpp:921 -#: src/X509v3CertificateExtensions_Priv.cpp:1007 +#: src/X509v3CertificateExtensions_Priv.cpp:516 +#: src/X509v3CertificateExtensions_Priv.cpp:582 +#: src/X509v3CertificateExtensions_Priv.cpp:646 +#: src/X509v3CertificateExtensions_Priv.cpp:709 +#: src/X509v3CertificateExtensions_Priv.cpp:778 +#: src/X509v3CertificateExtensions_Priv.cpp:848 +#: src/X509v3CertificateExtensions_Priv.cpp:923 +#: src/X509v3CertificateExtensions_Priv.cpp:1009 #: src/X509v3CRLExtensions_Priv.cpp:140 #: src/X509v3RequestExtensions_Priv.cpp:254 #: src/X509v3RequestExtensions_Priv.cpp:320 @@ -784,7 +803,7 @@ msgid "Unable to parse the certificate (Crit: %1)." msgstr "àª¸àª°à«àªàª¿àª«à«àªà«àª àªªàª¾àª°à«àª¸ àªàª°à« àª¶àªàª¾àª¤à«àª àª¨àª¥à«(Crit: %1)." -#: src/X509v3CertificateExtensions_Priv.cpp:941 +#: src/X509v3CertificateExtensions_Priv.cpp:943 msgid "Invalid location in authorityInfoAccess." msgstr "àªàª®àª¾àª¨à«àª¯ àª²à«àªà«àª¶àª¨ authorityInfoAccess." @@ -907,3 +926,6 @@ #: src/X509v3RequestExtensions.cpp:231 msgid "Invalid value for X509v3RequestExts::setSubjectAlternativeName." msgstr "X509v3RequestExts::setSubjectAlternativeName àª®àª¾àªà« àª®à«àª² àªàª®àª¾àª¨à«àª¯." + +#~ msgid "Command returned '%1' : %2" +#~ msgstr "àªàª®àª¾àª¨à«àª¡ àªªàª¾àªà«àª àªàªªà« àªà« '%1' : %2" Modified: limal-head/limal-ca-mgm/po/hi.po URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/po/hi.po?rev=… ============================================================================== --- limal-head/limal-ca-mgm/po/hi.po (original) +++ limal-head/limal-ca-mgm/po/hi.po Mon Oct 29 11:30:37 2007 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: @PACKAGE@\n" "Report-Msgid-Bugs-To: translation(a)suse.de\n" -"POT-Creation-Date: 2007-09-28 16:31+0200\n" +"POT-Creation-Date: 2007-10-29 11:25+0100\n" "PO-Revision-Date: 2005-07-29 15:37+0530\n" "Last-Translator: Priyavert Sharma<priyavert.sharma(a)agreeya.com>\n" "Language-Team: AgreeYa Solutions <linux_team(a)agreeya.com>\n" @@ -24,8 +24,8 @@ #: src/AuthorityInfoAccessExtension.cpp:259 #: src/AuthorityInfoAccessExtension.cpp:342 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:87 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:194 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:86 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:193 #: src/BasicConstraintsExtension.cpp:84 src/BasicConstraintsExtension.cpp:187 #: src/BitExtensions.cpp:134 src/BitExtensions.cpp:247 #: src/BitExtensions.cpp:374 src/BitExtensions.cpp:482 src/CA.cpp:1565 @@ -72,12 +72,12 @@ msgid "AuthorityKeyIdentifierExt is not present." msgstr "AuthorityKeyIdentifierExt à¤à¤ªà¤¸à¥à¤¥à¤¿à¤¤ à¤¨à¤¹à¥à¤ à¤¹à¥à¥¤" -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:155 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:174 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:154 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:173 msgid "AuthorityKeyIdentifierGenerateExt is not present." msgstr "AuthorityKeyIdentifierGenerateExt à¤à¤ªà¤¸à¥à¤¥à¤¿à¤¤ à¤¨à¤¹à¥à¤ à¤¹à¥à¥¤" -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:186 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:185 msgid "Invalid AuthorityKeyIdentifierGenerateExt object." msgstr "à¤à¤®à¤¾à¤¨à¥à¤¯ AuthorityKeyIdentifierGenerateExt à¤µà¤¸à¥à¤¤à¥à¥¤" @@ -197,7 +197,7 @@ msgid "Duplicate DN. Request already exists." msgstr "à¤¡à¥à¤ªà¥à¤²à¥à¤à¥à¤ DNà¥¤ à¤à¤¨à¥à¤°à¥à¤§ à¤ªà¤¹à¤²à¥ à¤¸à¥ à¤¹à¥ à¤®à¥à¤à¥à¤¦ à¤¹à¥à¥¤" -#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:968 +#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:1007 msgid "Cannot parse the certificate name." msgstr "à¤ªà¥à¤°à¤®à¤¾à¤£ à¤ªà¤¤à¥à¤° à¤¨à¤¾à¤® à¤à¥ à¤ªà¤¾à¤°à¥à¤¸ à¤¨à¤¹à¥à¤ à¤à¤° à¤¸à¤à¤¤à¤¾ à¤¹à¥à¥¤" @@ -532,93 +532,112 @@ msgid "Invalid command %1." msgstr "à¤à¤®à¤¾à¤¨à¥à¤¯ à¤à¤®à¤¾à¤à¤¡ %1à¥¤" -#: src/OpenSSLUtils.cpp:138 src/OpenSSLUtils.cpp:241 src/OpenSSLUtils.cpp:334 -#: src/OpenSSLUtils.cpp:453 src/OpenSSLUtils.cpp:586 src/OpenSSLUtils.cpp:681 -#: src/OpenSSLUtils.cpp:761 -msgid "Command returned '%1' : %2" -msgstr "à¤à¤®à¤¾à¤à¤¡ à¤µà¤¾à¤ªà¤¸ '%1' : %2" +#: src/OpenSSLUtils.cpp:132 src/OpenSSLUtils.cpp:240 src/OpenSSLUtils.cpp:338 +#: src/OpenSSLUtils.cpp:462 src/OpenSSLUtils.cpp:600 src/OpenSSLUtils.cpp:700 +#: src/OpenSSLUtils.cpp:782 src/OpenSSLUtils.cpp:871 src/OpenSSLUtils.cpp:952 +#: src/OpenSSLUtils.cpp:1051 src/OpenSSLUtils.cpp:1137 +#: src/OpenSSLUtils.cpp:1271 src/OpenSSLUtils.cpp:1390 +#: src/OpenSSLUtils.cpp:1493 src/OpenSSLUtils.cpp:1645 +#: src/OpenSSLUtils.cpp:1782 +msgid "Executing openssl command failed." +msgstr "" + +#: src/OpenSSLUtils.cpp:143 src/OpenSSLUtils.cpp:251 src/OpenSSLUtils.cpp:349 +#: src/OpenSSLUtils.cpp:473 src/OpenSSLUtils.cpp:611 src/OpenSSLUtils.cpp:711 +#: src/OpenSSLUtils.cpp:796 src/OpenSSLUtils.cpp:1162 +#: src/OpenSSLUtils.cpp:1311 src/OpenSSLUtils.cpp:1415 +#: src/OpenSSLUtils.cpp:1518 src/OpenSSLUtils.cpp:1682 +#: src/OpenSSLUtils.cpp:1822 +msgid "openssl command failed: %1" +msgstr "" -#: src/OpenSSLUtils.cpp:171 src/OpenSSLUtils.cpp:268 src/OpenSSLUtils.cpp:366 -#: src/OpenSSLUtils.cpp:479 src/OpenSSLUtils.cpp:613 src/OpenSSLUtils.cpp:704 +#: src/OpenSSLUtils.cpp:176 src/OpenSSLUtils.cpp:278 src/OpenSSLUtils.cpp:381 +#: src/OpenSSLUtils.cpp:499 src/OpenSSLUtils.cpp:638 src/OpenSSLUtils.cpp:734 msgid "No valid key file specified." msgstr "à¤à¥à¤ à¤®à¤¾à¤¨à¥à¤¯ à¤à¥à¤à¤à¥ à¤«à¤¾à¤à¤² à¤¨à¤¿à¤°à¥à¤¦à¤¿à¤·à¥à¤ à¤¨à¤¹à¥à¤ à¤¹à¥à¥¤" -#: src/OpenSSLUtils.cpp:276 src/OpenSSLUtils.cpp:374 +#: src/OpenSSLUtils.cpp:286 src/OpenSSLUtils.cpp:389 msgid "No valid request file specified." msgstr "à¤à¥à¤ à¤®à¤¾à¤¨à¥à¤¯ à¤à¤¨à¥à¤°à¥à¤§ à¤«à¤¾à¤à¤² à¤¨à¤¿à¤°à¥à¤¦à¤¿à¤·à¥à¤ à¤¨à¤¹à¥à¤ à¤¹à¥à¥¤" -#: src/OpenSSLUtils.cpp:487 src/OpenSSLUtils.cpp:621 src/OpenSSLUtils.cpp:712 +#: src/OpenSSLUtils.cpp:507 src/OpenSSLUtils.cpp:646 src/OpenSSLUtils.cpp:742 msgid "No valid CA certificate file specified." msgstr "à¤à¥à¤ à¤®à¤¾à¤¨à¥à¤¯ CA à¤ªà¥à¤°à¤®à¤¾à¤£ à¤ªà¤¤à¥à¤° à¤«à¤¾à¤à¤² à¤¨à¤¿à¤°à¥à¤¦à¤¿à¤·à¥à¤ à¤¨à¤¹à¥à¤ à¤¹à¥à¥¤" -#: src/OpenSSLUtils.cpp:495 src/OpenSSLUtils.cpp:785 +#: src/OpenSSLUtils.cpp:515 src/OpenSSLUtils.cpp:820 msgid "No valid certificate file specified." msgstr "à¤à¥à¤ à¤®à¤¾à¤¨à¥à¤¯ à¤ªà¥à¤°à¤®à¤¾à¤£ à¤ªà¤¤à¥à¤° à¤«à¤¾à¤à¤² à¤¨à¤¿à¤°à¥à¤¦à¤¿à¤·à¥à¤ à¤¨à¤¹à¥à¤ à¤¹à¥à¥¤" -#: src/OpenSSLUtils.cpp:793 +#: src/OpenSSLUtils.cpp:828 msgid "No valid CA directory specified." msgstr "à¤à¥à¤ à¤®à¤¾à¤¨à¥à¤¯ CA à¤¡à¤¾à¤¯à¤°à¥à¤à¥à¤à¤°à¥ à¤¨à¤¿à¤°à¥à¤¦à¤¿à¤·à¥à¤ à¤¨à¤¹à¥à¤ à¤¹à¥à¥¤" -#: src/OpenSSLUtils.cpp:943 +#: src/OpenSSLUtils.cpp:982 msgid "Showing certificate status with serial %1 failed (%2)." msgstr "à¤ªà¥à¤°à¤®à¤¾à¤£ à¤ªà¤¤à¥à¤° à¤¸à¥à¤¥à¤¿à¤¤à¤¿ à¤à¥ à¤¸à¥à¤°à¤¿à¤¯à¤² %1 à¤à¥ à¤¸à¤¾à¤¥ à¤ªà¥à¤°à¤¦à¤°à¥à¤¶à¤¿à¤¤ à¤à¤°à¤¨à¤¾ à¤à¤¸à¤«à¤² à¤°à¤¹à¤¾ (%2)à¥¤" -#: src/OpenSSLUtils.cpp:979 +#: src/OpenSSLUtils.cpp:1018 msgid "The key file does not exist." msgstr "à¤à¥à¤à¤à¥ à¤«à¤¾à¤à¤² à¤®à¥à¤à¥à¤¦ à¤¨à¤¹à¥à¤ à¤¹à¥à¥¤" -#: src/OpenSSLUtils.cpp:1474 +#: src/OpenSSLUtils.cpp:1306 src/OpenSSLUtils.cpp:1677 +#: src/OpenSSLUtils.cpp:1817 +#, fuzzy +msgid "Invalid password." +msgstr "à¤à¤®à¤¾à¤¨à¥à¤¯ CA à¤ªà¤¾à¤¸à¤µà¤°à¥à¤¡à¥¤" + +#: src/OpenSSLUtils.cpp:1595 msgid "The password for encrypting the output is required." msgstr "à¤à¤à¤à¤ªà¥à¤ à¤à¥ à¤à¤à¤à¥à¤°à¤¿à¤ªà¥à¤ à¤à¤°à¤¨à¥ à¤à¥ à¤²à¤¿à¤ à¤ªà¤¾à¤¸à¤µà¤°à¥à¤¡ à¤à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ à¤¹à¥à¥¤" -#: src/OpenSSLUtils.cpp:1579 +#: src/OpenSSLUtils.cpp:1736 msgid "The PKCS12 password is required." msgstr "PKCS12 à¤ªà¤¾à¤¸à¤µà¤°à¥à¤¡ à¤à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ à¤¹à¥à¥¤" -#: src/OpenSSLUtils.cpp:1665 src/OpenSSLUtils.cpp:1865 -#: src/OpenSSLUtils.cpp:2017 +#: src/OpenSSLUtils.cpp:1847 src/OpenSSLUtils.cpp:2047 +#: src/OpenSSLUtils.cpp:2199 msgid "Cannot read directory: %1 (%2) [%3]." msgstr "à¤¡à¤¾à¤¯à¤°à¥à¤à¥à¤à¤°à¥ à¤à¥ à¤¨à¤¹à¥à¤ à¤ªà¤¢à¤¼ à¤¸à¤à¤¤à¤¾ : %1 (%2) [%3]à¥¤" -#: src/OpenSSLUtils.cpp:1715 +#: src/OpenSSLUtils.cpp:1897 msgid "No serial number found in %1." msgstr "%1 à¤®à¥à¤ à¤à¥à¤ à¤à¥à¤°à¤® à¤¸à¤à¤à¥à¤¯à¤¾ à¤¨à¤¹à¥à¤ à¤ªà¥à¤°à¤¾à¤ªà¥à¤¤ à¤¹à¥à¤à¥¤" -#: src/OpenSSLUtils.cpp:1735 +#: src/OpenSSLUtils.cpp:1917 msgid "The request already exists." msgstr "à¤à¤¨à¥à¤°à¥à¤§ à¤ªà¤¹à¤²à¥ à¤¸à¥ à¤¹à¥ à¤®à¥à¤à¥à¤¦ à¤¹à¥à¥¤" -#: src/OpenSSLUtils.cpp:1926 +#: src/OpenSSLUtils.cpp:2108 msgid "Cannot find the request subject." msgstr "à¤à¤¨à¥à¤°à¥à¤§ à¤µà¤¿à¤·à¤¯ à¤¨à¤¹à¥à¤ à¤ªà¥à¤°à¤¾à¤ªà¥à¤¤ à¤à¤° à¤¸à¤à¤¤à¤¾ à¤¹à¥à¥¤" -#: src/OpenSSLUtils.cpp:2087 +#: src/OpenSSLUtils.cpp:2269 msgid "Cannot find the certificate subject." msgstr "à¤ªà¥à¤°à¤®à¤¾à¤£ à¤ªà¤¤à¥à¤° à¤µà¤¿à¤·à¤¯ à¤¨à¤¹à¥à¤ à¤ªà¥à¤°à¤¾à¤ªà¥à¤¤ à¤à¤° à¤¸à¤à¤¤à¤¾ à¤¹à¥à¥¤" -#: src/OpenSSLUtils.cpp:2186 +#: src/OpenSSLUtils.cpp:2368 msgid "Invalid caName: %1." msgstr "à¤à¤®à¤¾à¤¨à¥à¤¯ caName : %1" -#: src/OpenSSLUtils.cpp:2195 +#: src/OpenSSLUtils.cpp:2377 msgid "'%1' does not exist." msgstr "'%1' à¤®à¥à¤à¥à¤¦ à¤¨à¤¹à¥à¤ à¤¹à¥à¥¤" -#: src/OpenSSLUtils.cpp:2205 +#: src/OpenSSLUtils.cpp:2387 msgid "%1 still exists." msgstr "'%1' à¤à¤¬ à¤à¥ à¤®à¥à¤à¥à¤¦ à¤¹à¥à¥¤" -#: src/OpenSSLUtils.cpp:2216 src/OpenSSLUtils.cpp:2264 -#: src/OpenSSLUtils.cpp:2278 src/OpenSSLUtils.cpp:2292 -#: src/OpenSSLUtils.cpp:2306 src/OpenSSLUtils.cpp:2320 +#: src/OpenSSLUtils.cpp:2398 src/OpenSSLUtils.cpp:2446 +#: src/OpenSSLUtils.cpp:2460 src/OpenSSLUtils.cpp:2474 +#: src/OpenSSLUtils.cpp:2488 src/OpenSSLUtils.cpp:2502 msgid "Cannot create directory: %1 (%2 [%3])." msgstr "à¤¡à¤¾à¤¯à¤°à¥à¤à¥à¤à¤°à¥ à¤à¥ à¤¸à¥à¤à¤¿à¤¤ à¤¨à¤¹à¥à¤ à¤à¤° à¤¸à¤à¤¤à¤¾ : %1 (%2 [%3])à¥¤" -#: src/OpenSSLUtils.cpp:2251 +#: src/OpenSSLUtils.cpp:2433 msgid "Cannot copy the configuration template." msgstr "à¤à¥à¤¨à¥à¤«à¤¿à¤à¤°à¥à¤¶à¤¨ à¤à¥à¤®à¥à¤ªà¤²à¥à¤ à¤à¥ à¤à¥à¤ªà¥ à¤¨à¤¹à¥à¤ à¤à¤° à¤¸à¤à¤¤à¤¾ à¤¹à¥à¥¤" -#: src/OpenSSLUtils.cpp:2338 +#: src/OpenSSLUtils.cpp:2520 msgid "Cannot create the file." msgstr "à¤«à¤¾à¤à¤² à¤à¥ à¤¸à¥à¤à¤¿à¤¤ à¤¨à¤¹à¥à¤ à¤à¤° à¤¸à¤à¤¤à¤¾ à¤¹à¥à¥¤" @@ -737,28 +756,28 @@ msgid "Invalid SubjectKeyIdentifierExt object." msgstr "à¤à¤®à¤¾à¤¨à¥à¤¯ SubjectAlternativeNameExt à¤µà¤¸à¥à¤¤à¥à¥¤" -#: src/X509v3CertificateExtensions_Priv.cpp:394 -#: src/X509v3CertificateExtensions_Priv.cpp:450 +#: src/X509v3CertificateExtensions_Priv.cpp:395 +#: src/X509v3CertificateExtensions_Priv.cpp:452 #: src/X509v3RequestExtensions_Priv.cpp:134 #: src/X509v3RequestExtensions_Priv.cpp:189 msgid "Extension occurred more than once: %1." msgstr "à¤à¤ à¤¸à¥ à¤à¤§à¤¿à¤ à¤¬à¤¾à¤° à¤µà¤¿à¤¸à¥à¤¤à¤¾à¤° à¤¹à¥à¤ à¤¹à¥ : %1à¥¤" -#: src/X509v3CertificateExtensions_Priv.cpp:401 -#: src/X509v3CertificateExtensions_Priv.cpp:457 +#: src/X509v3CertificateExtensions_Priv.cpp:402 +#: src/X509v3CertificateExtensions_Priv.cpp:459 #: src/X509v3RequestExtensions_Priv.cpp:141 #: src/X509v3RequestExtensions_Priv.cpp:196 msgid "Unable to parse the certificate (NID: %1 Crit: %2)." msgstr "à¤ªà¥à¤°à¤®à¤¾à¤£ à¤ªà¤¤à¥à¤° (NID: %1 Crit: %2) à¤à¥ à¤ªà¤¾à¤°à¥à¤¸ à¤à¤°à¤¨à¥ à¤®à¥à¤ à¤à¤à¥à¤·à¤®à¥¤" -#: src/X509v3CertificateExtensions_Priv.cpp:509 -#: src/X509v3CertificateExtensions_Priv.cpp:575 -#: src/X509v3CertificateExtensions_Priv.cpp:639 -#: src/X509v3CertificateExtensions_Priv.cpp:701 -#: src/X509v3CertificateExtensions_Priv.cpp:771 -#: src/X509v3CertificateExtensions_Priv.cpp:840 -#: src/X509v3CertificateExtensions_Priv.cpp:916 -#: src/X509v3CertificateExtensions_Priv.cpp:1002 +#: src/X509v3CertificateExtensions_Priv.cpp:511 +#: src/X509v3CertificateExtensions_Priv.cpp:577 +#: src/X509v3CertificateExtensions_Priv.cpp:641 +#: src/X509v3CertificateExtensions_Priv.cpp:703 +#: src/X509v3CertificateExtensions_Priv.cpp:773 +#: src/X509v3CertificateExtensions_Priv.cpp:842 +#: src/X509v3CertificateExtensions_Priv.cpp:918 +#: src/X509v3CertificateExtensions_Priv.cpp:1004 #: src/X509v3CRLExtensions_Priv.cpp:135 #: src/X509v3RequestExtensions_Priv.cpp:249 #: src/X509v3RequestExtensions_Priv.cpp:315 @@ -767,14 +786,14 @@ msgid "Extension occurred more than once." msgstr "à¤à¤ à¤¸à¥ à¤à¤§à¤¿à¤ à¤¬à¤¾à¤° à¤µà¤¿à¤¸à¥à¤¤à¤¾à¤° à¤¹à¥à¤ à¤¹à¥à¥¤" -#: src/X509v3CertificateExtensions_Priv.cpp:514 -#: src/X509v3CertificateExtensions_Priv.cpp:580 -#: src/X509v3CertificateExtensions_Priv.cpp:644 -#: src/X509v3CertificateExtensions_Priv.cpp:707 -#: src/X509v3CertificateExtensions_Priv.cpp:776 -#: src/X509v3CertificateExtensions_Priv.cpp:846 -#: src/X509v3CertificateExtensions_Priv.cpp:921 -#: src/X509v3CertificateExtensions_Priv.cpp:1007 +#: src/X509v3CertificateExtensions_Priv.cpp:516 +#: src/X509v3CertificateExtensions_Priv.cpp:582 +#: src/X509v3CertificateExtensions_Priv.cpp:646 +#: src/X509v3CertificateExtensions_Priv.cpp:709 +#: src/X509v3CertificateExtensions_Priv.cpp:778 +#: src/X509v3CertificateExtensions_Priv.cpp:848 +#: src/X509v3CertificateExtensions_Priv.cpp:923 +#: src/X509v3CertificateExtensions_Priv.cpp:1009 #: src/X509v3CRLExtensions_Priv.cpp:140 #: src/X509v3RequestExtensions_Priv.cpp:254 #: src/X509v3RequestExtensions_Priv.cpp:320 @@ -783,7 +802,7 @@ msgid "Unable to parse the certificate (Crit: %1)." msgstr "à¤ªà¥à¤°à¤®à¤¾à¤£ à¤ªà¤¤à¥à¤° (Crit: %1) à¤à¥ à¤ªà¤¾à¤°à¥à¤¸ à¤à¤°à¤¨à¥ à¤®à¥à¤ à¤à¤à¥à¤·à¤®à¥¤" -#: src/X509v3CertificateExtensions_Priv.cpp:941 +#: src/X509v3CertificateExtensions_Priv.cpp:943 msgid "Invalid location in authorityInfoAccess." msgstr "authorityInfoAccess à¤®à¥à¤ à¤à¤®à¤¾à¤¨à¥à¤¯ à¤¸à¥à¤¥à¤¾à¤¨à¥¤" @@ -906,3 +925,6 @@ #: src/X509v3RequestExtensions.cpp:231 msgid "Invalid value for X509v3RequestExts::setSubjectAlternativeName." msgstr "X509v3RequestExts::setSubjectAlternativeName à¤à¥ à¤²à¤¿à¤ à¤à¤®à¤¾à¤¨à¥à¤¯ à¤®à¤¾à¤¨à¥¤" + +#~ msgid "Command returned '%1' : %2" +#~ msgstr "à¤à¤®à¤¾à¤à¤¡ à¤µà¤¾à¤ªà¤¸ '%1' : %2" Modified: limal-head/limal-ca-mgm/po/hu.po URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/po/hu.po?rev=… ============================================================================== --- limal-head/limal-ca-mgm/po/hu.po (original) +++ limal-head/limal-ca-mgm/po/hu.po Mon Oct 29 11:30:37 2007 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: limal-ca-mgm\n" "Report-Msgid-Bugs-To: translation(a)suse.de\n" -"POT-Creation-Date: 2007-09-28 16:31+0200\n" +"POT-Creation-Date: 2007-10-29 11:25+0100\n" "PO-Revision-Date: 2007-08-15 17:15+0200\n" "Last-Translator: Kalman Kemenczy <kkemenczy(a)novell.com>\n" "Language-Team: <hu(a)li.org>\n" @@ -33,8 +33,8 @@ #: src/AuthorityInfoAccessExtension.cpp:259 #: src/AuthorityInfoAccessExtension.cpp:342 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:87 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:194 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:86 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:193 #: src/BasicConstraintsExtension.cpp:84 src/BasicConstraintsExtension.cpp:187 #: src/BitExtensions.cpp:134 src/BitExtensions.cpp:247 #: src/BitExtensions.cpp:374 src/BitExtensions.cpp:482 src/CA.cpp:1565 @@ -81,12 +81,12 @@ msgid "AuthorityKeyIdentifierExt is not present." msgstr "Nincs AuthorityKeyIdentifierExt." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:155 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:174 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:154 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:173 msgid "AuthorityKeyIdentifierGenerateExt is not present." msgstr "Nincs AuthorityKeyIdentifierGenerateExt." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:186 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:185 msgid "Invalid AuthorityKeyIdentifierGenerateExt object." msgstr "ÃrvÃ©nytelen AuthorityKeyIdentifierGenerateExt objektum." @@ -206,7 +206,7 @@ msgid "Duplicate DN. Request already exists." msgstr "A DN Request mÃ¡r lÃ©tezik." -#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:968 +#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:1007 msgid "Cannot parse the certificate name." msgstr "A tanÃºsÃtvÃ¡ny nevÃ©nek feldolgozÃ¡sa sikertelen." @@ -548,95 +548,114 @@ msgid "Invalid command %1." msgstr "ÃrvÃ©nytelen parancs: %s." -#: src/OpenSSLUtils.cpp:138 src/OpenSSLUtils.cpp:241 src/OpenSSLUtils.cpp:334 -#: src/OpenSSLUtils.cpp:453 src/OpenSSLUtils.cpp:586 src/OpenSSLUtils.cpp:681 -#: src/OpenSSLUtils.cpp:761 -msgid "Command returned '%1' : %2" -msgstr "A parancs visszatÃ©rÅ Ã©rtÃ©ke: '%1': %2" +#: src/OpenSSLUtils.cpp:132 src/OpenSSLUtils.cpp:240 src/OpenSSLUtils.cpp:338 +#: src/OpenSSLUtils.cpp:462 src/OpenSSLUtils.cpp:600 src/OpenSSLUtils.cpp:700 +#: src/OpenSSLUtils.cpp:782 src/OpenSSLUtils.cpp:871 src/OpenSSLUtils.cpp:952 +#: src/OpenSSLUtils.cpp:1051 src/OpenSSLUtils.cpp:1137 +#: src/OpenSSLUtils.cpp:1271 src/OpenSSLUtils.cpp:1390 +#: src/OpenSSLUtils.cpp:1493 src/OpenSSLUtils.cpp:1645 +#: src/OpenSSLUtils.cpp:1782 +msgid "Executing openssl command failed." +msgstr "" + +#: src/OpenSSLUtils.cpp:143 src/OpenSSLUtils.cpp:251 src/OpenSSLUtils.cpp:349 +#: src/OpenSSLUtils.cpp:473 src/OpenSSLUtils.cpp:611 src/OpenSSLUtils.cpp:711 +#: src/OpenSSLUtils.cpp:796 src/OpenSSLUtils.cpp:1162 +#: src/OpenSSLUtils.cpp:1311 src/OpenSSLUtils.cpp:1415 +#: src/OpenSSLUtils.cpp:1518 src/OpenSSLUtils.cpp:1682 +#: src/OpenSSLUtils.cpp:1822 +msgid "openssl command failed: %1" +msgstr "" -#: src/OpenSSLUtils.cpp:171 src/OpenSSLUtils.cpp:268 src/OpenSSLUtils.cpp:366 -#: src/OpenSSLUtils.cpp:479 src/OpenSSLUtils.cpp:613 src/OpenSSLUtils.cpp:704 +#: src/OpenSSLUtils.cpp:176 src/OpenSSLUtils.cpp:278 src/OpenSSLUtils.cpp:381 +#: src/OpenSSLUtils.cpp:499 src/OpenSSLUtils.cpp:638 src/OpenSSLUtils.cpp:734 msgid "No valid key file specified." msgstr "Nincs megadva Ã©rvÃ©nyes kulcs." -#: src/OpenSSLUtils.cpp:276 src/OpenSSLUtils.cpp:374 +#: src/OpenSSLUtils.cpp:286 src/OpenSSLUtils.cpp:389 msgid "No valid request file specified." msgstr "Nincs megadva Ã©rvÃ©nyes igÃ©nylÃ©s." -#: src/OpenSSLUtils.cpp:487 src/OpenSSLUtils.cpp:621 src/OpenSSLUtils.cpp:712 +#: src/OpenSSLUtils.cpp:507 src/OpenSSLUtils.cpp:646 src/OpenSSLUtils.cpp:742 msgid "No valid CA certificate file specified." msgstr "Nincs megadva Ã©rvÃ©nyes CA tanÃºsÃtvÃ¡ny." -#: src/OpenSSLUtils.cpp:495 src/OpenSSLUtils.cpp:785 +#: src/OpenSSLUtils.cpp:515 src/OpenSSLUtils.cpp:820 msgid "No valid certificate file specified." msgstr "Nincs megadva Ã©rvÃ©nyes tanÃºsÃtvÃ¡ny." -#: src/OpenSSLUtils.cpp:793 +#: src/OpenSSLUtils.cpp:828 msgid "No valid CA directory specified." msgstr "Nincs megadva Ã©rvÃ©nyes CA kÃ¶nyvtÃ¡r." -#: src/OpenSSLUtils.cpp:943 +#: src/OpenSSLUtils.cpp:982 msgid "Showing certificate status with serial %1 failed (%2)." msgstr "" "A tanÃºsÃtvÃ¡ny Ã¡llapotÃ¡nak lekÃ©rdezÃ©se a(z) %1 sorozatszÃ¡mmal sikertelen (%2)." -#: src/OpenSSLUtils.cpp:979 +#: src/OpenSSLUtils.cpp:1018 msgid "The key file does not exist." msgstr "A kulcsfÃ¡jl nem lÃ©tezik." -#: src/OpenSSLUtils.cpp:1474 +#: src/OpenSSLUtils.cpp:1306 src/OpenSSLUtils.cpp:1677 +#: src/OpenSSLUtils.cpp:1817 +#, fuzzy +msgid "Invalid password." +msgstr "ÃrvÃ©nytelen CA jelszÃ³." + +#: src/OpenSSLUtils.cpp:1595 msgid "The password for encrypting the output is required." msgstr "A kimenet visszafejtÃ©sÃ©hez szÃ¼ksÃ©ges jelszÃ³ szÃ¼ksÃ©ges." -#: src/OpenSSLUtils.cpp:1579 +#: src/OpenSSLUtils.cpp:1736 msgid "The PKCS12 password is required." msgstr "A PKCS12 jelszÃ³ szÃ¼ksÃ©ges." -#: src/OpenSSLUtils.cpp:1665 src/OpenSSLUtils.cpp:1865 -#: src/OpenSSLUtils.cpp:2017 +#: src/OpenSSLUtils.cpp:1847 src/OpenSSLUtils.cpp:2047 +#: src/OpenSSLUtils.cpp:2199 msgid "Cannot read directory: %1 (%2) [%3]." msgstr "A kÃ¶nyvtÃ¡r nem olvashatÃ³: %1 (%2) [%3]." -#: src/OpenSSLUtils.cpp:1715 +#: src/OpenSSLUtils.cpp:1897 msgid "No serial number found in %1." msgstr "Nem talÃ¡lhatÃ³ sorozatszÃ¡m itt: %1." -#: src/OpenSSLUtils.cpp:1735 +#: src/OpenSSLUtils.cpp:1917 msgid "The request already exists." msgstr "A kÃ©rÃ©s mÃ¡r lÃ©tezik." -#: src/OpenSSLUtils.cpp:1926 +#: src/OpenSSLUtils.cpp:2108 msgid "Cannot find the request subject." msgstr "A kÃ©rÃ©s tÃ¡rgya nem talÃ¡lhatÃ³." -#: src/OpenSSLUtils.cpp:2087 +#: src/OpenSSLUtils.cpp:2269 msgid "Cannot find the certificate subject." msgstr "A tanÃºsÃtvÃ¡ny tÃ¡rgya nem talÃ¡lhatÃ³." -#: src/OpenSSLUtils.cpp:2186 +#: src/OpenSSLUtils.cpp:2368 msgid "Invalid caName: %1." msgstr "ÃrvÃ©nytelen caName: %1." -#: src/OpenSSLUtils.cpp:2195 +#: src/OpenSSLUtils.cpp:2377 msgid "'%1' does not exist." msgstr "A kÃ¶vetkezÅ fÃ¡jl nem lÃ©tezik: '%1'." -#: src/OpenSSLUtils.cpp:2205 +#: src/OpenSSLUtils.cpp:2387 msgid "%1 still exists." msgstr "A(z) %1 tovÃ¡bbra is lÃ©tezik." -#: src/OpenSSLUtils.cpp:2216 src/OpenSSLUtils.cpp:2264 -#: src/OpenSSLUtils.cpp:2278 src/OpenSSLUtils.cpp:2292 -#: src/OpenSSLUtils.cpp:2306 src/OpenSSLUtils.cpp:2320 +#: src/OpenSSLUtils.cpp:2398 src/OpenSSLUtils.cpp:2446 +#: src/OpenSSLUtils.cpp:2460 src/OpenSSLUtils.cpp:2474 +#: src/OpenSSLUtils.cpp:2488 src/OpenSSLUtils.cpp:2502 msgid "Cannot create directory: %1 (%2 [%3])." msgstr "Nem hozhatÃ³ lÃ©tre kÃ¶nyvtÃ¡r: %1 (%2 [%3])." # /tmp/xapi:49 -#: src/OpenSSLUtils.cpp:2251 +#: src/OpenSSLUtils.cpp:2433 msgid "Cannot copy the configuration template." msgstr "A konfigurÃ¡ciÃ³s sablon nem mÃ¡solhatÃ³." -#: src/OpenSSLUtils.cpp:2338 +#: src/OpenSSLUtils.cpp:2520 msgid "Cannot create the file." msgstr "Nem hozhatÃ³ lÃ©tre a fÃ¡jl." @@ -755,28 +774,28 @@ msgid "Invalid SubjectKeyIdentifierExt object." msgstr "ÃrvÃ©nytelen SubjectKeyIdentifierExt objektum." -#: src/X509v3CertificateExtensions_Priv.cpp:394 -#: src/X509v3CertificateExtensions_Priv.cpp:450 +#: src/X509v3CertificateExtensions_Priv.cpp:395 +#: src/X509v3CertificateExtensions_Priv.cpp:452 #: src/X509v3RequestExtensions_Priv.cpp:134 #: src/X509v3RequestExtensions_Priv.cpp:189 msgid "Extension occurred more than once: %1." msgstr "A kiterjesztÃ©s tÃ¶bbszÃ¶r szerepel: %1." -#: src/X509v3CertificateExtensions_Priv.cpp:401 -#: src/X509v3CertificateExtensions_Priv.cpp:457 +#: src/X509v3CertificateExtensions_Priv.cpp:402 +#: src/X509v3CertificateExtensions_Priv.cpp:459 #: src/X509v3RequestExtensions_Priv.cpp:141 #: src/X509v3RequestExtensions_Priv.cpp:196 msgid "Unable to parse the certificate (NID: %1 Crit: %2)." msgstr "A tanÃºsÃtvÃ¡ny feldolgozÃ¡sa sikertelen (NID: %1 Crit: %2)." -#: src/X509v3CertificateExtensions_Priv.cpp:509 -#: src/X509v3CertificateExtensions_Priv.cpp:575 -#: src/X509v3CertificateExtensions_Priv.cpp:639 -#: src/X509v3CertificateExtensions_Priv.cpp:701 -#: src/X509v3CertificateExtensions_Priv.cpp:771 -#: src/X509v3CertificateExtensions_Priv.cpp:840 -#: src/X509v3CertificateExtensions_Priv.cpp:916 -#: src/X509v3CertificateExtensions_Priv.cpp:1002 +#: src/X509v3CertificateExtensions_Priv.cpp:511 +#: src/X509v3CertificateExtensions_Priv.cpp:577 +#: src/X509v3CertificateExtensions_Priv.cpp:641 +#: src/X509v3CertificateExtensions_Priv.cpp:703 +#: src/X509v3CertificateExtensions_Priv.cpp:773 +#: src/X509v3CertificateExtensions_Priv.cpp:842 +#: src/X509v3CertificateExtensions_Priv.cpp:918 +#: src/X509v3CertificateExtensions_Priv.cpp:1004 #: src/X509v3CRLExtensions_Priv.cpp:135 #: src/X509v3RequestExtensions_Priv.cpp:249 #: src/X509v3RequestExtensions_Priv.cpp:315 @@ -785,14 +804,14 @@ msgid "Extension occurred more than once." msgstr "A kiterjesztÃ©s tÃ¶bbszÃ¶r szerepel." -#: src/X509v3CertificateExtensions_Priv.cpp:514 -#: src/X509v3CertificateExtensions_Priv.cpp:580 -#: src/X509v3CertificateExtensions_Priv.cpp:644 -#: src/X509v3CertificateExtensions_Priv.cpp:707 -#: src/X509v3CertificateExtensions_Priv.cpp:776 -#: src/X509v3CertificateExtensions_Priv.cpp:846 -#: src/X509v3CertificateExtensions_Priv.cpp:921 -#: src/X509v3CertificateExtensions_Priv.cpp:1007 +#: src/X509v3CertificateExtensions_Priv.cpp:516 +#: src/X509v3CertificateExtensions_Priv.cpp:582 +#: src/X509v3CertificateExtensions_Priv.cpp:646 +#: src/X509v3CertificateExtensions_Priv.cpp:709 +#: src/X509v3CertificateExtensions_Priv.cpp:778 +#: src/X509v3CertificateExtensions_Priv.cpp:848 +#: src/X509v3CertificateExtensions_Priv.cpp:923 +#: src/X509v3CertificateExtensions_Priv.cpp:1009 #: src/X509v3CRLExtensions_Priv.cpp:140 #: src/X509v3RequestExtensions_Priv.cpp:254 #: src/X509v3RequestExtensions_Priv.cpp:320 @@ -801,7 +820,7 @@ msgid "Unable to parse the certificate (Crit: %1)." msgstr "A tanÃºsÃtvÃ¡ny feldolgozÃ¡sa sikertelen (Crit: %1)." -#: src/X509v3CertificateExtensions_Priv.cpp:941 +#: src/X509v3CertificateExtensions_Priv.cpp:943 msgid "Invalid location in authorityInfoAccess." msgstr "Az authorityInfoAccess helye Ã©rvÃ©nytelen." @@ -929,3 +948,6 @@ #: src/X509v3RequestExtensions.cpp:231 msgid "Invalid value for X509v3RequestExts::setSubjectAlternativeName." msgstr "ÃrvÃ©nytelen Ã©rtÃ©k: X509v3RequestExts::setSubjectAlternativeName." + +#~ msgid "Command returned '%1' : %2" +#~ msgstr "A parancs visszatÃ©rÅ Ã©rtÃ©ke: '%1': %2" Modified: limal-head/limal-ca-mgm/po/it.po URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/po/it.po?rev=… ============================================================================== --- limal-head/limal-ca-mgm/po/it.po (original) +++ limal-head/limal-ca-mgm/po/it.po Mon Oct 29 11:30:37 2007 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: limal-ca-mgm\n" "Report-Msgid-Bugs-To: translation(a)suse.de\n" -"POT-Creation-Date: 2007-09-28 16:31+0200\n" +"POT-Creation-Date: 2007-10-29 11:25+0100\n" "PO-Revision-Date: 2006-11-03 15:41\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" @@ -25,8 +25,8 @@ #: src/AuthorityInfoAccessExtension.cpp:259 #: src/AuthorityInfoAccessExtension.cpp:342 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:87 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:194 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:86 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:193 #: src/BasicConstraintsExtension.cpp:84 src/BasicConstraintsExtension.cpp:187 #: src/BitExtensions.cpp:134 src/BitExtensions.cpp:247 #: src/BitExtensions.cpp:374 src/BitExtensions.cpp:482 src/CA.cpp:1565 @@ -73,12 +73,12 @@ msgid "AuthorityKeyIdentifierExt is not present." msgstr "AuthorityKeyIdentifierExt non presente." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:155 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:174 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:154 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:173 msgid "AuthorityKeyIdentifierGenerateExt is not present." msgstr "AuthorityKeyIdentifierGenerateExt non presente." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:186 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:185 msgid "Invalid AuthorityKeyIdentifierGenerateExt object." msgstr "Oggetto AuthorityKeyIdentifierGenerateExt non valido." @@ -198,7 +198,7 @@ msgid "Duplicate DN. Request already exists." msgstr "DN duplicato. La richiesta esiste giÃ ." -#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:968 +#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:1007 msgid "Cannot parse the certificate name." msgstr "Impossibile analizzare sintatticamente il nome del certificato." @@ -536,95 +536,114 @@ msgid "Invalid command %1." msgstr "Comando non valido %1." -#: src/OpenSSLUtils.cpp:138 src/OpenSSLUtils.cpp:241 src/OpenSSLUtils.cpp:334 -#: src/OpenSSLUtils.cpp:453 src/OpenSSLUtils.cpp:586 src/OpenSSLUtils.cpp:681 -#: src/OpenSSLUtils.cpp:761 -msgid "Command returned '%1' : %2" -msgstr "Comando restituito '%1' : %2" +#: src/OpenSSLUtils.cpp:132 src/OpenSSLUtils.cpp:240 src/OpenSSLUtils.cpp:338 +#: src/OpenSSLUtils.cpp:462 src/OpenSSLUtils.cpp:600 src/OpenSSLUtils.cpp:700 +#: src/OpenSSLUtils.cpp:782 src/OpenSSLUtils.cpp:871 src/OpenSSLUtils.cpp:952 +#: src/OpenSSLUtils.cpp:1051 src/OpenSSLUtils.cpp:1137 +#: src/OpenSSLUtils.cpp:1271 src/OpenSSLUtils.cpp:1390 +#: src/OpenSSLUtils.cpp:1493 src/OpenSSLUtils.cpp:1645 +#: src/OpenSSLUtils.cpp:1782 +msgid "Executing openssl command failed." +msgstr "" + +#: src/OpenSSLUtils.cpp:143 src/OpenSSLUtils.cpp:251 src/OpenSSLUtils.cpp:349 +#: src/OpenSSLUtils.cpp:473 src/OpenSSLUtils.cpp:611 src/OpenSSLUtils.cpp:711 +#: src/OpenSSLUtils.cpp:796 src/OpenSSLUtils.cpp:1162 +#: src/OpenSSLUtils.cpp:1311 src/OpenSSLUtils.cpp:1415 +#: src/OpenSSLUtils.cpp:1518 src/OpenSSLUtils.cpp:1682 +#: src/OpenSSLUtils.cpp:1822 +msgid "openssl command failed: %1" +msgstr "" -#: src/OpenSSLUtils.cpp:171 src/OpenSSLUtils.cpp:268 src/OpenSSLUtils.cpp:366 -#: src/OpenSSLUtils.cpp:479 src/OpenSSLUtils.cpp:613 src/OpenSSLUtils.cpp:704 +#: src/OpenSSLUtils.cpp:176 src/OpenSSLUtils.cpp:278 src/OpenSSLUtils.cpp:381 +#: src/OpenSSLUtils.cpp:499 src/OpenSSLUtils.cpp:638 src/OpenSSLUtils.cpp:734 msgid "No valid key file specified." msgstr "Nessun file chiave valido specificato." -#: src/OpenSSLUtils.cpp:276 src/OpenSSLUtils.cpp:374 +#: src/OpenSSLUtils.cpp:286 src/OpenSSLUtils.cpp:389 msgid "No valid request file specified." msgstr "Nessun file di richiesta valido specificato." -#: src/OpenSSLUtils.cpp:487 src/OpenSSLUtils.cpp:621 src/OpenSSLUtils.cpp:712 +#: src/OpenSSLUtils.cpp:507 src/OpenSSLUtils.cpp:646 src/OpenSSLUtils.cpp:742 msgid "No valid CA certificate file specified." msgstr "Nessun file di certificato CA valido specificato." -#: src/OpenSSLUtils.cpp:495 src/OpenSSLUtils.cpp:785 +#: src/OpenSSLUtils.cpp:515 src/OpenSSLUtils.cpp:820 msgid "No valid certificate file specified." msgstr "Nessun file di certificato valido specificato." -#: src/OpenSSLUtils.cpp:793 +#: src/OpenSSLUtils.cpp:828 msgid "No valid CA directory specified." msgstr "Nessuna directory CA valida specificata." -#: src/OpenSSLUtils.cpp:943 +#: src/OpenSSLUtils.cpp:982 msgid "Showing certificate status with serial %1 failed (%2)." msgstr "" "Impossibile visualizzare lo stato del certificato con numero di serie %1 (%" "2)." -#: src/OpenSSLUtils.cpp:979 +#: src/OpenSSLUtils.cpp:1018 msgid "The key file does not exist." msgstr "Il file delle chiavi non esiste." -#: src/OpenSSLUtils.cpp:1474 +#: src/OpenSSLUtils.cpp:1306 src/OpenSSLUtils.cpp:1677 +#: src/OpenSSLUtils.cpp:1817 +#, fuzzy +msgid "Invalid password." +msgstr "Password CA non valida." + +#: src/OpenSSLUtils.cpp:1595 msgid "The password for encrypting the output is required." msgstr "La password per la cifratura dell'output Ã¨ obbligatoria." -#: src/OpenSSLUtils.cpp:1579 +#: src/OpenSSLUtils.cpp:1736 msgid "The PKCS12 password is required." msgstr "La password PKCS12 Ã¨ obbligatoria." -#: src/OpenSSLUtils.cpp:1665 src/OpenSSLUtils.cpp:1865 -#: src/OpenSSLUtils.cpp:2017 +#: src/OpenSSLUtils.cpp:1847 src/OpenSSLUtils.cpp:2047 +#: src/OpenSSLUtils.cpp:2199 msgid "Cannot read directory: %1 (%2) [%3]." msgstr "Impossibile leggere la directory: %1 (%2) [%3]." -#: src/OpenSSLUtils.cpp:1715 +#: src/OpenSSLUtils.cpp:1897 msgid "No serial number found in %1." msgstr "Nessun numero seriale trovato in %1." -#: src/OpenSSLUtils.cpp:1735 +#: src/OpenSSLUtils.cpp:1917 msgid "The request already exists." msgstr "La richiesta esiste giÃ ." -#: src/OpenSSLUtils.cpp:1926 +#: src/OpenSSLUtils.cpp:2108 msgid "Cannot find the request subject." msgstr "Impossibile trovare il soggetto richiesto." -#: src/OpenSSLUtils.cpp:2087 +#: src/OpenSSLUtils.cpp:2269 msgid "Cannot find the certificate subject." msgstr "Impossibile trovare il soggetto certificato." -#: src/OpenSSLUtils.cpp:2186 +#: src/OpenSSLUtils.cpp:2368 msgid "Invalid caName: %1." msgstr "Nome CA non valido: %1." -#: src/OpenSSLUtils.cpp:2195 +#: src/OpenSSLUtils.cpp:2377 msgid "'%1' does not exist." msgstr "'%1' inesistente." -#: src/OpenSSLUtils.cpp:2205 +#: src/OpenSSLUtils.cpp:2387 msgid "%1 still exists." msgstr "%1 esiste ancora." -#: src/OpenSSLUtils.cpp:2216 src/OpenSSLUtils.cpp:2264 -#: src/OpenSSLUtils.cpp:2278 src/OpenSSLUtils.cpp:2292 -#: src/OpenSSLUtils.cpp:2306 src/OpenSSLUtils.cpp:2320 +#: src/OpenSSLUtils.cpp:2398 src/OpenSSLUtils.cpp:2446 +#: src/OpenSSLUtils.cpp:2460 src/OpenSSLUtils.cpp:2474 +#: src/OpenSSLUtils.cpp:2488 src/OpenSSLUtils.cpp:2502 msgid "Cannot create directory: %1 (%2 [%3])." msgstr "Impossibile creare la directory: %1 (%2 [%3])." -#: src/OpenSSLUtils.cpp:2251 +#: src/OpenSSLUtils.cpp:2433 msgid "Cannot copy the configuration template." msgstr "Impossibile copiare il modello di configurazione." -#: src/OpenSSLUtils.cpp:2338 +#: src/OpenSSLUtils.cpp:2520 msgid "Cannot create the file." msgstr "Impossibile creare il file." @@ -743,29 +762,29 @@ msgid "Invalid SubjectKeyIdentifierExt object." msgstr "Oggetto SubjectKeyIdentifierExt non valido." -#: src/X509v3CertificateExtensions_Priv.cpp:394 -#: src/X509v3CertificateExtensions_Priv.cpp:450 +#: src/X509v3CertificateExtensions_Priv.cpp:395 +#: src/X509v3CertificateExtensions_Priv.cpp:452 #: src/X509v3RequestExtensions_Priv.cpp:134 #: src/X509v3RequestExtensions_Priv.cpp:189 msgid "Extension occurred more than once: %1." msgstr "Estensione presente piÃ¹ volte: %1." -#: src/X509v3CertificateExtensions_Priv.cpp:401 -#: src/X509v3CertificateExtensions_Priv.cpp:457 +#: src/X509v3CertificateExtensions_Priv.cpp:402 +#: src/X509v3CertificateExtensions_Priv.cpp:459 #: src/X509v3RequestExtensions_Priv.cpp:141 #: src/X509v3RequestExtensions_Priv.cpp:196 msgid "Unable to parse the certificate (NID: %1 Crit: %2)." msgstr "" "Impossibile analizzare sintatticamente il certificato (NID: %1 Crit: %2)." -#: src/X509v3CertificateExtensions_Priv.cpp:509 -#: src/X509v3CertificateExtensions_Priv.cpp:575 -#: src/X509v3CertificateExtensions_Priv.cpp:639 -#: src/X509v3CertificateExtensions_Priv.cpp:701 -#: src/X509v3CertificateExtensions_Priv.cpp:771 -#: src/X509v3CertificateExtensions_Priv.cpp:840 -#: src/X509v3CertificateExtensions_Priv.cpp:916 -#: src/X509v3CertificateExtensions_Priv.cpp:1002 +#: src/X509v3CertificateExtensions_Priv.cpp:511 +#: src/X509v3CertificateExtensions_Priv.cpp:577 +#: src/X509v3CertificateExtensions_Priv.cpp:641 +#: src/X509v3CertificateExtensions_Priv.cpp:703 +#: src/X509v3CertificateExtensions_Priv.cpp:773 +#: src/X509v3CertificateExtensions_Priv.cpp:842 +#: src/X509v3CertificateExtensions_Priv.cpp:918 +#: src/X509v3CertificateExtensions_Priv.cpp:1004 #: src/X509v3CRLExtensions_Priv.cpp:135 #: src/X509v3RequestExtensions_Priv.cpp:249 #: src/X509v3RequestExtensions_Priv.cpp:315 @@ -774,14 +793,14 @@ msgid "Extension occurred more than once." msgstr "Estensione presente piÃ¹ volte." -#: src/X509v3CertificateExtensions_Priv.cpp:514 -#: src/X509v3CertificateExtensions_Priv.cpp:580 -#: src/X509v3CertificateExtensions_Priv.cpp:644 -#: src/X509v3CertificateExtensions_Priv.cpp:707 -#: src/X509v3CertificateExtensions_Priv.cpp:776 -#: src/X509v3CertificateExtensions_Priv.cpp:846 -#: src/X509v3CertificateExtensions_Priv.cpp:921 -#: src/X509v3CertificateExtensions_Priv.cpp:1007 +#: src/X509v3CertificateExtensions_Priv.cpp:516 +#: src/X509v3CertificateExtensions_Priv.cpp:582 +#: src/X509v3CertificateExtensions_Priv.cpp:646 +#: src/X509v3CertificateExtensions_Priv.cpp:709 +#: src/X509v3CertificateExtensions_Priv.cpp:778 +#: src/X509v3CertificateExtensions_Priv.cpp:848 +#: src/X509v3CertificateExtensions_Priv.cpp:923 +#: src/X509v3CertificateExtensions_Priv.cpp:1009 #: src/X509v3CRLExtensions_Priv.cpp:140 #: src/X509v3RequestExtensions_Priv.cpp:254 #: src/X509v3RequestExtensions_Priv.cpp:320 @@ -790,7 +809,7 @@ msgid "Unable to parse the certificate (Crit: %1)." msgstr "Impossibile analizzare sintatticamente il certificato (Crit: %1)." -#: src/X509v3CertificateExtensions_Priv.cpp:941 +#: src/X509v3CertificateExtensions_Priv.cpp:943 msgid "Invalid location in authorityInfoAccess." msgstr "Ubicazione non valida in authorityInfoAccess." @@ -923,3 +942,6 @@ #: src/X509v3RequestExtensions.cpp:231 msgid "Invalid value for X509v3RequestExts::setSubjectAlternativeName." msgstr "Valore non valido per X509v3RequestExts::setSubjectAlternativeName." + +#~ msgid "Command returned '%1' : %2" +#~ msgstr "Comando restituito '%1' : %2" Modified: limal-head/limal-ca-mgm/po/ja.po URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/po/ja.po?rev=… ============================================================================== --- limal-head/limal-ca-mgm/po/ja.po (original) +++ limal-head/limal-ca-mgm/po/ja.po Mon Oct 29 11:30:37 2007 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: limal-ca-mgm\n" "Report-Msgid-Bugs-To: translation(a)suse.de\n" -"POT-Creation-Date: 2007-09-28 16:31+0200\n" +"POT-Creation-Date: 2007-10-29 11:25+0100\n" "PO-Revision-Date: 2006-11-20 11:36\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" @@ -25,8 +25,8 @@ #: src/AuthorityInfoAccessExtension.cpp:259 #: src/AuthorityInfoAccessExtension.cpp:342 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:87 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:194 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:86 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:193 #: src/BasicConstraintsExtension.cpp:84 src/BasicConstraintsExtension.cpp:187 #: src/BitExtensions.cpp:134 src/BitExtensions.cpp:247 #: src/BitExtensions.cpp:374 src/BitExtensions.cpp:482 src/CA.cpp:1565 @@ -73,12 +73,12 @@ msgid "AuthorityKeyIdentifierExt is not present." msgstr "AuthorityKeyIdentifierExtã¯åå¨ãã¾ããã" -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:155 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:174 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:154 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:173 msgid "AuthorityKeyIdentifierGenerateExt is not present." msgstr "AuthorityKeyIdentifierGenerateExtãåå¨ãã¾ããã" -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:186 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:185 msgid "Invalid AuthorityKeyIdentifierGenerateExt object." msgstr "AuthorityKeyIdentifierGenerateExtãªãã¸ã§ã¯ããç¡å¹ã§ãã" @@ -198,7 +198,7 @@ msgid "Duplicate DN. Request already exists." msgstr "éè¤ããDNè¦æ±ããã§ã«åå¨ãã¾ãã" -#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:968 +#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:1007 msgid "Cannot parse the certificate name." msgstr "è¨¼ææ¸åãè§£æãããã¨ãã§ãã¾ããã" @@ -534,93 +534,112 @@ msgid "Invalid command %1." msgstr "ç¡å¹ãªã³ãã³ã %1 ã§ãã" -#: src/OpenSSLUtils.cpp:138 src/OpenSSLUtils.cpp:241 src/OpenSSLUtils.cpp:334 -#: src/OpenSSLUtils.cpp:453 src/OpenSSLUtils.cpp:586 src/OpenSSLUtils.cpp:681 -#: src/OpenSSLUtils.cpp:761 -msgid "Command returned '%1' : %2" -msgstr "ã³ãã³ãã¯ã%1ããè¿ãã¾ãã: %2" +#: src/OpenSSLUtils.cpp:132 src/OpenSSLUtils.cpp:240 src/OpenSSLUtils.cpp:338 +#: src/OpenSSLUtils.cpp:462 src/OpenSSLUtils.cpp:600 src/OpenSSLUtils.cpp:700 +#: src/OpenSSLUtils.cpp:782 src/OpenSSLUtils.cpp:871 src/OpenSSLUtils.cpp:952 +#: src/OpenSSLUtils.cpp:1051 src/OpenSSLUtils.cpp:1137 +#: src/OpenSSLUtils.cpp:1271 src/OpenSSLUtils.cpp:1390 +#: src/OpenSSLUtils.cpp:1493 src/OpenSSLUtils.cpp:1645 +#: src/OpenSSLUtils.cpp:1782 +msgid "Executing openssl command failed." +msgstr "" + +#: src/OpenSSLUtils.cpp:143 src/OpenSSLUtils.cpp:251 src/OpenSSLUtils.cpp:349 +#: src/OpenSSLUtils.cpp:473 src/OpenSSLUtils.cpp:611 src/OpenSSLUtils.cpp:711 +#: src/OpenSSLUtils.cpp:796 src/OpenSSLUtils.cpp:1162 +#: src/OpenSSLUtils.cpp:1311 src/OpenSSLUtils.cpp:1415 +#: src/OpenSSLUtils.cpp:1518 src/OpenSSLUtils.cpp:1682 +#: src/OpenSSLUtils.cpp:1822 +msgid "openssl command failed: %1" +msgstr "" -#: src/OpenSSLUtils.cpp:171 src/OpenSSLUtils.cpp:268 src/OpenSSLUtils.cpp:366 -#: src/OpenSSLUtils.cpp:479 src/OpenSSLUtils.cpp:613 src/OpenSSLUtils.cpp:704 +#: src/OpenSSLUtils.cpp:176 src/OpenSSLUtils.cpp:278 src/OpenSSLUtils.cpp:381 +#: src/OpenSSLUtils.cpp:499 src/OpenSSLUtils.cpp:638 src/OpenSSLUtils.cpp:734 msgid "No valid key file specified." msgstr "æå¹ãªãã¼ãã¡ã¤ã«ãæå®ããã¦ãã¾ããã" -#: src/OpenSSLUtils.cpp:276 src/OpenSSLUtils.cpp:374 +#: src/OpenSSLUtils.cpp:286 src/OpenSSLUtils.cpp:389 msgid "No valid request file specified." msgstr "æå¹ãªè¦æ±ãã¡ã¤ã«ãæå®ããã¦ãã¾ããã" -#: src/OpenSSLUtils.cpp:487 src/OpenSSLUtils.cpp:621 src/OpenSSLUtils.cpp:712 +#: src/OpenSSLUtils.cpp:507 src/OpenSSLUtils.cpp:646 src/OpenSSLUtils.cpp:742 msgid "No valid CA certificate file specified." msgstr "æå¹ãªCAè¨¼ææ¸ã®ãã¡ã¤ã«ãæå®ããã¦ãã¾ããã" -#: src/OpenSSLUtils.cpp:495 src/OpenSSLUtils.cpp:785 +#: src/OpenSSLUtils.cpp:515 src/OpenSSLUtils.cpp:820 msgid "No valid certificate file specified." msgstr "æå¹ãªè¨¼ææ¸ãã¡ã¤ã«ãæå®ããã¦ãã¾ããã" -#: src/OpenSSLUtils.cpp:793 +#: src/OpenSSLUtils.cpp:828 msgid "No valid CA directory specified." msgstr "æå¹ãªCAãã£ã¬ã¯ããªãæå®ããã¦ãã¾ããã" -#: src/OpenSSLUtils.cpp:943 +#: src/OpenSSLUtils.cpp:982 msgid "Showing certificate status with serial %1 failed (%2)." msgstr "ã·ãªã¢ã« %1 ã«ããè¨¼ææ¸ã®ã¹ãã¼ã¿ã¹ã®è¡¨ç¤ºã«å¤±æãã¾ãã(%2)ã" -#: src/OpenSSLUtils.cpp:979 +#: src/OpenSSLUtils.cpp:1018 msgid "The key file does not exist." msgstr "ãã¼ãã¡ã¤ã«ãåå¨ãã¦ãã¾ããã" -#: src/OpenSSLUtils.cpp:1474 +#: src/OpenSSLUtils.cpp:1306 src/OpenSSLUtils.cpp:1677 +#: src/OpenSSLUtils.cpp:1817 +#, fuzzy +msgid "Invalid password." +msgstr "CAãã¹ã¯ã¼ããç¡å¹ã§ãã" + +#: src/OpenSSLUtils.cpp:1595 msgid "The password for encrypting the output is required." msgstr "åºåãæå·åããããã®ãã¹ã¯ã¼ããå¿è¦ã§ãã" -#: src/OpenSSLUtils.cpp:1579 +#: src/OpenSSLUtils.cpp:1736 msgid "The PKCS12 password is required." msgstr "PKCS12ãã¹ã¯ã¼ããå¿è¦ã§ãã" -#: src/OpenSSLUtils.cpp:1665 src/OpenSSLUtils.cpp:1865 -#: src/OpenSSLUtils.cpp:2017 +#: src/OpenSSLUtils.cpp:1847 src/OpenSSLUtils.cpp:2047 +#: src/OpenSSLUtils.cpp:2199 msgid "Cannot read directory: %1 (%2) [%3]." msgstr "æ¬¡ã®ãã£ã¬ã¯ããªãèªãã¾ãã: %1 (%2) [%3]." -#: src/OpenSSLUtils.cpp:1715 +#: src/OpenSSLUtils.cpp:1897 msgid "No serial number found in %1." msgstr "%1 ã«ã·ãªã¢ã«çªå·ãããã¾ããã" -#: src/OpenSSLUtils.cpp:1735 +#: src/OpenSSLUtils.cpp:1917 msgid "The request already exists." msgstr "ãã®ãªã¯ã¨ã¹ãã¯ãã§ã«åå¨ãã¦ãã¾ãã" -#: src/OpenSSLUtils.cpp:1926 +#: src/OpenSSLUtils.cpp:2108 msgid "Cannot find the request subject." msgstr "ãªã¯ã¨ã¹ããµãã¸ã§ã¯ããè¦ã¤ããã¾ããã" -#: src/OpenSSLUtils.cpp:2087 +#: src/OpenSSLUtils.cpp:2269 msgid "Cannot find the certificate subject." msgstr "è¨¼ææ¸ãµãã¸ã§ã¯ããè¦ã¤ããã¾ããã" -#: src/OpenSSLUtils.cpp:2186 +#: src/OpenSSLUtils.cpp:2368 msgid "Invalid caName: %1." msgstr "ä¸æ£ãªcaName: %1." -#: src/OpenSSLUtils.cpp:2195 +#: src/OpenSSLUtils.cpp:2377 msgid "'%1' does not exist." msgstr "'%1 ã¯åå¨ãã¾ããã" -#: src/OpenSSLUtils.cpp:2205 +#: src/OpenSSLUtils.cpp:2387 msgid "%1 still exists." msgstr "%1 ãåå¨ãã¦ãã¾ãã" -#: src/OpenSSLUtils.cpp:2216 src/OpenSSLUtils.cpp:2264 -#: src/OpenSSLUtils.cpp:2278 src/OpenSSLUtils.cpp:2292 -#: src/OpenSSLUtils.cpp:2306 src/OpenSSLUtils.cpp:2320 +#: src/OpenSSLUtils.cpp:2398 src/OpenSSLUtils.cpp:2446 +#: src/OpenSSLUtils.cpp:2460 src/OpenSSLUtils.cpp:2474 +#: src/OpenSSLUtils.cpp:2488 src/OpenSSLUtils.cpp:2502 msgid "Cannot create directory: %1 (%2 [%3])." msgstr "æ¬¡ã®ãã£ã¬ã¯ããªãä½æã§ãã¾ãã: %1 (%2 [%3])." -#: src/OpenSSLUtils.cpp:2251 +#: src/OpenSSLUtils.cpp:2433 msgid "Cannot copy the configuration template." msgstr "ç°å¢è¨å®ãã³ãã¬ã¼ããã³ãã¼ã§ãã¾ããã" -#: src/OpenSSLUtils.cpp:2338 +#: src/OpenSSLUtils.cpp:2520 msgid "Cannot create the file." msgstr "ãã¡ã¤ã«ãä½æã§ãã¾ããã" @@ -739,28 +758,28 @@ msgid "Invalid SubjectKeyIdentifierExt object." msgstr "ç¡å¹ãªSubjectKeyIdentifierExtãªãã¸ã§ã¯ãã" -#: src/X509v3CertificateExtensions_Priv.cpp:394 -#: src/X509v3CertificateExtensions_Priv.cpp:450 +#: src/X509v3CertificateExtensions_Priv.cpp:395 +#: src/X509v3CertificateExtensions_Priv.cpp:452 #: src/X509v3RequestExtensions_Priv.cpp:134 #: src/X509v3RequestExtensions_Priv.cpp:189 msgid "Extension occurred more than once: %1." msgstr "æ¡å¼µæ©è½ãè¤æ°åçºçãã¦ãã¾ã: %1." -#: src/X509v3CertificateExtensions_Priv.cpp:401 -#: src/X509v3CertificateExtensions_Priv.cpp:457 +#: src/X509v3CertificateExtensions_Priv.cpp:402 +#: src/X509v3CertificateExtensions_Priv.cpp:459 #: src/X509v3RequestExtensions_Priv.cpp:141 #: src/X509v3RequestExtensions_Priv.cpp:196 msgid "Unable to parse the certificate (NID: %1 Crit: %2)." msgstr "è¨¼ææ¸ãè§£æã§ãã¾ãã(NID: %1 Crit: %2)ã" -#: src/X509v3CertificateExtensions_Priv.cpp:509 -#: src/X509v3CertificateExtensions_Priv.cpp:575 -#: src/X509v3CertificateExtensions_Priv.cpp:639 -#: src/X509v3CertificateExtensions_Priv.cpp:701 -#: src/X509v3CertificateExtensions_Priv.cpp:771 -#: src/X509v3CertificateExtensions_Priv.cpp:840 -#: src/X509v3CertificateExtensions_Priv.cpp:916 -#: src/X509v3CertificateExtensions_Priv.cpp:1002 +#: src/X509v3CertificateExtensions_Priv.cpp:511 +#: src/X509v3CertificateExtensions_Priv.cpp:577 +#: src/X509v3CertificateExtensions_Priv.cpp:641 +#: src/X509v3CertificateExtensions_Priv.cpp:703 +#: src/X509v3CertificateExtensions_Priv.cpp:773 +#: src/X509v3CertificateExtensions_Priv.cpp:842 +#: src/X509v3CertificateExtensions_Priv.cpp:918 +#: src/X509v3CertificateExtensions_Priv.cpp:1004 #: src/X509v3CRLExtensions_Priv.cpp:135 #: src/X509v3RequestExtensions_Priv.cpp:249 #: src/X509v3RequestExtensions_Priv.cpp:315 @@ -769,14 +788,14 @@ msgid "Extension occurred more than once." msgstr "æ¡å¼µæ©è½ãè¤æ°åçºçãã¦ãã¾ãã" -#: src/X509v3CertificateExtensions_Priv.cpp:514 -#: src/X509v3CertificateExtensions_Priv.cpp:580 -#: src/X509v3CertificateExtensions_Priv.cpp:644 -#: src/X509v3CertificateExtensions_Priv.cpp:707 -#: src/X509v3CertificateExtensions_Priv.cpp:776 -#: src/X509v3CertificateExtensions_Priv.cpp:846 -#: src/X509v3CertificateExtensions_Priv.cpp:921 -#: src/X509v3CertificateExtensions_Priv.cpp:1007 +#: src/X509v3CertificateExtensions_Priv.cpp:516 +#: src/X509v3CertificateExtensions_Priv.cpp:582 +#: src/X509v3CertificateExtensions_Priv.cpp:646 +#: src/X509v3CertificateExtensions_Priv.cpp:709 +#: src/X509v3CertificateExtensions_Priv.cpp:778 +#: src/X509v3CertificateExtensions_Priv.cpp:848 +#: src/X509v3CertificateExtensions_Priv.cpp:923 +#: src/X509v3CertificateExtensions_Priv.cpp:1009 #: src/X509v3CRLExtensions_Priv.cpp:140 #: src/X509v3RequestExtensions_Priv.cpp:254 #: src/X509v3RequestExtensions_Priv.cpp:320 @@ -785,7 +804,7 @@ msgid "Unable to parse the certificate (Crit: %1)." msgstr "è¨¼ææ¸ãè§£æã§ãã¾ãã(Crit: %1)ã" -#: src/X509v3CertificateExtensions_Priv.cpp:941 +#: src/X509v3CertificateExtensions_Priv.cpp:943 msgid "Invalid location in authorityInfoAccess." msgstr "authorityInfoAccessåã«ç¡å¹ãªå ´æãããã¾ãã" @@ -908,3 +927,6 @@ #: src/X509v3RequestExtensions.cpp:231 msgid "Invalid value for X509v3RequestExts::setSubjectAlternativeName." msgstr "X509v3RequestExts::setSubjectAlternativeNameã®å¤ãç¡å¹ã§ãã" + +#~ msgid "Command returned '%1' : %2" +#~ msgstr "ã³ãã³ãã¯ã%1ããè¿ãã¾ãã: %2" Modified: limal-head/limal-ca-mgm/po/km.po URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/po/km.po?rev=… ============================================================================== --- limal-head/limal-ca-mgm/po/km.po (original) +++ limal-head/limal-ca-mgm/po/km.po Mon Oct 29 11:30:37 2007 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: limal-ca-mgm\n" "Report-Msgid-Bugs-To: translation(a)suse.de\n" -"POT-Creation-Date: 2007-09-28 16:31+0200\n" +"POT-Creation-Date: 2007-10-29 11:25+0100\n" "PO-Revision-Date: 2007-05-25 10:07+0700\n" "Last-Translator: Auk Piseth <piseth_dv(a)khmeros.info>\n" "Language-Team: Khmer <en(a)li.org>\n" @@ -34,8 +34,8 @@ #: src/AuthorityInfoAccessExtension.cpp:259 #: src/AuthorityInfoAccessExtension.cpp:342 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:87 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:194 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:86 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:193 #: src/BasicConstraintsExtension.cpp:84 src/BasicConstraintsExtension.cpp:187 #: src/BitExtensions.cpp:134 src/BitExtensions.cpp:247 #: src/BitExtensions.cpp:374 src/BitExtensions.cpp:482 src/CA.cpp:1565 @@ -82,12 +82,12 @@ msgid "AuthorityKeyIdentifierExt is not present." msgstr "áá·áâáá¶áâáááá á¶á AuthorityKeyIdentifierExt ááÂ á" -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:155 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:174 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:154 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:173 msgid "AuthorityKeyIdentifierGenerateExt is not present." msgstr "áá·áâáá¶áâáááá á¶á AuthorityKeyIdentifierGenerateExt ááÂ á" -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:186 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:185 msgid "Invalid AuthorityKeyIdentifierGenerateExt object." msgstr "ááááá» AuthorityKeyIdentifierGenerateExt áá·áâáááá¹ááááá¼áâÂ á" @@ -207,7 +207,7 @@ msgid "Duplicate DN. Request already exists." msgstr "ááááá DNÂ á áá¶áâáááá¾âáá½áâá á¾áÂ á" -#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:968 +#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:1007 msgid "Cannot parse the certificate name." msgstr "áá·áâá¢á¶áâáááâáááááâáá·áááá¶âááááááâáá¶áâááÂ á" @@ -542,93 +542,112 @@ msgid "Invalid command %1." msgstr "áá¶áááâááááá¶ %1 áá·áâáááá¹áâáááá¼áÂ á" -#: src/OpenSSLUtils.cpp:138 src/OpenSSLUtils.cpp:241 src/OpenSSLUtils.cpp:334 -#: src/OpenSSLUtils.cpp:453 src/OpenSSLUtils.cpp:586 src/OpenSSLUtils.cpp:681 -#: src/OpenSSLUtils.cpp:761 -msgid "Command returned '%1' : %2" -msgstr "áá¶áááâááááá¶âáá¶áâáááá¡áá '%1'Â á %2" +#: src/OpenSSLUtils.cpp:132 src/OpenSSLUtils.cpp:240 src/OpenSSLUtils.cpp:338 +#: src/OpenSSLUtils.cpp:462 src/OpenSSLUtils.cpp:600 src/OpenSSLUtils.cpp:700 +#: src/OpenSSLUtils.cpp:782 src/OpenSSLUtils.cpp:871 src/OpenSSLUtils.cpp:952 +#: src/OpenSSLUtils.cpp:1051 src/OpenSSLUtils.cpp:1137 +#: src/OpenSSLUtils.cpp:1271 src/OpenSSLUtils.cpp:1390 +#: src/OpenSSLUtils.cpp:1493 src/OpenSSLUtils.cpp:1645 +#: src/OpenSSLUtils.cpp:1782 +msgid "Executing openssl command failed." +msgstr "" + +#: src/OpenSSLUtils.cpp:143 src/OpenSSLUtils.cpp:251 src/OpenSSLUtils.cpp:349 +#: src/OpenSSLUtils.cpp:473 src/OpenSSLUtils.cpp:611 src/OpenSSLUtils.cpp:711 +#: src/OpenSSLUtils.cpp:796 src/OpenSSLUtils.cpp:1162 +#: src/OpenSSLUtils.cpp:1311 src/OpenSSLUtils.cpp:1415 +#: src/OpenSSLUtils.cpp:1518 src/OpenSSLUtils.cpp:1682 +#: src/OpenSSLUtils.cpp:1822 +msgid "openssl command failed: %1" +msgstr "" -#: src/OpenSSLUtils.cpp:171 src/OpenSSLUtils.cpp:268 src/OpenSSLUtils.cpp:366 -#: src/OpenSSLUtils.cpp:479 src/OpenSSLUtils.cpp:613 src/OpenSSLUtils.cpp:704 +#: src/OpenSSLUtils.cpp:176 src/OpenSSLUtils.cpp:278 src/OpenSSLUtils.cpp:381 +#: src/OpenSSLUtils.cpp:499 src/OpenSSLUtils.cpp:638 src/OpenSSLUtils.cpp:734 msgid "No valid key file specified." msgstr "áááá¶áâá¯ááá¶áâáááâáááâáá¶áâááááá¶ááâáááá¹ááááá¼áâááÂ á" -#: src/OpenSSLUtils.cpp:276 src/OpenSSLUtils.cpp:374 +#: src/OpenSSLUtils.cpp:286 src/OpenSSLUtils.cpp:389 msgid "No valid request file specified." msgstr "áááá¶áâá¯ááá¶áâáááá¾âáááâáá¶áâááááá¶ááâáááá¹ááááá¼áâááÂ á" -#: src/OpenSSLUtils.cpp:487 src/OpenSSLUtils.cpp:621 src/OpenSSLUtils.cpp:712 +#: src/OpenSSLUtils.cpp:507 src/OpenSSLUtils.cpp:646 src/OpenSSLUtils.cpp:742 msgid "No valid CA certificate file specified." msgstr "áááá¶áâá¯ááá¶áâáá·áááá¶âáááááá CA áááâáá¶áâááááá¶ááâáááá¹ááááá¼áâááÂ á" -#: src/OpenSSLUtils.cpp:495 src/OpenSSLUtils.cpp:785 +#: src/OpenSSLUtils.cpp:515 src/OpenSSLUtils.cpp:820 msgid "No valid certificate file specified." msgstr "áááá¶áâá¯ááá¶áâáá·áááá¶âááááááâáááâáá¶áâááááá¶ááâáááá¹ááááá¼áâááÂ á" -#: src/OpenSSLUtils.cpp:793 +#: src/OpenSSLUtils.cpp:828 msgid "No valid CA directory specified." msgstr "áááá¶áâáá CA áááâáá¶áâááááá¶ááâáááá¹ááááá¼áâááÂ á" -#: src/OpenSSLUtils.cpp:943 +#: src/OpenSSLUtils.cpp:982 msgid "Showing certificate status with serial %1 failed (%2)." msgstr "áá¶áâáááá á¶áâáááá¶ááá¶áâáá·áááá¶âááááááâáá¶áá½áâáá¹áâááááá %1 áá¶áâááá¶ááá (%2)Â á" -#: src/OpenSSLUtils.cpp:979 +#: src/OpenSSLUtils.cpp:1018 msgid "The key file does not exist." msgstr "áá·ááá¶áâá¯ááá¶áâáááâááÂ á" -#: src/OpenSSLUtils.cpp:1474 +#: src/OpenSSLUtils.cpp:1306 src/OpenSSLUtils.cpp:1677 +#: src/OpenSSLUtils.cpp:1817 +#, fuzzy +msgid "Invalid password." +msgstr "áá¶áááâááááá¶áá CA áá·áâáááá¹ááááá¼áâÂ á" + +#: src/OpenSSLUtils.cpp:1595 msgid "The password for encrypting the output is required." msgstr "áá¶áâáá¶ááá¶áâáá¶áááâááááá¶ááâááááá¶ááâáá¶áâá¢áá·ááááá¸áâááááááÂ á" -#: src/OpenSSLUtils.cpp:1579 +#: src/OpenSSLUtils.cpp:1736 msgid "The PKCS12 password is required." msgstr "áá¶áâáá¶ááá¶áâáá¶áááâááááá¶áá PKCS12Â á" -#: src/OpenSSLUtils.cpp:1665 src/OpenSSLUtils.cpp:1865 -#: src/OpenSSLUtils.cpp:2017 +#: src/OpenSSLUtils.cpp:1847 src/OpenSSLUtils.cpp:2047 +#: src/OpenSSLUtils.cpp:2199 msgid "Cannot read directory: %1 (%2) [%3]." msgstr "áá·áâá¢á¶áâá¢á¶áâááÂ á %1 (%2) [%3]Â á" -#: src/OpenSSLUtils.cpp:1715 +#: src/OpenSSLUtils.cpp:1897 msgid "No serial number found in %1." msgstr "ááâáá·ááá¾áâáááâááááá¶ááâáááááá»á %1 á¡á¾áÂ á" -#: src/OpenSSLUtils.cpp:1735 +#: src/OpenSSLUtils.cpp:1917 msgid "The request already exists." msgstr "áá¶áâáááá¾âáá½áâá á¾áÂ á" -#: src/OpenSSLUtils.cpp:1926 +#: src/OpenSSLUtils.cpp:2108 msgid "Cannot find the request subject." msgstr "áá·áá¢á¶áâááâáá¾áâááááá¶áááâáááá¾âáá¶áâááÂ á" -#: src/OpenSSLUtils.cpp:2087 +#: src/OpenSSLUtils.cpp:2269 msgid "Cannot find the certificate subject." msgstr "áá·áâá¢á¶áâááâáá¾áâááááá¶áááâáá·áááá¶ááááááâáá¶áâááÂ á" -#: src/OpenSSLUtils.cpp:2186 +#: src/OpenSSLUtils.cpp:2368 msgid "Invalid caName: %1." msgstr "caName áá·áâáááá¹ááááá¼áÂ á %1Â á" -#: src/OpenSSLUtils.cpp:2195 +#: src/OpenSSLUtils.cpp:2377 msgid "'%1' does not exist." msgstr "áá·ááá¶áâ '%1' ááÂ á" -#: src/OpenSSLUtils.cpp:2205 +#: src/OpenSSLUtils.cpp:2387 msgid "%1 still exists." msgstr "ááâááâáá¶á %1Â á" -#: src/OpenSSLUtils.cpp:2216 src/OpenSSLUtils.cpp:2264 -#: src/OpenSSLUtils.cpp:2278 src/OpenSSLUtils.cpp:2292 -#: src/OpenSSLUtils.cpp:2306 src/OpenSSLUtils.cpp:2320 +#: src/OpenSSLUtils.cpp:2398 src/OpenSSLUtils.cpp:2446 +#: src/OpenSSLUtils.cpp:2460 src/OpenSSLUtils.cpp:2474 +#: src/OpenSSLUtils.cpp:2488 src/OpenSSLUtils.cpp:2502 msgid "Cannot create directory: %1 (%2 [%3])." msgstr "áá·áâá¢á¶áâááááá¾áâááÂ á %1 (%2 [%3])Â á" -#: src/OpenSSLUtils.cpp:2251 +#: src/OpenSSLUtils.cpp:2433 msgid "Cannot copy the configuration template." msgstr "áá·áâá¢á¶áâáááááâáá»áááâáááááâáááá¶âááááááááâáá¶áâá¡á¾áÂ á" -#: src/OpenSSLUtils.cpp:2338 +#: src/OpenSSLUtils.cpp:2520 msgid "Cannot create the file." msgstr "áá·áâá¢á¶áâááááá¾áâá¯ááá¶áâáá¶áâá¡á¾áÂ á" @@ -747,28 +766,28 @@ msgid "Invalid SubjectKeyIdentifierExt object." msgstr "ááááá» SubjectKeyIdentifierExt áá·áâáááá¹ááááá¼áÂ á" -#: src/X509v3CertificateExtensions_Priv.cpp:394 -#: src/X509v3CertificateExtensions_Priv.cpp:450 +#: src/X509v3CertificateExtensions_Priv.cpp:395 +#: src/X509v3CertificateExtensions_Priv.cpp:452 #: src/X509v3RequestExtensions_Priv.cpp:134 #: src/X509v3RequestExtensions_Priv.cpp:189 msgid "Extension occurred more than once: %1." msgstr "áááááâááááááâáá¶áâáá¾áá¡á¾áâáááá¾áááÂ á %1Â á" -#: src/X509v3CertificateExtensions_Priv.cpp:401 -#: src/X509v3CertificateExtensions_Priv.cpp:457 +#: src/X509v3CertificateExtensions_Priv.cpp:402 +#: src/X509v3CertificateExtensions_Priv.cpp:459 #: src/X509v3RequestExtensions_Priv.cpp:141 #: src/X509v3RequestExtensions_Priv.cpp:196 msgid "Unable to parse the certificate (NID: %1 Crit: %2)." msgstr "áá·áâá¢á¶áâáááâáá·áááá¶âáááááá (NIDÂ á %1 CritÂ á %2)Â áá¶áááÂ á" -#: src/X509v3CertificateExtensions_Priv.cpp:509 -#: src/X509v3CertificateExtensions_Priv.cpp:575 -#: src/X509v3CertificateExtensions_Priv.cpp:639 -#: src/X509v3CertificateExtensions_Priv.cpp:701 -#: src/X509v3CertificateExtensions_Priv.cpp:771 -#: src/X509v3CertificateExtensions_Priv.cpp:840 -#: src/X509v3CertificateExtensions_Priv.cpp:916 -#: src/X509v3CertificateExtensions_Priv.cpp:1002 +#: src/X509v3CertificateExtensions_Priv.cpp:511 +#: src/X509v3CertificateExtensions_Priv.cpp:577 +#: src/X509v3CertificateExtensions_Priv.cpp:641 +#: src/X509v3CertificateExtensions_Priv.cpp:703 +#: src/X509v3CertificateExtensions_Priv.cpp:773 +#: src/X509v3CertificateExtensions_Priv.cpp:842 +#: src/X509v3CertificateExtensions_Priv.cpp:918 +#: src/X509v3CertificateExtensions_Priv.cpp:1004 #: src/X509v3CRLExtensions_Priv.cpp:135 #: src/X509v3RequestExtensions_Priv.cpp:249 #: src/X509v3RequestExtensions_Priv.cpp:315 @@ -777,14 +796,14 @@ msgid "Extension occurred more than once." msgstr "áááááâááááááâáá¶áâáá¾áâá¡á¾áâáááá¾áâááÂ á" -#: src/X509v3CertificateExtensions_Priv.cpp:514 -#: src/X509v3CertificateExtensions_Priv.cpp:580 -#: src/X509v3CertificateExtensions_Priv.cpp:644 -#: src/X509v3CertificateExtensions_Priv.cpp:707 -#: src/X509v3CertificateExtensions_Priv.cpp:776 -#: src/X509v3CertificateExtensions_Priv.cpp:846 -#: src/X509v3CertificateExtensions_Priv.cpp:921 -#: src/X509v3CertificateExtensions_Priv.cpp:1007 +#: src/X509v3CertificateExtensions_Priv.cpp:516 +#: src/X509v3CertificateExtensions_Priv.cpp:582 +#: src/X509v3CertificateExtensions_Priv.cpp:646 +#: src/X509v3CertificateExtensions_Priv.cpp:709 +#: src/X509v3CertificateExtensions_Priv.cpp:778 +#: src/X509v3CertificateExtensions_Priv.cpp:848 +#: src/X509v3CertificateExtensions_Priv.cpp:923 +#: src/X509v3CertificateExtensions_Priv.cpp:1009 #: src/X509v3CRLExtensions_Priv.cpp:140 #: src/X509v3RequestExtensions_Priv.cpp:254 #: src/X509v3RequestExtensions_Priv.cpp:320 @@ -793,7 +812,7 @@ msgid "Unable to parse the certificate (Crit: %1)." msgstr "áá·áâá¢á¶áâáááâáá·áááá¶âáááááá (CritÂ á %1) áá¶áááÂ á" -#: src/X509v3CertificateExtensions_Priv.cpp:941 +#: src/X509v3CertificateExtensions_Priv.cpp:943 msgid "Invalid location in authorityInfoAccess." msgstr "áá¸áá¶ááâáá·áâáááá¹ááááá¼áâááâáááá»á authorityInfoAccessÂ á" @@ -921,3 +940,6 @@ #: src/X509v3RequestExtensions.cpp:231 msgid "Invalid value for X509v3RequestExts::setSubjectAlternativeName." msgstr "áááááâáá·ááááá¹ááááá¼áâááááá¶áá X509v3RequestExts::setSubjectAlternativeNameÂ á" + +#~ msgid "Command returned '%1' : %2" +#~ msgstr "áá¶áááâááááá¶âáá¶áâáááá¡áá '%1'Â á %2" Modified: limal-head/limal-ca-mgm/po/lt.po URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/po/lt.po?rev=… ============================================================================== --- limal-head/limal-ca-mgm/po/lt.po (original) +++ limal-head/limal-ca-mgm/po/lt.po Mon Oct 29 11:30:37 2007 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: @PACKAGE@\n" "Report-Msgid-Bugs-To: translation(a)suse.de\n" -"POT-Creation-Date: 2007-09-28 16:31+0200\n" +"POT-Creation-Date: 2007-10-29 11:25+0100\n" "PO-Revision-Date: 2007-03-25 16:32+0300\n" "Last-Translator: Andrius Å tikonas <stikonas(a)gmail.com>\n" "Language-Team: Lithuanian <i18n(a)suse.de>\n" @@ -27,8 +27,8 @@ #: src/AuthorityInfoAccessExtension.cpp:259 #: src/AuthorityInfoAccessExtension.cpp:342 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:87 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:194 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:86 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:193 #: src/BasicConstraintsExtension.cpp:84 src/BasicConstraintsExtension.cpp:187 #: src/BitExtensions.cpp:134 src/BitExtensions.cpp:247 #: src/BitExtensions.cpp:374 src/BitExtensions.cpp:482 src/CA.cpp:1565 @@ -75,12 +75,12 @@ msgid "AuthorityKeyIdentifierExt is not present." msgstr "" -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:155 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:174 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:154 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:173 msgid "AuthorityKeyIdentifierGenerateExt is not present." msgstr "" -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:186 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:185 msgid "Invalid AuthorityKeyIdentifierGenerateExt object." msgstr "Klaidingas AuthorityKeyIdentifierGenerateExt objektas." @@ -202,7 +202,7 @@ msgid "Duplicate DN. Request already exists." msgstr "" -#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:968 +#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:1007 msgid "Cannot parse the certificate name." msgstr "Nepavyksta iÅ¡nagrinÄti sertifikato pavadinimo." @@ -544,97 +544,116 @@ msgid "Invalid command %1." msgstr "Bloga komanda %1." -#: src/OpenSSLUtils.cpp:138 src/OpenSSLUtils.cpp:241 src/OpenSSLUtils.cpp:334 -#: src/OpenSSLUtils.cpp:453 src/OpenSSLUtils.cpp:586 src/OpenSSLUtils.cpp:681 -#: src/OpenSSLUtils.cpp:761 -msgid "Command returned '%1' : %2" +#: src/OpenSSLUtils.cpp:132 src/OpenSSLUtils.cpp:240 src/OpenSSLUtils.cpp:338 +#: src/OpenSSLUtils.cpp:462 src/OpenSSLUtils.cpp:600 src/OpenSSLUtils.cpp:700 +#: src/OpenSSLUtils.cpp:782 src/OpenSSLUtils.cpp:871 src/OpenSSLUtils.cpp:952 +#: src/OpenSSLUtils.cpp:1051 src/OpenSSLUtils.cpp:1137 +#: src/OpenSSLUtils.cpp:1271 src/OpenSSLUtils.cpp:1390 +#: src/OpenSSLUtils.cpp:1493 src/OpenSSLUtils.cpp:1645 +#: src/OpenSSLUtils.cpp:1782 +msgid "Executing openssl command failed." +msgstr "" + +#: src/OpenSSLUtils.cpp:143 src/OpenSSLUtils.cpp:251 src/OpenSSLUtils.cpp:349 +#: src/OpenSSLUtils.cpp:473 src/OpenSSLUtils.cpp:611 src/OpenSSLUtils.cpp:711 +#: src/OpenSSLUtils.cpp:796 src/OpenSSLUtils.cpp:1162 +#: src/OpenSSLUtils.cpp:1311 src/OpenSSLUtils.cpp:1415 +#: src/OpenSSLUtils.cpp:1518 src/OpenSSLUtils.cpp:1682 +#: src/OpenSSLUtils.cpp:1822 +msgid "openssl command failed: %1" msgstr "" -#: src/OpenSSLUtils.cpp:171 src/OpenSSLUtils.cpp:268 src/OpenSSLUtils.cpp:366 -#: src/OpenSSLUtils.cpp:479 src/OpenSSLUtils.cpp:613 src/OpenSSLUtils.cpp:704 +#: src/OpenSSLUtils.cpp:176 src/OpenSSLUtils.cpp:278 src/OpenSSLUtils.cpp:381 +#: src/OpenSSLUtils.cpp:499 src/OpenSSLUtils.cpp:638 src/OpenSSLUtils.cpp:734 msgid "No valid key file specified." msgstr "" -#: src/OpenSSLUtils.cpp:276 src/OpenSSLUtils.cpp:374 +#: src/OpenSSLUtils.cpp:286 src/OpenSSLUtils.cpp:389 msgid "No valid request file specified." msgstr "" -#: src/OpenSSLUtils.cpp:487 src/OpenSSLUtils.cpp:621 src/OpenSSLUtils.cpp:712 +#: src/OpenSSLUtils.cpp:507 src/OpenSSLUtils.cpp:646 src/OpenSSLUtils.cpp:742 msgid "No valid CA certificate file specified." msgstr "" -#: src/OpenSSLUtils.cpp:495 src/OpenSSLUtils.cpp:785 +#: src/OpenSSLUtils.cpp:515 src/OpenSSLUtils.cpp:820 msgid "No valid certificate file specified." msgstr "" -#: src/OpenSSLUtils.cpp:793 +#: src/OpenSSLUtils.cpp:828 msgid "No valid CA directory specified." msgstr "" -#: src/OpenSSLUtils.cpp:943 +#: src/OpenSSLUtils.cpp:982 msgid "Showing certificate status with serial %1 failed (%2)." msgstr "" -#: src/OpenSSLUtils.cpp:979 +#: src/OpenSSLUtils.cpp:1018 msgid "The key file does not exist." msgstr "Rakto byla neegzistuoja." -#: src/OpenSSLUtils.cpp:1474 +#: src/OpenSSLUtils.cpp:1306 src/OpenSSLUtils.cpp:1677 +#: src/OpenSSLUtils.cpp:1817 +#, fuzzy +msgid "Invalid password." +msgstr "Klaidingas CA spaltaÅ¾odis." + +#: src/OpenSSLUtils.cpp:1595 msgid "The password for encrypting the output is required." msgstr "" -#: src/OpenSSLUtils.cpp:1579 +#: src/OpenSSLUtils.cpp:1736 msgid "The PKCS12 password is required." msgstr "Reikalingas PKCS12 slaptaÅ¾odis." -#: src/OpenSSLUtils.cpp:1665 src/OpenSSLUtils.cpp:1865 -#: src/OpenSSLUtils.cpp:2017 +#: src/OpenSSLUtils.cpp:1847 src/OpenSSLUtils.cpp:2047 +#: src/OpenSSLUtils.cpp:2199 msgid "Cannot read directory: %1 (%2) [%3]." msgstr "Nepavyksta nuskaityti aplanko: %1 (%2) [%3]." -#: src/OpenSSLUtils.cpp:1715 +#: src/OpenSSLUtils.cpp:1897 msgid "No serial number found in %1." msgstr "" -#: src/OpenSSLUtils.cpp:1735 +#: src/OpenSSLUtils.cpp:1917 msgid "The request already exists." msgstr "" -#: src/OpenSSLUtils.cpp:1926 +#: src/OpenSSLUtils.cpp:2108 msgid "Cannot find the request subject." msgstr "" -#: src/OpenSSLUtils.cpp:2087 +#: src/OpenSSLUtils.cpp:2269 #, fuzzy msgid "Cannot find the certificate subject." msgstr "NÄra konfigÅ«racijos" # fuzzy -#: src/OpenSSLUtils.cpp:2186 +#: src/OpenSSLUtils.cpp:2368 #, fuzzy msgid "Invalid caName: %1." msgstr "Blogas tipas %1." -#: src/OpenSSLUtils.cpp:2195 +#: src/OpenSSLUtils.cpp:2377 msgid "'%1' does not exist." msgstr "â%1â neegzistuoja." -#: src/OpenSSLUtils.cpp:2205 +#: src/OpenSSLUtils.cpp:2387 msgid "%1 still exists." msgstr "%1 vis dar egzistuoja." -#: src/OpenSSLUtils.cpp:2216 src/OpenSSLUtils.cpp:2264 -#: src/OpenSSLUtils.cpp:2278 src/OpenSSLUtils.cpp:2292 -#: src/OpenSSLUtils.cpp:2306 src/OpenSSLUtils.cpp:2320 +#: src/OpenSSLUtils.cpp:2398 src/OpenSSLUtils.cpp:2446 +#: src/OpenSSLUtils.cpp:2460 src/OpenSSLUtils.cpp:2474 +#: src/OpenSSLUtils.cpp:2488 src/OpenSSLUtils.cpp:2502 msgid "Cannot create directory: %1 (%2 [%3])." msgstr "Nepavyksta sukurti aplanko: %1 (%2 [%3])." -#: src/OpenSSLUtils.cpp:2251 +#: src/OpenSSLUtils.cpp:2433 #, fuzzy msgid "Cannot copy the configuration template." msgstr "NÄra konfigÅ«racijos" -#: src/OpenSSLUtils.cpp:2338 +#: src/OpenSSLUtils.cpp:2520 msgid "Cannot create the file." msgstr "Nepavyksta sukurti bylos." @@ -753,28 +772,28 @@ msgid "Invalid SubjectKeyIdentifierExt object." msgstr "Klaidingas SubjectKeyIdentifierExt objektas." -#: src/X509v3CertificateExtensions_Priv.cpp:394 -#: src/X509v3CertificateExtensions_Priv.cpp:450 +#: src/X509v3CertificateExtensions_Priv.cpp:395 +#: src/X509v3CertificateExtensions_Priv.cpp:452 #: src/X509v3RequestExtensions_Priv.cpp:134 #: src/X509v3RequestExtensions_Priv.cpp:189 msgid "Extension occurred more than once: %1." msgstr "" -#: src/X509v3CertificateExtensions_Priv.cpp:401 -#: src/X509v3CertificateExtensions_Priv.cpp:457 +#: src/X509v3CertificateExtensions_Priv.cpp:402 +#: src/X509v3CertificateExtensions_Priv.cpp:459 #: src/X509v3RequestExtensions_Priv.cpp:141 #: src/X509v3RequestExtensions_Priv.cpp:196 msgid "Unable to parse the certificate (NID: %1 Crit: %2)." msgstr "" -#: src/X509v3CertificateExtensions_Priv.cpp:509 -#: src/X509v3CertificateExtensions_Priv.cpp:575 -#: src/X509v3CertificateExtensions_Priv.cpp:639 -#: src/X509v3CertificateExtensions_Priv.cpp:701 -#: src/X509v3CertificateExtensions_Priv.cpp:771 -#: src/X509v3CertificateExtensions_Priv.cpp:840 -#: src/X509v3CertificateExtensions_Priv.cpp:916 -#: src/X509v3CertificateExtensions_Priv.cpp:1002 +#: src/X509v3CertificateExtensions_Priv.cpp:511 +#: src/X509v3CertificateExtensions_Priv.cpp:577 +#: src/X509v3CertificateExtensions_Priv.cpp:641 +#: src/X509v3CertificateExtensions_Priv.cpp:703 +#: src/X509v3CertificateExtensions_Priv.cpp:773 +#: src/X509v3CertificateExtensions_Priv.cpp:842 +#: src/X509v3CertificateExtensions_Priv.cpp:918 +#: src/X509v3CertificateExtensions_Priv.cpp:1004 #: src/X509v3CRLExtensions_Priv.cpp:135 #: src/X509v3RequestExtensions_Priv.cpp:249 #: src/X509v3RequestExtensions_Priv.cpp:315 @@ -783,14 +802,14 @@ msgid "Extension occurred more than once." msgstr "" -#: src/X509v3CertificateExtensions_Priv.cpp:514 -#: src/X509v3CertificateExtensions_Priv.cpp:580 -#: src/X509v3CertificateExtensions_Priv.cpp:644 -#: src/X509v3CertificateExtensions_Priv.cpp:707 -#: src/X509v3CertificateExtensions_Priv.cpp:776 -#: src/X509v3CertificateExtensions_Priv.cpp:846 -#: src/X509v3CertificateExtensions_Priv.cpp:921 -#: src/X509v3CertificateExtensions_Priv.cpp:1007 +#: src/X509v3CertificateExtensions_Priv.cpp:516 +#: src/X509v3CertificateExtensions_Priv.cpp:582 +#: src/X509v3CertificateExtensions_Priv.cpp:646 +#: src/X509v3CertificateExtensions_Priv.cpp:709 +#: src/X509v3CertificateExtensions_Priv.cpp:778 +#: src/X509v3CertificateExtensions_Priv.cpp:848 +#: src/X509v3CertificateExtensions_Priv.cpp:923 +#: src/X509v3CertificateExtensions_Priv.cpp:1009 #: src/X509v3CRLExtensions_Priv.cpp:140 #: src/X509v3RequestExtensions_Priv.cpp:254 #: src/X509v3RequestExtensions_Priv.cpp:320 @@ -800,7 +819,7 @@ msgid "Unable to parse the certificate (Crit: %1)." msgstr "Nepavyksta iÅ¡nagrinÄte url eilutÄs â%1â" -#: src/X509v3CertificateExtensions_Priv.cpp:941 +#: src/X509v3CertificateExtensions_Priv.cpp:943 msgid "Invalid location in authorityInfoAccess." msgstr "" Modified: limal-head/limal-ca-mgm/po/mr.po URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/po/mr.po?rev=… ============================================================================== --- limal-head/limal-ca-mgm/po/mr.po (original) +++ limal-head/limal-ca-mgm/po/mr.po Mon Oct 29 11:30:37 2007 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: @PACKAGE@\n" "Report-Msgid-Bugs-To: translation(a)suse.de\n" -"POT-Creation-Date: 2007-09-28 16:31+0200\n" +"POT-Creation-Date: 2007-10-29 11:25+0100\n" "PO-Revision-Date: 2005-07-29 15:37+0530\n" "Last-Translator: Priyavert Sharma <priyavert.sharma(a)agreeya.com>\n" "Language-Team: AgreeYa Solutions <linux_team(a)agreeya.com>\n" @@ -25,8 +25,8 @@ #: src/AuthorityInfoAccessExtension.cpp:259 #: src/AuthorityInfoAccessExtension.cpp:342 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:87 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:194 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:86 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:193 #: src/BasicConstraintsExtension.cpp:84 src/BasicConstraintsExtension.cpp:187 #: src/BitExtensions.cpp:134 src/BitExtensions.cpp:247 #: src/BitExtensions.cpp:374 src/BitExtensions.cpp:482 src/CA.cpp:1565 @@ -73,12 +73,12 @@ msgid "AuthorityKeyIdentifierExt is not present." msgstr "AuthorityKeyIdentifierExt à¤à¤ªà¤¸à¥à¤¥à¤¿à¤¤ à¤¨à¤¾à¤¹à¥" -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:155 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:174 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:154 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:173 msgid "AuthorityKeyIdentifierGenerateExt is not present." msgstr "AuthorityKeyIdentifierGenerateExt à¤à¤ªà¤¸à¥à¤¥à¤¿à¤¤ à¤¨à¤¾à¤¹à¥" -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:186 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:185 msgid "Invalid AuthorityKeyIdentifierGenerateExt object." msgstr "à¤à¤µà¥à¤§ AuthorityKeyIdentifierGenerateExt à¤à¤¬à¥à¤à¥à¤à¥à¤." @@ -198,7 +198,7 @@ msgid "Duplicate DN. Request already exists." msgstr "à¤¦à¥à¤¸à¤°à¥ à¤¤à¤¶à¥à¤ DN. à¤µà¤¿à¤¨à¤à¤¤à¥ à¤à¤§à¥à¤ªà¤¾à¤¸à¥à¤¨à¤ à¤à¤¸à¥à¤¤à¤¿à¤¤à¥à¤µà¤¾à¤¤ à¤à¤¹à¥." -#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:968 +#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:1007 msgid "Cannot parse the certificate name." msgstr "à¤ªà¥à¤°à¤®à¤¾à¤£à¤ªà¤¤à¥à¤°à¤¾à¤à¥à¤¯à¤¾ à¤¨à¤µà¤¾à¤à¤¾ à¤¸à¤à¤¬à¤à¤§ à¤¸à¤¾à¤à¤à¥ à¤¶à¤à¤¤ à¤¨à¤¾à¤¹à¥." @@ -535,93 +535,112 @@ msgid "Invalid command %1." msgstr "à¤à¤µà¥à¤§ à¤à¤¦à¥à¤¶ %1." -#: src/OpenSSLUtils.cpp:138 src/OpenSSLUtils.cpp:241 src/OpenSSLUtils.cpp:334 -#: src/OpenSSLUtils.cpp:453 src/OpenSSLUtils.cpp:586 src/OpenSSLUtils.cpp:681 -#: src/OpenSSLUtils.cpp:761 -msgid "Command returned '%1' : %2" -msgstr "à¤à¤¦à¥à¤¶ à¤ªà¤°à¤¤ à¤à¤²à¤¾ '%1' : %2" +#: src/OpenSSLUtils.cpp:132 src/OpenSSLUtils.cpp:240 src/OpenSSLUtils.cpp:338 +#: src/OpenSSLUtils.cpp:462 src/OpenSSLUtils.cpp:600 src/OpenSSLUtils.cpp:700 +#: src/OpenSSLUtils.cpp:782 src/OpenSSLUtils.cpp:871 src/OpenSSLUtils.cpp:952 +#: src/OpenSSLUtils.cpp:1051 src/OpenSSLUtils.cpp:1137 +#: src/OpenSSLUtils.cpp:1271 src/OpenSSLUtils.cpp:1390 +#: src/OpenSSLUtils.cpp:1493 src/OpenSSLUtils.cpp:1645 +#: src/OpenSSLUtils.cpp:1782 +msgid "Executing openssl command failed." +msgstr "" + +#: src/OpenSSLUtils.cpp:143 src/OpenSSLUtils.cpp:251 src/OpenSSLUtils.cpp:349 +#: src/OpenSSLUtils.cpp:473 src/OpenSSLUtils.cpp:611 src/OpenSSLUtils.cpp:711 +#: src/OpenSSLUtils.cpp:796 src/OpenSSLUtils.cpp:1162 +#: src/OpenSSLUtils.cpp:1311 src/OpenSSLUtils.cpp:1415 +#: src/OpenSSLUtils.cpp:1518 src/OpenSSLUtils.cpp:1682 +#: src/OpenSSLUtils.cpp:1822 +msgid "openssl command failed: %1" +msgstr "" -#: src/OpenSSLUtils.cpp:171 src/OpenSSLUtils.cpp:268 src/OpenSSLUtils.cpp:366 -#: src/OpenSSLUtils.cpp:479 src/OpenSSLUtils.cpp:613 src/OpenSSLUtils.cpp:704 +#: src/OpenSSLUtils.cpp:176 src/OpenSSLUtils.cpp:278 src/OpenSSLUtils.cpp:381 +#: src/OpenSSLUtils.cpp:499 src/OpenSSLUtils.cpp:638 src/OpenSSLUtils.cpp:734 msgid "No valid key file specified." msgstr "à¤à¥à¤£à¤¤à¥à¤¹à¥ à¤µà¥à¤§ à¤à¥ à¤«à¤¾à¤à¤² à¤¨à¤¿à¤°à¥à¤¦à¤¿à¤·à¥à¤ à¤à¥à¤²à¥à¤²à¥ à¤¨à¤¾à¤¹à¥." -#: src/OpenSSLUtils.cpp:276 src/OpenSSLUtils.cpp:374 +#: src/OpenSSLUtils.cpp:286 src/OpenSSLUtils.cpp:389 msgid "No valid request file specified." msgstr " à¤à¥à¤£à¤¤à¥à¤¹à¥ à¤µà¥à¤§ à¤µà¤¿à¤¨à¤à¤¤à¥ à¤«à¤¾à¤à¤² à¤¨à¤¿à¤°à¥à¤¦à¤¿à¤·à¥à¤ à¤à¥à¤²à¥à¤²à¥ à¤¨à¤¾à¤¹à¥." -#: src/OpenSSLUtils.cpp:487 src/OpenSSLUtils.cpp:621 src/OpenSSLUtils.cpp:712 +#: src/OpenSSLUtils.cpp:507 src/OpenSSLUtils.cpp:646 src/OpenSSLUtils.cpp:742 msgid "No valid CA certificate file specified." msgstr "à¤à¥à¤£à¤¤à¥à¤¹à¥ à¤µà¥à¤§ CA à¤ªà¥à¤°à¤®à¤¾à¤£à¤ªà¤¤à¥à¤° à¤«à¤¾à¤à¤² à¤¨à¤¿à¤°à¥à¤¦à¤¿à¤·à¥à¤ à¤à¥à¤²à¥à¤²à¥ à¤¨à¤¾à¤¹à¥." -#: src/OpenSSLUtils.cpp:495 src/OpenSSLUtils.cpp:785 +#: src/OpenSSLUtils.cpp:515 src/OpenSSLUtils.cpp:820 msgid "No valid certificate file specified." msgstr "à¤à¥à¤£à¤¤à¥à¤¹à¥ à¤µà¥à¤§ à¤ªà¥à¤°à¤®à¤¾à¤£à¤ªà¤¤à¥à¤° à¤«à¤¾à¤à¤² à¤¨à¤¿à¤°à¥à¤¦à¤¿à¤·à¥à¤ à¤à¥à¤²à¥à¤²à¥ à¤¨à¤¾à¤¹à¥" -#: src/OpenSSLUtils.cpp:793 +#: src/OpenSSLUtils.cpp:828 msgid "No valid CA directory specified." msgstr "à¤à¥à¤£à¤¤à¥à¤¹à¥ à¤µà¥à¤§ CA à¤¡à¤¿à¤°à¥à¤à¥à¤à¤°à¥." -#: src/OpenSSLUtils.cpp:943 +#: src/OpenSSLUtils.cpp:982 msgid "Showing certificate status with serial %1 failed (%2)." msgstr "à¤¸à¥à¤°à¥à¤¯à¤² %1 à¤¨à¥ à¤ªà¥à¤°à¤®à¤¾à¤£à¤ªà¤¤à¥à¤°à¤¾à¤à¥ à¤¸à¥à¤¥à¤¿à¤¤à¥ à¤¦à¤°à¥à¤¶à¤µà¤£à¥à¤¯à¤¾à¤¤ à¤à¤ªà¤¯à¤¶ (%2)." -#: src/OpenSSLUtils.cpp:979 +#: src/OpenSSLUtils.cpp:1018 msgid "The key file does not exist." msgstr "à¤à¥ à¤«à¤¾à¤à¤² à¤à¤¸à¥à¤¤à¤¿à¤¤à¥à¤µà¤¾à¤¤ à¤¨à¤¾à¤¹à¥." -#: src/OpenSSLUtils.cpp:1474 +#: src/OpenSSLUtils.cpp:1306 src/OpenSSLUtils.cpp:1677 +#: src/OpenSSLUtils.cpp:1817 +#, fuzzy +msgid "Invalid password." +msgstr "à¤à¤µà¥à¤§ CA à¤ªà¤¾à¤¸à¤µà¤°à¥à¤¡" + +#: src/OpenSSLUtils.cpp:1595 msgid "The password for encrypting the output is required." msgstr "à¤à¤à¤à¤ªà¥à¤à¤à¥à¤¯à¤¾ à¤à¤¨à¥à¤à¥à¤°à¤¿à¤ªà¥à¤à¤¸à¤¾à¤ à¥ à¤ªà¤¾à¤¸à¤µà¤°à¥à¤¡ à¤à¤µà¤¶à¥à¤¯à¤" -#: src/OpenSSLUtils.cpp:1579 +#: src/OpenSSLUtils.cpp:1736 msgid "The PKCS12 password is required." msgstr " PKCS12 à¤ªà¤¾à¤¸à¤µà¤°à¥à¤¡ à¤à¤µà¤¶à¥à¤¯à¤ à¤à¤¹à¥." -#: src/OpenSSLUtils.cpp:1665 src/OpenSSLUtils.cpp:1865 -#: src/OpenSSLUtils.cpp:2017 +#: src/OpenSSLUtils.cpp:1847 src/OpenSSLUtils.cpp:2047 +#: src/OpenSSLUtils.cpp:2199 msgid "Cannot read directory: %1 (%2) [%3]." msgstr "à¤¡à¤¿à¤°à¥à¤à¥à¤à¤°à¥: %1 (%2) [%3] à¤µà¤¾à¤à¥ à¤¶à¤à¤¤ à¤¨à¤¾à¤¹à¥." -#: src/OpenSSLUtils.cpp:1715 +#: src/OpenSSLUtils.cpp:1897 msgid "No serial number found in %1." msgstr " %1 à¤®à¤§à¥ à¤à¤¨à¥à¤à¥à¤°à¤®à¤¾à¤à¤ à¤à¤¢à¤³à¤²à¤¾ à¤¨à¤¾à¤¹à¥." -#: src/OpenSSLUtils.cpp:1735 +#: src/OpenSSLUtils.cpp:1917 msgid "The request already exists." msgstr "à¤µà¤¿à¤¨à¤à¤¤à¥ à¤à¤§à¥à¤ªà¤¾à¤¸à¥à¤¨à¤ à¤à¤¹à¥." -#: src/OpenSSLUtils.cpp:1926 +#: src/OpenSSLUtils.cpp:2108 msgid "Cannot find the request subject." msgstr "à¤µà¤¿à¤¨à¤à¤¤à¥à¤à¤¾ à¤¸à¤¬à¥à¤à¥à¤à¥à¤ à¤¶à¥à¤§à¤¤à¤¾ à¤à¤²à¤¾ à¤¨à¤¾à¤¹à¥" -#: src/OpenSSLUtils.cpp:2087 +#: src/OpenSSLUtils.cpp:2269 msgid "Cannot find the certificate subject." msgstr "à¤ªà¥à¤°à¤®à¤¾à¤£à¤¾à¤ªà¤¤à¥à¤° à¤¸à¤¬à¥à¤à¥à¤à¥à¤ à¤¶à¥à¤§à¤¤à¤¾ à¤à¤²à¤¾ à¤¨à¤¾à¤¹à¥" -#: src/OpenSSLUtils.cpp:2186 +#: src/OpenSSLUtils.cpp:2368 msgid "Invalid caName: %1." msgstr "à¤à¤µà¥à¤§ caName: %1." -#: src/OpenSSLUtils.cpp:2195 +#: src/OpenSSLUtils.cpp:2377 msgid "'%1' does not exist." msgstr "'%1' à¤à¤¸à¥à¤¤à¤¿à¤¤à¥à¤µà¤¾à¤¤ à¤¨à¤¾à¤¹à¥." -#: src/OpenSSLUtils.cpp:2205 +#: src/OpenSSLUtils.cpp:2387 msgid "%1 still exists." msgstr "%1 à¤à¤¦à¥à¤¯à¤¾à¤ª à¤à¤¸à¥à¤¤à¤¿à¤¤à¥à¤µà¤¾à¤¤ à¤à¤¹à¥." -#: src/OpenSSLUtils.cpp:2216 src/OpenSSLUtils.cpp:2264 -#: src/OpenSSLUtils.cpp:2278 src/OpenSSLUtils.cpp:2292 -#: src/OpenSSLUtils.cpp:2306 src/OpenSSLUtils.cpp:2320 +#: src/OpenSSLUtils.cpp:2398 src/OpenSSLUtils.cpp:2446 +#: src/OpenSSLUtils.cpp:2460 src/OpenSSLUtils.cpp:2474 +#: src/OpenSSLUtils.cpp:2488 src/OpenSSLUtils.cpp:2502 msgid "Cannot create directory: %1 (%2 [%3])." msgstr "à¤¡à¤¿à¤°à¥à¤à¥à¤à¤°à¥ à¤¨à¤¿à¤°à¥à¤®à¤¾à¤£ à¤à¤°à¥ à¤¶à¤à¤¤ à¤¨à¤¾à¤¹à¥: %1 (%2 [%3])." -#: src/OpenSSLUtils.cpp:2251 +#: src/OpenSSLUtils.cpp:2433 msgid "Cannot copy the configuration template." msgstr "à¤à¤à¥à¤¤à¥à¤¬à¤à¤§ à¤à¥à¤®à¥à¤ªà¥à¤²à¥à¤ à¤à¥à¤ªà¥ à¤à¤°à¥ à¤¶à¤à¤¤ à¤¨à¤¾à¤¹à¥" -#: src/OpenSSLUtils.cpp:2338 +#: src/OpenSSLUtils.cpp:2520 msgid "Cannot create the file." msgstr "à¤«à¤¾à¤à¤² à¤¨à¤¿à¤°à¥à¤®à¤¾à¤£ à¤à¤°à¥ à¤¶à¤à¤¤ à¤¨à¤¾à¤¹à¥" @@ -740,28 +759,28 @@ msgid "Invalid SubjectKeyIdentifierExt object." msgstr "à¤à¤µà¥à¤§ SubjectKeyIdentifierExt à¤à¤¬à¥à¤à¥à¤à¥à¤." -#: src/X509v3CertificateExtensions_Priv.cpp:394 -#: src/X509v3CertificateExtensions_Priv.cpp:450 +#: src/X509v3CertificateExtensions_Priv.cpp:395 +#: src/X509v3CertificateExtensions_Priv.cpp:452 #: src/X509v3RequestExtensions_Priv.cpp:134 #: src/X509v3RequestExtensions_Priv.cpp:189 msgid "Extension occurred more than once: %1." msgstr "à¤à¤à¤¾à¤ªà¥à¤à¥à¤·à¤¾ à¤à¤¾à¤¸à¥à¤¤ à¤µà¥à¤³à¤¾ à¤µà¤¿à¤¸à¥à¤¤à¤¾à¤° à¤à¤²à¤¾: %1." -#: src/X509v3CertificateExtensions_Priv.cpp:401 -#: src/X509v3CertificateExtensions_Priv.cpp:457 +#: src/X509v3CertificateExtensions_Priv.cpp:402 +#: src/X509v3CertificateExtensions_Priv.cpp:459 #: src/X509v3RequestExtensions_Priv.cpp:141 #: src/X509v3RequestExtensions_Priv.cpp:196 msgid "Unable to parse the certificate (NID: %1 Crit: %2)." msgstr "à¤ªà¥à¤°à¤®à¤¾à¤£à¤ªà¤¤à¥à¤°à¤¾à¤à¤¾ à¤¸à¤à¤¬à¤à¤§ à¤¸à¤¾à¤à¤à¤¤à¤¾ à¤à¤²à¤¾ à¤¨à¤¾à¤¹à¥ (NID: %1 Crit: %2)." -#: src/X509v3CertificateExtensions_Priv.cpp:509 -#: src/X509v3CertificateExtensions_Priv.cpp:575 -#: src/X509v3CertificateExtensions_Priv.cpp:639 -#: src/X509v3CertificateExtensions_Priv.cpp:701 -#: src/X509v3CertificateExtensions_Priv.cpp:771 -#: src/X509v3CertificateExtensions_Priv.cpp:840 -#: src/X509v3CertificateExtensions_Priv.cpp:916 -#: src/X509v3CertificateExtensions_Priv.cpp:1002 +#: src/X509v3CertificateExtensions_Priv.cpp:511 +#: src/X509v3CertificateExtensions_Priv.cpp:577 +#: src/X509v3CertificateExtensions_Priv.cpp:641 +#: src/X509v3CertificateExtensions_Priv.cpp:703 +#: src/X509v3CertificateExtensions_Priv.cpp:773 +#: src/X509v3CertificateExtensions_Priv.cpp:842 +#: src/X509v3CertificateExtensions_Priv.cpp:918 +#: src/X509v3CertificateExtensions_Priv.cpp:1004 #: src/X509v3CRLExtensions_Priv.cpp:135 #: src/X509v3RequestExtensions_Priv.cpp:249 #: src/X509v3RequestExtensions_Priv.cpp:315 @@ -770,14 +789,14 @@ msgid "Extension occurred more than once." msgstr "à¤à¤à¤¾à¤ªà¥à¤à¥à¤·à¤¾ à¤à¤¾à¤¸à¥à¤¤ à¤µà¥à¤³à¤¾ à¤µà¤¿à¤¸à¥à¤¤à¤¾à¤° à¤à¤²à¤¾." -#: src/X509v3CertificateExtensions_Priv.cpp:514 -#: src/X509v3CertificateExtensions_Priv.cpp:580 -#: src/X509v3CertificateExtensions_Priv.cpp:644 -#: src/X509v3CertificateExtensions_Priv.cpp:707 -#: src/X509v3CertificateExtensions_Priv.cpp:776 -#: src/X509v3CertificateExtensions_Priv.cpp:846 -#: src/X509v3CertificateExtensions_Priv.cpp:921 -#: src/X509v3CertificateExtensions_Priv.cpp:1007 +#: src/X509v3CertificateExtensions_Priv.cpp:516 +#: src/X509v3CertificateExtensions_Priv.cpp:582 +#: src/X509v3CertificateExtensions_Priv.cpp:646 +#: src/X509v3CertificateExtensions_Priv.cpp:709 +#: src/X509v3CertificateExtensions_Priv.cpp:778 +#: src/X509v3CertificateExtensions_Priv.cpp:848 +#: src/X509v3CertificateExtensions_Priv.cpp:923 +#: src/X509v3CertificateExtensions_Priv.cpp:1009 #: src/X509v3CRLExtensions_Priv.cpp:140 #: src/X509v3RequestExtensions_Priv.cpp:254 #: src/X509v3RequestExtensions_Priv.cpp:320 @@ -786,7 +805,7 @@ msgid "Unable to parse the certificate (Crit: %1)." msgstr "à¤ªà¥à¤°à¤®à¤¾à¤£à¤ªà¤¤à¥à¤°à¤¾à¤à¤¾ à¤¸à¤à¤¬à¤à¤§ à¤¸à¤¾à¤à¤à¤¤à¤¾ à¤à¤²à¤¾ à¤¨à¤¾à¤¹à¥ (Crit: %1)." -#: src/X509v3CertificateExtensions_Priv.cpp:941 +#: src/X509v3CertificateExtensions_Priv.cpp:943 msgid "Invalid location in authorityInfoAccess." msgstr " authorityInfoAccess à¤®à¤§à¥ à¤à¤µà¥à¤§ à¤¸à¥à¤¥à¤³." @@ -909,3 +928,6 @@ #: src/X509v3RequestExtensions.cpp:231 msgid "Invalid value for X509v3RequestExts::setSubjectAlternativeName." msgstr " X509v3RequestExts à¤¸à¤¾à¤ à¥ à¤à¤µà¥à¤§ à¤®à¥à¤²à¥à¤¯::setSubjectAlternativeName." + +#~ msgid "Command returned '%1' : %2" +#~ msgstr "à¤à¤¦à¥à¤¶ à¤ªà¤°à¤¤ à¤à¤²à¤¾ '%1' : %2" Modified: limal-head/limal-ca-mgm/po/nb.po URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/po/nb.po?rev=… ============================================================================== --- limal-head/limal-ca-mgm/po/nb.po (original) +++ limal-head/limal-ca-mgm/po/nb.po Mon Oct 29 11:30:37 2007 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: limal-ca-mgm.nb\n" "Report-Msgid-Bugs-To: translation(a)suse.de\n" -"POT-Creation-Date: 2007-09-28 16:31+0200\n" +"POT-Creation-Date: 2007-10-29 11:25+0100\n" "PO-Revision-Date: 2007-08-08 09:04+0200\n" "Last-Translator: Rune NordbÃ¸e Skillingstad <rune(a)skillingstad.no>\n" "Language-Team: Norwegian\n" @@ -31,8 +31,8 @@ #: src/AuthorityInfoAccessExtension.cpp:259 #: src/AuthorityInfoAccessExtension.cpp:342 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:87 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:194 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:86 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:193 #: src/BasicConstraintsExtension.cpp:84 src/BasicConstraintsExtension.cpp:187 #: src/BitExtensions.cpp:134 src/BitExtensions.cpp:247 #: src/BitExtensions.cpp:374 src/BitExtensions.cpp:482 src/CA.cpp:1565 @@ -79,12 +79,12 @@ msgid "AuthorityKeyIdentifierExt is not present." msgstr "AuthorityKeyIdentifierExt finnes ikke." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:155 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:174 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:154 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:173 msgid "AuthorityKeyIdentifierGenerateExt is not present." msgstr "AuthorityKeyIdentifierGenerateExt finnes ikke." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:186 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:185 msgid "Invalid AuthorityKeyIdentifierGenerateExt object." msgstr "Ugyldig AuthorityKeyIdentifierGenerateExt-objekt." @@ -204,7 +204,7 @@ msgid "Duplicate DN. Request already exists." msgstr "Duplisert DN. ForespÃ¸rselen finnes allerede." -#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:968 +#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:1007 msgid "Cannot parse the certificate name." msgstr "Kan ikke analysere sertifikatnavn." @@ -542,93 +542,112 @@ msgid "Invalid command %1." msgstr "Ugyldig kommando %1." -#: src/OpenSSLUtils.cpp:138 src/OpenSSLUtils.cpp:241 src/OpenSSLUtils.cpp:334 -#: src/OpenSSLUtils.cpp:453 src/OpenSSLUtils.cpp:586 src/OpenSSLUtils.cpp:681 -#: src/OpenSSLUtils.cpp:761 -msgid "Command returned '%1' : %2" -msgstr "Kommandoen returnerte '%1' : %2" +#: src/OpenSSLUtils.cpp:132 src/OpenSSLUtils.cpp:240 src/OpenSSLUtils.cpp:338 +#: src/OpenSSLUtils.cpp:462 src/OpenSSLUtils.cpp:600 src/OpenSSLUtils.cpp:700 +#: src/OpenSSLUtils.cpp:782 src/OpenSSLUtils.cpp:871 src/OpenSSLUtils.cpp:952 +#: src/OpenSSLUtils.cpp:1051 src/OpenSSLUtils.cpp:1137 +#: src/OpenSSLUtils.cpp:1271 src/OpenSSLUtils.cpp:1390 +#: src/OpenSSLUtils.cpp:1493 src/OpenSSLUtils.cpp:1645 +#: src/OpenSSLUtils.cpp:1782 +msgid "Executing openssl command failed." +msgstr "" + +#: src/OpenSSLUtils.cpp:143 src/OpenSSLUtils.cpp:251 src/OpenSSLUtils.cpp:349 +#: src/OpenSSLUtils.cpp:473 src/OpenSSLUtils.cpp:611 src/OpenSSLUtils.cpp:711 +#: src/OpenSSLUtils.cpp:796 src/OpenSSLUtils.cpp:1162 +#: src/OpenSSLUtils.cpp:1311 src/OpenSSLUtils.cpp:1415 +#: src/OpenSSLUtils.cpp:1518 src/OpenSSLUtils.cpp:1682 +#: src/OpenSSLUtils.cpp:1822 +msgid "openssl command failed: %1" +msgstr "" -#: src/OpenSSLUtils.cpp:171 src/OpenSSLUtils.cpp:268 src/OpenSSLUtils.cpp:366 -#: src/OpenSSLUtils.cpp:479 src/OpenSSLUtils.cpp:613 src/OpenSSLUtils.cpp:704 +#: src/OpenSSLUtils.cpp:176 src/OpenSSLUtils.cpp:278 src/OpenSSLUtils.cpp:381 +#: src/OpenSSLUtils.cpp:499 src/OpenSSLUtils.cpp:638 src/OpenSSLUtils.cpp:734 msgid "No valid key file specified." msgstr "Ingen gyldig nÃ¸kkelfil spesifisert." -#: src/OpenSSLUtils.cpp:276 src/OpenSSLUtils.cpp:374 +#: src/OpenSSLUtils.cpp:286 src/OpenSSLUtils.cpp:389 msgid "No valid request file specified." msgstr "Ingen gyldig forespÃ¸rselsfil spesifisert." -#: src/OpenSSLUtils.cpp:487 src/OpenSSLUtils.cpp:621 src/OpenSSLUtils.cpp:712 +#: src/OpenSSLUtils.cpp:507 src/OpenSSLUtils.cpp:646 src/OpenSSLUtils.cpp:742 msgid "No valid CA certificate file specified." msgstr "Ingen gyldig CA-sertifikatfil spesifisert." -#: src/OpenSSLUtils.cpp:495 src/OpenSSLUtils.cpp:785 +#: src/OpenSSLUtils.cpp:515 src/OpenSSLUtils.cpp:820 msgid "No valid certificate file specified." msgstr "Ingen gyldig sertifikatfil spesifisert." -#: src/OpenSSLUtils.cpp:793 +#: src/OpenSSLUtils.cpp:828 msgid "No valid CA directory specified." msgstr "Ingen gyldig CA-katalog spesifisert." -#: src/OpenSSLUtils.cpp:943 +#: src/OpenSSLUtils.cpp:982 msgid "Showing certificate status with serial %1 failed (%2)." msgstr "Visning av sertifikatstatus for %1 mislyktes (%2)." -#: src/OpenSSLUtils.cpp:979 +#: src/OpenSSLUtils.cpp:1018 msgid "The key file does not exist." msgstr "Den nÃ¸kkelfilen finnes ikke." -#: src/OpenSSLUtils.cpp:1474 +#: src/OpenSSLUtils.cpp:1306 src/OpenSSLUtils.cpp:1677 +#: src/OpenSSLUtils.cpp:1817 +#, fuzzy +msgid "Invalid password." +msgstr "Ugyldig CA-passord." + +#: src/OpenSSLUtils.cpp:1595 msgid "The password for encrypting the output is required." msgstr "Passordet for kryptering av utdataene er pÃ¥krevd." -#: src/OpenSSLUtils.cpp:1579 +#: src/OpenSSLUtils.cpp:1736 msgid "The PKCS12 password is required." msgstr "PKCS12-passordet kreves." -#: src/OpenSSLUtils.cpp:1665 src/OpenSSLUtils.cpp:1865 -#: src/OpenSSLUtils.cpp:2017 +#: src/OpenSSLUtils.cpp:1847 src/OpenSSLUtils.cpp:2047 +#: src/OpenSSLUtils.cpp:2199 msgid "Cannot read directory: %1 (%2) [%3]." msgstr "Kan ikke lese katalog: %1 (%2) [%3]." -#: src/OpenSSLUtils.cpp:1715 +#: src/OpenSSLUtils.cpp:1897 msgid "No serial number found in %1." msgstr "Finner ikke serienummer i %1." -#: src/OpenSSLUtils.cpp:1735 +#: src/OpenSSLUtils.cpp:1917 msgid "The request already exists." msgstr "ForespÃ¸rselen finnes allerede." -#: src/OpenSSLUtils.cpp:1926 +#: src/OpenSSLUtils.cpp:2108 msgid "Cannot find the request subject." msgstr "Finner ikke forespÃ¸rselssubjektet." -#: src/OpenSSLUtils.cpp:2087 +#: src/OpenSSLUtils.cpp:2269 msgid "Cannot find the certificate subject." msgstr "Finner ikke sertifikatsubjektet." -#: src/OpenSSLUtils.cpp:2186 +#: src/OpenSSLUtils.cpp:2368 msgid "Invalid caName: %1." msgstr "Ugyldig navn pÃ¥ sertifiseringsinstans, CA: %1." -#: src/OpenSSLUtils.cpp:2195 +#: src/OpenSSLUtils.cpp:2377 msgid "'%1' does not exist." msgstr "'%1 finnes ikke." -#: src/OpenSSLUtils.cpp:2205 +#: src/OpenSSLUtils.cpp:2387 msgid "%1 still exists." msgstr "%1 finnes fremdeles." -#: src/OpenSSLUtils.cpp:2216 src/OpenSSLUtils.cpp:2264 -#: src/OpenSSLUtils.cpp:2278 src/OpenSSLUtils.cpp:2292 -#: src/OpenSSLUtils.cpp:2306 src/OpenSSLUtils.cpp:2320 +#: src/OpenSSLUtils.cpp:2398 src/OpenSSLUtils.cpp:2446 +#: src/OpenSSLUtils.cpp:2460 src/OpenSSLUtils.cpp:2474 +#: src/OpenSSLUtils.cpp:2488 src/OpenSSLUtils.cpp:2502 msgid "Cannot create directory: %1 (%2 [%3])." msgstr "Kan ikke opprette katalog: %1 (%2 [%3])." -#: src/OpenSSLUtils.cpp:2251 +#: src/OpenSSLUtils.cpp:2433 msgid "Cannot copy the configuration template." msgstr "Kan ikke kopiere konfigurasjonsmalen." -#: src/OpenSSLUtils.cpp:2338 +#: src/OpenSSLUtils.cpp:2520 msgid "Cannot create the file." msgstr "Kan ikke opprette filen." @@ -747,28 +766,28 @@ msgid "Invalid SubjectKeyIdentifierExt object." msgstr "Ugyldig SubjectKeyIdentifierExt-objekt." -#: src/X509v3CertificateExtensions_Priv.cpp:394 -#: src/X509v3CertificateExtensions_Priv.cpp:450 +#: src/X509v3CertificateExtensions_Priv.cpp:395 +#: src/X509v3CertificateExtensions_Priv.cpp:452 #: src/X509v3RequestExtensions_Priv.cpp:134 #: src/X509v3RequestExtensions_Priv.cpp:189 msgid "Extension occurred more than once: %1." msgstr "Utvidelsen forekom mer enn Ã©n gang: %1." -#: src/X509v3CertificateExtensions_Priv.cpp:401 -#: src/X509v3CertificateExtensions_Priv.cpp:457 +#: src/X509v3CertificateExtensions_Priv.cpp:402 +#: src/X509v3CertificateExtensions_Priv.cpp:459 #: src/X509v3RequestExtensions_Priv.cpp:141 #: src/X509v3RequestExtensions_Priv.cpp:196 msgid "Unable to parse the certificate (NID: %1 Crit: %2)." msgstr "Kan ikke tolke sertifikatet (NID: %1 Crit: %2)." -#: src/X509v3CertificateExtensions_Priv.cpp:509 -#: src/X509v3CertificateExtensions_Priv.cpp:575 -#: src/X509v3CertificateExtensions_Priv.cpp:639 -#: src/X509v3CertificateExtensions_Priv.cpp:701 -#: src/X509v3CertificateExtensions_Priv.cpp:771 -#: src/X509v3CertificateExtensions_Priv.cpp:840 -#: src/X509v3CertificateExtensions_Priv.cpp:916 -#: src/X509v3CertificateExtensions_Priv.cpp:1002 +#: src/X509v3CertificateExtensions_Priv.cpp:511 +#: src/X509v3CertificateExtensions_Priv.cpp:577 +#: src/X509v3CertificateExtensions_Priv.cpp:641 +#: src/X509v3CertificateExtensions_Priv.cpp:703 +#: src/X509v3CertificateExtensions_Priv.cpp:773 +#: src/X509v3CertificateExtensions_Priv.cpp:842 +#: src/X509v3CertificateExtensions_Priv.cpp:918 +#: src/X509v3CertificateExtensions_Priv.cpp:1004 #: src/X509v3CRLExtensions_Priv.cpp:135 #: src/X509v3RequestExtensions_Priv.cpp:249 #: src/X509v3RequestExtensions_Priv.cpp:315 @@ -777,14 +796,14 @@ msgid "Extension occurred more than once." msgstr "Utvidelsen forekom mer enn Ã©n gang." -#: src/X509v3CertificateExtensions_Priv.cpp:514 -#: src/X509v3CertificateExtensions_Priv.cpp:580 -#: src/X509v3CertificateExtensions_Priv.cpp:644 -#: src/X509v3CertificateExtensions_Priv.cpp:707 -#: src/X509v3CertificateExtensions_Priv.cpp:776 -#: src/X509v3CertificateExtensions_Priv.cpp:846 -#: src/X509v3CertificateExtensions_Priv.cpp:921 -#: src/X509v3CertificateExtensions_Priv.cpp:1007 +#: src/X509v3CertificateExtensions_Priv.cpp:516 +#: src/X509v3CertificateExtensions_Priv.cpp:582 +#: src/X509v3CertificateExtensions_Priv.cpp:646 +#: src/X509v3CertificateExtensions_Priv.cpp:709 +#: src/X509v3CertificateExtensions_Priv.cpp:778 +#: src/X509v3CertificateExtensions_Priv.cpp:848 +#: src/X509v3CertificateExtensions_Priv.cpp:923 +#: src/X509v3CertificateExtensions_Priv.cpp:1009 #: src/X509v3CRLExtensions_Priv.cpp:140 #: src/X509v3RequestExtensions_Priv.cpp:254 #: src/X509v3RequestExtensions_Priv.cpp:320 @@ -793,7 +812,7 @@ msgid "Unable to parse the certificate (Crit: %1)." msgstr "Kan ikke tolke sertifikatet (Crit: %1)." -#: src/X509v3CertificateExtensions_Priv.cpp:941 +#: src/X509v3CertificateExtensions_Priv.cpp:943 msgid "Invalid location in authorityInfoAccess." msgstr "Ugyldig plassering i authorityInfoAccess." @@ -920,3 +939,6 @@ #: src/X509v3RequestExtensions.cpp:231 msgid "Invalid value for X509v3RequestExts::setSubjectAlternativeName." msgstr "Ugyldig verdi for X509v3RequestExts::setSubjectAlternativeName." + +#~ msgid "Command returned '%1' : %2" +#~ msgstr "Kommandoen returnerte '%1' : %2" Modified: limal-head/limal-ca-mgm/po/nl.po URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/po/nl.po?rev=… ============================================================================== --- limal-head/limal-ca-mgm/po/nl.po (original) +++ limal-head/limal-ca-mgm/po/nl.po Mon Oct 29 11:30:37 2007 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: limal-ca-mgm.nl\n" "Report-Msgid-Bugs-To: translation(a)suse.de\n" -"POT-Creation-Date: 2007-09-28 16:31+0200\n" +"POT-Creation-Date: 2007-10-29 11:25+0100\n" "PO-Revision-Date: 2006-11-24 22:57+0100\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" @@ -31,8 +31,8 @@ #: src/AuthorityInfoAccessExtension.cpp:259 #: src/AuthorityInfoAccessExtension.cpp:342 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:87 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:194 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:86 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:193 #: src/BasicConstraintsExtension.cpp:84 src/BasicConstraintsExtension.cpp:187 #: src/BitExtensions.cpp:134 src/BitExtensions.cpp:247 #: src/BitExtensions.cpp:374 src/BitExtensions.cpp:482 src/CA.cpp:1565 @@ -79,12 +79,12 @@ msgid "AuthorityKeyIdentifierExt is not present." msgstr "AuthorityKeyIdentifierExt is niet aanwezig." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:155 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:174 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:154 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:173 msgid "AuthorityKeyIdentifierGenerateExt is not present." msgstr "AuthorityKeyIdentifierGenerateExt is niet aanwezig." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:186 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:185 msgid "Invalid AuthorityKeyIdentifierGenerateExt object." msgstr "Ongeldig AuthorityKeyIdentifierGenerateExt-object." @@ -204,7 +204,7 @@ msgid "Duplicate DN. Request already exists." msgstr "Dubbele DN. Request bestaat reeds." -#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:968 +#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:1007 msgid "Cannot parse the certificate name." msgstr "Kan de certificaatnaam niet ontleden." @@ -542,93 +542,112 @@ msgid "Invalid command %1." msgstr "Ongeldig commando: %1." -#: src/OpenSSLUtils.cpp:138 src/OpenSSLUtils.cpp:241 src/OpenSSLUtils.cpp:334 -#: src/OpenSSLUtils.cpp:453 src/OpenSSLUtils.cpp:586 src/OpenSSLUtils.cpp:681 -#: src/OpenSSLUtils.cpp:761 -msgid "Command returned '%1' : %2" -msgstr "Commando antwoordde '%1': %2" +#: src/OpenSSLUtils.cpp:132 src/OpenSSLUtils.cpp:240 src/OpenSSLUtils.cpp:338 +#: src/OpenSSLUtils.cpp:462 src/OpenSSLUtils.cpp:600 src/OpenSSLUtils.cpp:700 +#: src/OpenSSLUtils.cpp:782 src/OpenSSLUtils.cpp:871 src/OpenSSLUtils.cpp:952 +#: src/OpenSSLUtils.cpp:1051 src/OpenSSLUtils.cpp:1137 +#: src/OpenSSLUtils.cpp:1271 src/OpenSSLUtils.cpp:1390 +#: src/OpenSSLUtils.cpp:1493 src/OpenSSLUtils.cpp:1645 +#: src/OpenSSLUtils.cpp:1782 +msgid "Executing openssl command failed." +msgstr "" + +#: src/OpenSSLUtils.cpp:143 src/OpenSSLUtils.cpp:251 src/OpenSSLUtils.cpp:349 +#: src/OpenSSLUtils.cpp:473 src/OpenSSLUtils.cpp:611 src/OpenSSLUtils.cpp:711 +#: src/OpenSSLUtils.cpp:796 src/OpenSSLUtils.cpp:1162 +#: src/OpenSSLUtils.cpp:1311 src/OpenSSLUtils.cpp:1415 +#: src/OpenSSLUtils.cpp:1518 src/OpenSSLUtils.cpp:1682 +#: src/OpenSSLUtils.cpp:1822 +msgid "openssl command failed: %1" +msgstr "" -#: src/OpenSSLUtils.cpp:171 src/OpenSSLUtils.cpp:268 src/OpenSSLUtils.cpp:366 -#: src/OpenSSLUtils.cpp:479 src/OpenSSLUtils.cpp:613 src/OpenSSLUtils.cpp:704 +#: src/OpenSSLUtils.cpp:176 src/OpenSSLUtils.cpp:278 src/OpenSSLUtils.cpp:381 +#: src/OpenSSLUtils.cpp:499 src/OpenSSLUtils.cpp:638 src/OpenSSLUtils.cpp:734 msgid "No valid key file specified." msgstr "Geen geldig sleutelbestand opgegeven." -#: src/OpenSSLUtils.cpp:276 src/OpenSSLUtils.cpp:374 +#: src/OpenSSLUtils.cpp:286 src/OpenSSLUtils.cpp:389 msgid "No valid request file specified." msgstr "Geen geldig request-bestand opgegeven." -#: src/OpenSSLUtils.cpp:487 src/OpenSSLUtils.cpp:621 src/OpenSSLUtils.cpp:712 +#: src/OpenSSLUtils.cpp:507 src/OpenSSLUtils.cpp:646 src/OpenSSLUtils.cpp:742 msgid "No valid CA certificate file specified." msgstr "Geen geldig CA-certificaat opgegeven." -#: src/OpenSSLUtils.cpp:495 src/OpenSSLUtils.cpp:785 +#: src/OpenSSLUtils.cpp:515 src/OpenSSLUtils.cpp:820 msgid "No valid certificate file specified." msgstr "Geen geldig certificaatbestand opgegeven." -#: src/OpenSSLUtils.cpp:793 +#: src/OpenSSLUtils.cpp:828 msgid "No valid CA directory specified." msgstr "Geen geldige CA-directory gespecificeerd." -#: src/OpenSSLUtils.cpp:943 +#: src/OpenSSLUtils.cpp:982 msgid "Showing certificate status with serial %1 failed (%2)." msgstr "Certificaatstatus met serienummer %1 kon niet worden getoond (%2)." -#: src/OpenSSLUtils.cpp:979 +#: src/OpenSSLUtils.cpp:1018 msgid "The key file does not exist." msgstr "Het sleutelbestand bestaat niet." -#: src/OpenSSLUtils.cpp:1474 +#: src/OpenSSLUtils.cpp:1306 src/OpenSSLUtils.cpp:1677 +#: src/OpenSSLUtils.cpp:1817 +#, fuzzy +msgid "Invalid password." +msgstr "Ongeldig CA-wachtwoord." + +#: src/OpenSSLUtils.cpp:1595 msgid "The password for encrypting the output is required." msgstr "Er is een wachtwoord vereist voor het coderen van de uitvoer." -#: src/OpenSSLUtils.cpp:1579 +#: src/OpenSSLUtils.cpp:1736 msgid "The PKCS12 password is required." msgstr "Het PKCS12-wachtwoord is vereist." -#: src/OpenSSLUtils.cpp:1665 src/OpenSSLUtils.cpp:1865 -#: src/OpenSSLUtils.cpp:2017 +#: src/OpenSSLUtils.cpp:1847 src/OpenSSLUtils.cpp:2047 +#: src/OpenSSLUtils.cpp:2199 msgid "Cannot read directory: %1 (%2) [%3]." msgstr "Kan directory niet lezen: %1 (%2) [%3]." -#: src/OpenSSLUtils.cpp:1715 +#: src/OpenSSLUtils.cpp:1897 msgid "No serial number found in %1." msgstr "Geen serienummer gevonden in %1." -#: src/OpenSSLUtils.cpp:1735 +#: src/OpenSSLUtils.cpp:1917 msgid "The request already exists." msgstr "Het verzoek bestaat al." -#: src/OpenSSLUtils.cpp:1926 +#: src/OpenSSLUtils.cpp:2108 msgid "Cannot find the request subject." msgstr "Kan het gevraagde onderwerp niet vinden." -#: src/OpenSSLUtils.cpp:2087 +#: src/OpenSSLUtils.cpp:2269 msgid "Cannot find the certificate subject." msgstr "Kan het certiferingsonderwerp niet vinden." -#: src/OpenSSLUtils.cpp:2186 +#: src/OpenSSLUtils.cpp:2368 msgid "Invalid caName: %1." msgstr "Ongeldige caName: %1." -#: src/OpenSSLUtils.cpp:2195 +#: src/OpenSSLUtils.cpp:2377 msgid "'%1' does not exist." msgstr "'%1' bestaat niet." -#: src/OpenSSLUtils.cpp:2205 +#: src/OpenSSLUtils.cpp:2387 msgid "%1 still exists." msgstr "%1 bestaat nog." -#: src/OpenSSLUtils.cpp:2216 src/OpenSSLUtils.cpp:2264 -#: src/OpenSSLUtils.cpp:2278 src/OpenSSLUtils.cpp:2292 -#: src/OpenSSLUtils.cpp:2306 src/OpenSSLUtils.cpp:2320 +#: src/OpenSSLUtils.cpp:2398 src/OpenSSLUtils.cpp:2446 +#: src/OpenSSLUtils.cpp:2460 src/OpenSSLUtils.cpp:2474 +#: src/OpenSSLUtils.cpp:2488 src/OpenSSLUtils.cpp:2502 msgid "Cannot create directory: %1 (%2 [%3])." msgstr "Kan directory niet maken: %1 (%2 [%3])." -#: src/OpenSSLUtils.cpp:2251 +#: src/OpenSSLUtils.cpp:2433 msgid "Cannot copy the configuration template." msgstr "Kan de configuratiesjabloon niet kopiÃ«ren." -#: src/OpenSSLUtils.cpp:2338 +#: src/OpenSSLUtils.cpp:2520 msgid "Cannot create the file." msgstr "Kan het bestand niet maken." @@ -747,28 +766,28 @@ msgid "Invalid SubjectKeyIdentifierExt object." msgstr "Ongeldig SubjectKeyIdentifierExt-object." -#: src/X509v3CertificateExtensions_Priv.cpp:394 -#: src/X509v3CertificateExtensions_Priv.cpp:450 +#: src/X509v3CertificateExtensions_Priv.cpp:395 +#: src/X509v3CertificateExtensions_Priv.cpp:452 #: src/X509v3RequestExtensions_Priv.cpp:134 #: src/X509v3RequestExtensions_Priv.cpp:189 msgid "Extension occurred more than once: %1." msgstr "Extensie komt meerdere keren voor: %1." -#: src/X509v3CertificateExtensions_Priv.cpp:401 -#: src/X509v3CertificateExtensions_Priv.cpp:457 +#: src/X509v3CertificateExtensions_Priv.cpp:402 +#: src/X509v3CertificateExtensions_Priv.cpp:459 #: src/X509v3RequestExtensions_Priv.cpp:141 #: src/X509v3RequestExtensions_Priv.cpp:196 msgid "Unable to parse the certificate (NID: %1 Crit: %2)." msgstr "Kan het certificaat niet parseren (NID: %1 Crit: %2)." -#: src/X509v3CertificateExtensions_Priv.cpp:509 -#: src/X509v3CertificateExtensions_Priv.cpp:575 -#: src/X509v3CertificateExtensions_Priv.cpp:639 -#: src/X509v3CertificateExtensions_Priv.cpp:701 -#: src/X509v3CertificateExtensions_Priv.cpp:771 -#: src/X509v3CertificateExtensions_Priv.cpp:840 -#: src/X509v3CertificateExtensions_Priv.cpp:916 -#: src/X509v3CertificateExtensions_Priv.cpp:1002 +#: src/X509v3CertificateExtensions_Priv.cpp:511 +#: src/X509v3CertificateExtensions_Priv.cpp:577 +#: src/X509v3CertificateExtensions_Priv.cpp:641 +#: src/X509v3CertificateExtensions_Priv.cpp:703 +#: src/X509v3CertificateExtensions_Priv.cpp:773 +#: src/X509v3CertificateExtensions_Priv.cpp:842 +#: src/X509v3CertificateExtensions_Priv.cpp:918 +#: src/X509v3CertificateExtensions_Priv.cpp:1004 #: src/X509v3CRLExtensions_Priv.cpp:135 #: src/X509v3RequestExtensions_Priv.cpp:249 #: src/X509v3RequestExtensions_Priv.cpp:315 @@ -777,14 +796,14 @@ msgid "Extension occurred more than once." msgstr "Extensie komt meerdere keren voor." -#: src/X509v3CertificateExtensions_Priv.cpp:514 -#: src/X509v3CertificateExtensions_Priv.cpp:580 -#: src/X509v3CertificateExtensions_Priv.cpp:644 -#: src/X509v3CertificateExtensions_Priv.cpp:707 -#: src/X509v3CertificateExtensions_Priv.cpp:776 -#: src/X509v3CertificateExtensions_Priv.cpp:846 -#: src/X509v3CertificateExtensions_Priv.cpp:921 -#: src/X509v3CertificateExtensions_Priv.cpp:1007 +#: src/X509v3CertificateExtensions_Priv.cpp:516 +#: src/X509v3CertificateExtensions_Priv.cpp:582 +#: src/X509v3CertificateExtensions_Priv.cpp:646 +#: src/X509v3CertificateExtensions_Priv.cpp:709 +#: src/X509v3CertificateExtensions_Priv.cpp:778 +#: src/X509v3CertificateExtensions_Priv.cpp:848 +#: src/X509v3CertificateExtensions_Priv.cpp:923 +#: src/X509v3CertificateExtensions_Priv.cpp:1009 #: src/X509v3CRLExtensions_Priv.cpp:140 #: src/X509v3RequestExtensions_Priv.cpp:254 #: src/X509v3RequestExtensions_Priv.cpp:320 @@ -793,7 +812,7 @@ msgid "Unable to parse the certificate (Crit: %1)." msgstr "Kan het certificaat niet parseren (Crit: %1)." -#: src/X509v3CertificateExtensions_Priv.cpp:941 +#: src/X509v3CertificateExtensions_Priv.cpp:943 msgid "Invalid location in authorityInfoAccess." msgstr "Ongeldige locatie in authorityInfoAccess." @@ -926,3 +945,6 @@ #: src/X509v3RequestExtensions.cpp:231 msgid "Invalid value for X509v3RequestExts::setSubjectAlternativeName." msgstr "Ongeldige waarde voor X509v3RequestExts::setSubjectAlternativeName." + +#~ msgid "Command returned '%1' : %2" +#~ msgstr "Commando antwoordde '%1': %2" Modified: limal-head/limal-ca-mgm/po/pa.po URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/po/pa.po?rev=… ============================================================================== --- limal-head/limal-ca-mgm/po/pa.po (original) +++ limal-head/limal-ca-mgm/po/pa.po Mon Oct 29 11:30:37 2007 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: limal-ca-mgm.pa\n" "Report-Msgid-Bugs-To: translation(a)suse.de\n" -"POT-Creation-Date: 2007-09-28 16:31+0200\n" +"POT-Creation-Date: 2007-10-29 11:25+0100\n" "PO-Revision-Date: 2007-08-15 08:43+0530\n" "Last-Translator: A S Alam <aalam(a)users.sf.net>\n" "Language-Team: Panjabi <punjabi-l10n(a)lists.sf.net>\n" @@ -31,8 +31,8 @@ #: src/AuthorityInfoAccessExtension.cpp:259 #: src/AuthorityInfoAccessExtension.cpp:342 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:87 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:194 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:86 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:193 #: src/BasicConstraintsExtension.cpp:84 src/BasicConstraintsExtension.cpp:187 #: src/BitExtensions.cpp:134 src/BitExtensions.cpp:247 #: src/BitExtensions.cpp:374 src/BitExtensions.cpp:482 src/CA.cpp:1565 @@ -79,12 +79,12 @@ msgid "AuthorityKeyIdentifierExt is not present." msgstr "AuthorityKeyIdentifierExt à¨®à©à¨à©à¨¦ à¨¨à¨¹à©à¨ à¨¹à©à¥¤" -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:155 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:174 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:154 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:173 msgid "AuthorityKeyIdentifierGenerateExt is not present." msgstr "AuthorityKeyIdentifierGenerateExt à¨®à©à¨à©à¨¦ à¨¨à¨¹à©à¨ à¨¹à©à¥¤" -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:186 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:185 msgid "Invalid AuthorityKeyIdentifierGenerateExt object." msgstr "à¨à¨²à¨¤ AuthorityKeyIdentifierGenerateExt à¨à¨¬à¨à©à¨à¨ à¨¹à©à¥¤" @@ -204,7 +204,7 @@ msgid "Duplicate DN. Request already exists." msgstr "à¨¡à©à¨ªà¨²à©à¨à©à¨ DN à¨¹à©à¥¤ à¨®à©°à¨ à¨ªà¨¹à¨¿à¨²à¨¾à¨ à¨¹à© à¨®à©à¨à©à¨¦ à¨¹à©à¥¤" -#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:968 +#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:1007 msgid "Cannot parse the certificate name." msgstr "à¨¸à¨°à¨à©à¨«à¨¿à¨à©à¨ à¨¨à¨¾à¨ à¨ªà¨¾à¨°à¨¸ à¨¨à¨¹à©à¨ à¨à©à¨¤à¨¾ à¨à¨¾ à¨¸à¨à¨¦à¨¾ à¨¹à©à¥¤" @@ -542,93 +542,112 @@ msgid "Invalid command %1." msgstr "à¨à¨²à¨¤ à¨à¨®à¨¾à¨à¨¡ %1 à¨¹à©à¥¤" -#: src/OpenSSLUtils.cpp:138 src/OpenSSLUtils.cpp:241 src/OpenSSLUtils.cpp:334 -#: src/OpenSSLUtils.cpp:453 src/OpenSSLUtils.cpp:586 src/OpenSSLUtils.cpp:681 -#: src/OpenSSLUtils.cpp:761 -msgid "Command returned '%1' : %2" -msgstr "'%1' à¨à¨®à¨¾à¨à¨¡ à¨¨à© à¨¦à¨¿à©±à¨¤à¨¾: %2" +#: src/OpenSSLUtils.cpp:132 src/OpenSSLUtils.cpp:240 src/OpenSSLUtils.cpp:338 +#: src/OpenSSLUtils.cpp:462 src/OpenSSLUtils.cpp:600 src/OpenSSLUtils.cpp:700 +#: src/OpenSSLUtils.cpp:782 src/OpenSSLUtils.cpp:871 src/OpenSSLUtils.cpp:952 +#: src/OpenSSLUtils.cpp:1051 src/OpenSSLUtils.cpp:1137 +#: src/OpenSSLUtils.cpp:1271 src/OpenSSLUtils.cpp:1390 +#: src/OpenSSLUtils.cpp:1493 src/OpenSSLUtils.cpp:1645 +#: src/OpenSSLUtils.cpp:1782 +msgid "Executing openssl command failed." +msgstr "" + +#: src/OpenSSLUtils.cpp:143 src/OpenSSLUtils.cpp:251 src/OpenSSLUtils.cpp:349 +#: src/OpenSSLUtils.cpp:473 src/OpenSSLUtils.cpp:611 src/OpenSSLUtils.cpp:711 +#: src/OpenSSLUtils.cpp:796 src/OpenSSLUtils.cpp:1162 +#: src/OpenSSLUtils.cpp:1311 src/OpenSSLUtils.cpp:1415 +#: src/OpenSSLUtils.cpp:1518 src/OpenSSLUtils.cpp:1682 +#: src/OpenSSLUtils.cpp:1822 +msgid "openssl command failed: %1" +msgstr "" -#: src/OpenSSLUtils.cpp:171 src/OpenSSLUtils.cpp:268 src/OpenSSLUtils.cpp:366 -#: src/OpenSSLUtils.cpp:479 src/OpenSSLUtils.cpp:613 src/OpenSSLUtils.cpp:704 +#: src/OpenSSLUtils.cpp:176 src/OpenSSLUtils.cpp:278 src/OpenSSLUtils.cpp:381 +#: src/OpenSSLUtils.cpp:499 src/OpenSSLUtils.cpp:638 src/OpenSSLUtils.cpp:734 msgid "No valid key file specified." msgstr "à¨à©à¨ à¨¢à©à©±à¨à¨µà©à¨ à¨«à¨¾à¨à¨² à¨¨à¨¹à©à¨ à¨¦à¨¿à©±à¨¤à© à¨à¨à¥¤" -#: src/OpenSSLUtils.cpp:276 src/OpenSSLUtils.cpp:374 +#: src/OpenSSLUtils.cpp:286 src/OpenSSLUtils.cpp:389 msgid "No valid request file specified." msgstr "à¨à©à¨ à¨¢à©à©±à¨à¨µà©à¨ à¨®à©°à¨ à¨«à¨¾à¨à¨² à¨¨à¨¹à©à¨ à¨¦à¨¿à©±à¨¤à© à¨¹à©à¥¤" -#: src/OpenSSLUtils.cpp:487 src/OpenSSLUtils.cpp:621 src/OpenSSLUtils.cpp:712 +#: src/OpenSSLUtils.cpp:507 src/OpenSSLUtils.cpp:646 src/OpenSSLUtils.cpp:742 msgid "No valid CA certificate file specified." msgstr "à¨à©à¨ à¨¢à©à©±à¨à¨µà©à¨ CA à¨¸à¨°à¨à©à¨«à¨¿à¨à©à¨ à¨«à¨¾à¨à¨² à¨¨à¨¹à©à¨ à¨¦à¨¿à©±à¨¤à©à¥¤" -#: src/OpenSSLUtils.cpp:495 src/OpenSSLUtils.cpp:785 +#: src/OpenSSLUtils.cpp:515 src/OpenSSLUtils.cpp:820 msgid "No valid certificate file specified." msgstr "à¨à©à¨ à¨¢à©à©±à¨à¨µà©à¨ à¨¸à¨°à¨à©à¨«à¨¿à¨à©à¨ à¨«à¨¾à¨à¨² à¨¨à¨¹à©à¨ à¨¦à¨¿à©±à¨¤à© à¨à¨ à¨¹à©à¥¤" -#: src/OpenSSLUtils.cpp:793 +#: src/OpenSSLUtils.cpp:828 msgid "No valid CA directory specified." msgstr "à¨à©à¨ à¨¢à©à©±à¨à¨µà©à¨ CA à¨¡à¨¾à¨à¨°à©à¨à¨à¨°à© à¨¨à¨¹à©à¨ à¨¦à¨¿à©±à¨¤à© à¨à¨ à¨¹à©à¥¤" -#: src/OpenSSLUtils.cpp:943 +#: src/OpenSSLUtils.cpp:982 msgid "Showing certificate status with serial %1 failed (%2)." msgstr "%1 à¨¸à©à¨°à©à¨à¨² à¨¨à¨¾à¨² à¨¸à¨°à¨à©à¨«à¨¿à¨à©à¨ à¨¹à¨¾à¨²à¨¤ à¨µà©à¨à¨¾à¨à¨£à¨¾ à¨«à©à¨²à©à¨¹ (%2)" -#: src/OpenSSLUtils.cpp:979 +#: src/OpenSSLUtils.cpp:1018 msgid "The key file does not exist." msgstr "à¨à©à©°à¨à© à¨«à¨¾à¨à¨² à¨®à©à¨à©à¨¦ à¨¨à¨¹à©à¨ à¨¹à©à¥¤" -#: src/OpenSSLUtils.cpp:1474 +#: src/OpenSSLUtils.cpp:1306 src/OpenSSLUtils.cpp:1677 +#: src/OpenSSLUtils.cpp:1817 +#, fuzzy +msgid "Invalid password." +msgstr "à¨à¨²à¨¤ CA à¨ªà¨¾à¨¸à¨µà¨°à¨¡ à¨¹à©à¥¤" + +#: src/OpenSSLUtils.cpp:1595 msgid "The password for encrypting the output is required." msgstr "à¨à¨à¨à¨ªà©à©±à¨ à¨¨à©à©° à¨à©°à¨à©à¨°à¨¿à¨ªà¨ à¨à¨°à¨¨ à¨²à¨ à¨ªà¨¾à¨¸à¨µà¨°à¨¡ à¨²à©à©à©à¨¦à¨¾ à¨¹à©à¥¤" -#: src/OpenSSLUtils.cpp:1579 +#: src/OpenSSLUtils.cpp:1736 msgid "The PKCS12 password is required." msgstr "PKCS12 à¨ªà¨¾à¨¸à¨µà¨°à¨¡ à¨²à©à©à©à¨¦à¨¾ à¨¹à©à¥¤" -#: src/OpenSSLUtils.cpp:1665 src/OpenSSLUtils.cpp:1865 -#: src/OpenSSLUtils.cpp:2017 +#: src/OpenSSLUtils.cpp:1847 src/OpenSSLUtils.cpp:2047 +#: src/OpenSSLUtils.cpp:2199 msgid "Cannot read directory: %1 (%2) [%3]." msgstr "à¨¡à¨¾à¨à¨°à©à¨à¨à¨°à© à¨ªà©à©à¨¹à© à¨¨à¨¹à©à¨ à¨à¨¾ à¨¸à¨à¨¦à©: %1 (%2) [%3]" -#: src/OpenSSLUtils.cpp:1715 +#: src/OpenSSLUtils.cpp:1897 msgid "No serial number found in %1." msgstr "%1 à¨µà¨¿à©±à¨ à¨à©à¨ à¨¸à©à¨°à©à¨à¨² à¨¨à©°à¨¬à¨° à¨¨à¨¹à©à¨ à¨²à©±à¨à¨¿à¨ à¨¹à©à¥¤" -#: src/OpenSSLUtils.cpp:1735 +#: src/OpenSSLUtils.cpp:1917 msgid "The request already exists." msgstr "à¨®à©°à¨ à¨ªà¨¹à¨¿à¨²à¨¾à¨ à¨¹à© à¨®à©à¨à©à¨¦ à¨¹à©à¥¤" -#: src/OpenSSLUtils.cpp:1926 +#: src/OpenSSLUtils.cpp:2108 msgid "Cannot find the request subject." msgstr "à¨®à©°à¨ à¨µà¨¿à¨¸à¨¼à¨¾ à¨²à©±à¨à¨¿à¨ à¨¨à¨¹à©à¨ à¨à¨¾ à¨¸à¨à¨¦à¨¾ à¨¹à©à¥¤" -#: src/OpenSSLUtils.cpp:2087 +#: src/OpenSSLUtils.cpp:2269 msgid "Cannot find the certificate subject." msgstr "à¨¸à¨°à¨à©à¨«à¨¿à¨à©à¨ à¨µà¨¿à¨¸à¨¼à¨¾ à¨¨à¨¹à©à¨ à¨²à©±à¨à¨¿à¨ à¨à¨¾ à¨¸à¨à¨¦à¨¾ à¨¹à©à¥¤" -#: src/OpenSSLUtils.cpp:2186 +#: src/OpenSSLUtils.cpp:2368 msgid "Invalid caName: %1." msgstr "à¨à¨²à¨¤ caName: %1." -#: src/OpenSSLUtils.cpp:2195 +#: src/OpenSSLUtils.cpp:2377 msgid "'%1' does not exist." msgstr "'%1' à¨®à©à¨à©à¨¦ à¨¨à¨¹à©à¨ à¨¹à©à¥¤" -#: src/OpenSSLUtils.cpp:2205 +#: src/OpenSSLUtils.cpp:2387 msgid "%1 still exists." msgstr "%1 à¨¹à¨¾à¨²à© à¨µà© à¨®à©à¨à©à¨¦ à¨¹à©à¥¤" -#: src/OpenSSLUtils.cpp:2216 src/OpenSSLUtils.cpp:2264 -#: src/OpenSSLUtils.cpp:2278 src/OpenSSLUtils.cpp:2292 -#: src/OpenSSLUtils.cpp:2306 src/OpenSSLUtils.cpp:2320 +#: src/OpenSSLUtils.cpp:2398 src/OpenSSLUtils.cpp:2446 +#: src/OpenSSLUtils.cpp:2460 src/OpenSSLUtils.cpp:2474 +#: src/OpenSSLUtils.cpp:2488 src/OpenSSLUtils.cpp:2502 msgid "Cannot create directory: %1 (%2 [%3])." msgstr "à¨¡à¨¾à¨à¨°à©à¨à¨à¨°à© à¨¨à¨¹à©à¨ à¨¬à¨£à¨¾à¨ à¨à¨¾ à¨¸à¨à¨¦à©: %1 (%2 [%3])" -#: src/OpenSSLUtils.cpp:2251 +#: src/OpenSSLUtils.cpp:2433 msgid "Cannot copy the configuration template." msgstr "à¨¸à©°à¨°à¨à¨¨à¨¾ à¨à©à¨ªà¨²à©à¨ à¨¨à¨à¨² à¨¨à¨¹à©à¨ à¨à©à¨¤à¨¾ à¨à¨¾ à¨¸à¨à¨¦à¨¾ à¨¹à©à¥¤" -#: src/OpenSSLUtils.cpp:2338 +#: src/OpenSSLUtils.cpp:2520 msgid "Cannot create the file." msgstr "à¨«à¨¾à¨à¨² à¨¨à¨¹à©à¨ à¨¬à¨£à¨¾à¨ à¨à¨¾ à¨¸à¨à¨¦à© à¨¹à©à¥¤" @@ -747,28 +766,28 @@ msgid "Invalid SubjectKeyIdentifierExt object." msgstr "à¨à¨²à¨¤ SubjectKeyIdentifierExt à¨à¨¬à¨à©à¨à¨ à¨¹à©à¥¤" -#: src/X509v3CertificateExtensions_Priv.cpp:394 -#: src/X509v3CertificateExtensions_Priv.cpp:450 +#: src/X509v3CertificateExtensions_Priv.cpp:395 +#: src/X509v3CertificateExtensions_Priv.cpp:452 #: src/X509v3RequestExtensions_Priv.cpp:134 #: src/X509v3RequestExtensions_Priv.cpp:189 msgid "Extension occurred more than once: %1." msgstr "à¨à¨à¨¸à¨¼à¨à©à¨¸à¨¼à¨¨ à¨à©±à¨ à¨¤à©à¨ à¨µà©±à¨§ à¨µà¨¾à¨° à¨à¨ à¨¹à©: %1" -#: src/X509v3CertificateExtensions_Priv.cpp:401 -#: src/X509v3CertificateExtensions_Priv.cpp:457 +#: src/X509v3CertificateExtensions_Priv.cpp:402 +#: src/X509v3CertificateExtensions_Priv.cpp:459 #: src/X509v3RequestExtensions_Priv.cpp:141 #: src/X509v3RequestExtensions_Priv.cpp:196 msgid "Unable to parse the certificate (NID: %1 Crit: %2)." msgstr "à¨¸à¨°à¨à©à¨«à¨¿à¨à©à¨ à¨¨à©à©° à¨ªà¨¾à¨°à¨¸ à¨à¨°à¨¨ à¨²à¨ à¨à¨¸à¨«à¨¼à¨² (NID: %1 Crit: %2)" -#: src/X509v3CertificateExtensions_Priv.cpp:509 -#: src/X509v3CertificateExtensions_Priv.cpp:575 -#: src/X509v3CertificateExtensions_Priv.cpp:639 -#: src/X509v3CertificateExtensions_Priv.cpp:701 -#: src/X509v3CertificateExtensions_Priv.cpp:771 -#: src/X509v3CertificateExtensions_Priv.cpp:840 -#: src/X509v3CertificateExtensions_Priv.cpp:916 -#: src/X509v3CertificateExtensions_Priv.cpp:1002 +#: src/X509v3CertificateExtensions_Priv.cpp:511 +#: src/X509v3CertificateExtensions_Priv.cpp:577 +#: src/X509v3CertificateExtensions_Priv.cpp:641 +#: src/X509v3CertificateExtensions_Priv.cpp:703 +#: src/X509v3CertificateExtensions_Priv.cpp:773 +#: src/X509v3CertificateExtensions_Priv.cpp:842 +#: src/X509v3CertificateExtensions_Priv.cpp:918 +#: src/X509v3CertificateExtensions_Priv.cpp:1004 #: src/X509v3CRLExtensions_Priv.cpp:135 #: src/X509v3RequestExtensions_Priv.cpp:249 #: src/X509v3RequestExtensions_Priv.cpp:315 @@ -777,14 +796,14 @@ msgid "Extension occurred more than once." msgstr "à¨®à©à¨à©à¨¦à¨à© à¨à©±à¨ à¨¤à©à¨ à¨µà©±à¨§ à¨¹à©à¥¤" -#: src/X509v3CertificateExtensions_Priv.cpp:514 -#: src/X509v3CertificateExtensions_Priv.cpp:580 -#: src/X509v3CertificateExtensions_Priv.cpp:644 -#: src/X509v3CertificateExtensions_Priv.cpp:707 -#: src/X509v3CertificateExtensions_Priv.cpp:776 -#: src/X509v3CertificateExtensions_Priv.cpp:846 -#: src/X509v3CertificateExtensions_Priv.cpp:921 -#: src/X509v3CertificateExtensions_Priv.cpp:1007 +#: src/X509v3CertificateExtensions_Priv.cpp:516 +#: src/X509v3CertificateExtensions_Priv.cpp:582 +#: src/X509v3CertificateExtensions_Priv.cpp:646 +#: src/X509v3CertificateExtensions_Priv.cpp:709 +#: src/X509v3CertificateExtensions_Priv.cpp:778 +#: src/X509v3CertificateExtensions_Priv.cpp:848 +#: src/X509v3CertificateExtensions_Priv.cpp:923 +#: src/X509v3CertificateExtensions_Priv.cpp:1009 #: src/X509v3CRLExtensions_Priv.cpp:140 #: src/X509v3RequestExtensions_Priv.cpp:254 #: src/X509v3RequestExtensions_Priv.cpp:320 @@ -793,7 +812,7 @@ msgid "Unable to parse the certificate (Crit: %1)." msgstr "`%1' à¨¨à©à©° à¨ªà©à©à¨¹à¨¿à¨ à¨¨à¨¹à©à¨ à¨à¨¾ à¨¸à¨à¨¦à¨¾: %2" -#: src/X509v3CertificateExtensions_Priv.cpp:941 +#: src/X509v3CertificateExtensions_Priv.cpp:943 msgid "Invalid location in authorityInfoAccess." msgstr "authorityInfoAccess à¨µà¨¿à©±à¨ à¨à¨²à¨¤ à¨à¨¿à¨à¨¾à¨£à¨¾ à¨¹à©à¥¤" @@ -916,3 +935,6 @@ #: src/X509v3RequestExtensions.cpp:231 msgid "Invalid value for X509v3RequestExts::setSubjectAlternativeName." msgstr "X509v3RequestExts::setSubjectAlternativeName à¨²à¨ à¨à¨²à¨¤ à¨®à©à©±à¨² à¨¹à©à¥¤" + +#~ msgid "Command returned '%1' : %2" +#~ msgstr "'%1' à¨à¨®à¨¾à¨à¨¡ à¨¨à© à¨¦à¨¿à©±à¨¤à¨¾: %2" Modified: limal-head/limal-ca-mgm/po/pl.po URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/po/pl.po?rev=… ============================================================================== --- limal-head/limal-ca-mgm/po/pl.po (original) +++ limal-head/limal-ca-mgm/po/pl.po Mon Oct 29 11:30:37 2007 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: limal-ca-mgm\n" "Report-Msgid-Bugs-To: translation(a)suse.de\n" -"POT-Creation-Date: 2007-09-28 16:31+0200\n" +"POT-Creation-Date: 2007-10-29 11:25+0100\n" "PO-Revision-Date: 2007-07-26 23:23+0100\n" "Last-Translator: wadim dziedzic <wdziedzi(a)aviary.pl>\n" "Language-Team: <pl(a)li.org>\n" @@ -30,8 +30,8 @@ #: src/AuthorityInfoAccessExtension.cpp:259 #: src/AuthorityInfoAccessExtension.cpp:342 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:87 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:194 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:86 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:193 #: src/BasicConstraintsExtension.cpp:84 src/BasicConstraintsExtension.cpp:187 #: src/BitExtensions.cpp:134 src/BitExtensions.cpp:247 #: src/BitExtensions.cpp:374 src/BitExtensions.cpp:482 src/CA.cpp:1565 @@ -78,12 +78,12 @@ msgid "AuthorityKeyIdentifierExt is not present." msgstr "AuthorityKeyIdentifierExt nie istnieje." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:155 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:174 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:154 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:173 msgid "AuthorityKeyIdentifierGenerateExt is not present." msgstr "AuthorityKeyIdentifierGenerateExt nie istnieje." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:186 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:185 msgid "Invalid AuthorityKeyIdentifierGenerateExt object." msgstr "NieprawidÅowy obiekt AuthorityKeyIdentifierGenerateExt." @@ -203,7 +203,7 @@ msgid "Duplicate DN. Request already exists." msgstr "Duplikat DN. Å»Ädanie juÅ¼ istnieje." -#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:968 +#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:1007 msgid "Cannot parse the certificate name." msgstr "Analiza nazwy certyfikatu nie powiodÅa siÄ." @@ -542,93 +542,112 @@ msgid "Invalid command %1." msgstr "NieprawidÅowe polecenie %1." -#: src/OpenSSLUtils.cpp:138 src/OpenSSLUtils.cpp:241 src/OpenSSLUtils.cpp:334 -#: src/OpenSSLUtils.cpp:453 src/OpenSSLUtils.cpp:586 src/OpenSSLUtils.cpp:681 -#: src/OpenSSLUtils.cpp:761 -msgid "Command returned '%1' : %2" -msgstr "Polecenie %2 zwrÃ³ciÅo wartoÅÄ '%1'." +#: src/OpenSSLUtils.cpp:132 src/OpenSSLUtils.cpp:240 src/OpenSSLUtils.cpp:338 +#: src/OpenSSLUtils.cpp:462 src/OpenSSLUtils.cpp:600 src/OpenSSLUtils.cpp:700 +#: src/OpenSSLUtils.cpp:782 src/OpenSSLUtils.cpp:871 src/OpenSSLUtils.cpp:952 +#: src/OpenSSLUtils.cpp:1051 src/OpenSSLUtils.cpp:1137 +#: src/OpenSSLUtils.cpp:1271 src/OpenSSLUtils.cpp:1390 +#: src/OpenSSLUtils.cpp:1493 src/OpenSSLUtils.cpp:1645 +#: src/OpenSSLUtils.cpp:1782 +msgid "Executing openssl command failed." +msgstr "" + +#: src/OpenSSLUtils.cpp:143 src/OpenSSLUtils.cpp:251 src/OpenSSLUtils.cpp:349 +#: src/OpenSSLUtils.cpp:473 src/OpenSSLUtils.cpp:611 src/OpenSSLUtils.cpp:711 +#: src/OpenSSLUtils.cpp:796 src/OpenSSLUtils.cpp:1162 +#: src/OpenSSLUtils.cpp:1311 src/OpenSSLUtils.cpp:1415 +#: src/OpenSSLUtils.cpp:1518 src/OpenSSLUtils.cpp:1682 +#: src/OpenSSLUtils.cpp:1822 +msgid "openssl command failed: %1" +msgstr "" -#: src/OpenSSLUtils.cpp:171 src/OpenSSLUtils.cpp:268 src/OpenSSLUtils.cpp:366 -#: src/OpenSSLUtils.cpp:479 src/OpenSSLUtils.cpp:613 src/OpenSSLUtils.cpp:704 +#: src/OpenSSLUtils.cpp:176 src/OpenSSLUtils.cpp:278 src/OpenSSLUtils.cpp:381 +#: src/OpenSSLUtils.cpp:499 src/OpenSSLUtils.cpp:638 src/OpenSSLUtils.cpp:734 msgid "No valid key file specified." msgstr "Nie podano prawidÅowego pliku klucza." -#: src/OpenSSLUtils.cpp:276 src/OpenSSLUtils.cpp:374 +#: src/OpenSSLUtils.cpp:286 src/OpenSSLUtils.cpp:389 msgid "No valid request file specified." msgstr "Nie podano prawidÅowego pliku Å¼Ädania." -#: src/OpenSSLUtils.cpp:487 src/OpenSSLUtils.cpp:621 src/OpenSSLUtils.cpp:712 +#: src/OpenSSLUtils.cpp:507 src/OpenSSLUtils.cpp:646 src/OpenSSLUtils.cpp:742 msgid "No valid CA certificate file specified." msgstr "Nie podano prawidÅowego pliku certyfikatu CA." -#: src/OpenSSLUtils.cpp:495 src/OpenSSLUtils.cpp:785 +#: src/OpenSSLUtils.cpp:515 src/OpenSSLUtils.cpp:820 msgid "No valid certificate file specified." msgstr "Nie podano prawidÅowego pliku certyfikatu." -#: src/OpenSSLUtils.cpp:793 +#: src/OpenSSLUtils.cpp:828 msgid "No valid CA directory specified." msgstr "Nie podano prawidÅowego katalogu CA." -#: src/OpenSSLUtils.cpp:943 +#: src/OpenSSLUtils.cpp:982 msgid "Showing certificate status with serial %1 failed (%2)." msgstr "WyÅwietlenie statusu certyfikatu z serii %1 nie powiodÅo siÄ (%2)." -#: src/OpenSSLUtils.cpp:979 +#: src/OpenSSLUtils.cpp:1018 msgid "The key file does not exist." msgstr "Plik klucza nie istnieje." -#: src/OpenSSLUtils.cpp:1474 +#: src/OpenSSLUtils.cpp:1306 src/OpenSSLUtils.cpp:1677 +#: src/OpenSSLUtils.cpp:1817 +#, fuzzy +msgid "Invalid password." +msgstr "NieprawidÅowe hasÅo CA." + +#: src/OpenSSLUtils.cpp:1595 msgid "The password for encrypting the output is required." msgstr "Do zakodowania wyjÅcia wymagane jest hasÅo." -#: src/OpenSSLUtils.cpp:1579 +#: src/OpenSSLUtils.cpp:1736 msgid "The PKCS12 password is required." msgstr "Wymagane jest hasÅo PKCS12." -#: src/OpenSSLUtils.cpp:1665 src/OpenSSLUtils.cpp:1865 -#: src/OpenSSLUtils.cpp:2017 +#: src/OpenSSLUtils.cpp:1847 src/OpenSSLUtils.cpp:2047 +#: src/OpenSSLUtils.cpp:2199 msgid "Cannot read directory: %1 (%2) [%3]." msgstr "Nie moÅ¼na odczytaÄ zawartoÅci katalogu: %1 (%2) [%3]." -#: src/OpenSSLUtils.cpp:1715 +#: src/OpenSSLUtils.cpp:1897 msgid "No serial number found in %1." msgstr "Nie znaleziono numeru seryjnego w %1." -#: src/OpenSSLUtils.cpp:1735 +#: src/OpenSSLUtils.cpp:1917 msgid "The request already exists." msgstr "Å»Ädanie juÅ¼ istnieje." -#: src/OpenSSLUtils.cpp:1926 +#: src/OpenSSLUtils.cpp:2108 msgid "Cannot find the request subject." msgstr "Nie moÅ¼na odnaleÅºÄ tematu Å¼Ädania." -#: src/OpenSSLUtils.cpp:2087 +#: src/OpenSSLUtils.cpp:2269 msgid "Cannot find the certificate subject." msgstr "Nie moÅ¼na odnaleÅºÄ tematu certyfikatu." -#: src/OpenSSLUtils.cpp:2186 +#: src/OpenSSLUtils.cpp:2368 msgid "Invalid caName: %1." msgstr "NieprawidÅowy caName: %1." -#: src/OpenSSLUtils.cpp:2195 +#: src/OpenSSLUtils.cpp:2377 msgid "'%1' does not exist." msgstr "\"%1\" nie istnieje." -#: src/OpenSSLUtils.cpp:2205 +#: src/OpenSSLUtils.cpp:2387 msgid "%1 still exists." msgstr "%1 wciÄÅ¼ istnieje." -#: src/OpenSSLUtils.cpp:2216 src/OpenSSLUtils.cpp:2264 -#: src/OpenSSLUtils.cpp:2278 src/OpenSSLUtils.cpp:2292 -#: src/OpenSSLUtils.cpp:2306 src/OpenSSLUtils.cpp:2320 +#: src/OpenSSLUtils.cpp:2398 src/OpenSSLUtils.cpp:2446 +#: src/OpenSSLUtils.cpp:2460 src/OpenSSLUtils.cpp:2474 +#: src/OpenSSLUtils.cpp:2488 src/OpenSSLUtils.cpp:2502 msgid "Cannot create directory: %1 (%2 [%3])." msgstr "Nie moÅ¼na utworzyÄ katalogu: %1 (%2 [%3])." -#: src/OpenSSLUtils.cpp:2251 +#: src/OpenSSLUtils.cpp:2433 msgid "Cannot copy the configuration template." msgstr "Nie moÅ¼na skopiowaÄ szablonu konfiguracji." -#: src/OpenSSLUtils.cpp:2338 +#: src/OpenSSLUtils.cpp:2520 msgid "Cannot create the file." msgstr "Nie moÅ¼na utworzyÄ pliku." @@ -747,28 +766,28 @@ msgid "Invalid SubjectKeyIdentifierExt object." msgstr "NieprawidÅowy obiekt SubjectKeyIdentifierExt." -#: src/X509v3CertificateExtensions_Priv.cpp:394 -#: src/X509v3CertificateExtensions_Priv.cpp:450 +#: src/X509v3CertificateExtensions_Priv.cpp:395 +#: src/X509v3CertificateExtensions_Priv.cpp:452 #: src/X509v3RequestExtensions_Priv.cpp:134 #: src/X509v3RequestExtensions_Priv.cpp:189 msgid "Extension occurred more than once: %1." msgstr "Rozszerzenie wystÄpuje wiÄcej niÅ¼ raz: %1." -#: src/X509v3CertificateExtensions_Priv.cpp:401 -#: src/X509v3CertificateExtensions_Priv.cpp:457 +#: src/X509v3CertificateExtensions_Priv.cpp:402 +#: src/X509v3CertificateExtensions_Priv.cpp:459 #: src/X509v3RequestExtensions_Priv.cpp:141 #: src/X509v3RequestExtensions_Priv.cpp:196 msgid "Unable to parse the certificate (NID: %1 Crit: %2)." msgstr "Analiza certyfikatu nie byÅa moÅ¼liwa (NID: %1 Crit: %2)." -#: src/X509v3CertificateExtensions_Priv.cpp:509 -#: src/X509v3CertificateExtensions_Priv.cpp:575 -#: src/X509v3CertificateExtensions_Priv.cpp:639 -#: src/X509v3CertificateExtensions_Priv.cpp:701 -#: src/X509v3CertificateExtensions_Priv.cpp:771 -#: src/X509v3CertificateExtensions_Priv.cpp:840 -#: src/X509v3CertificateExtensions_Priv.cpp:916 -#: src/X509v3CertificateExtensions_Priv.cpp:1002 +#: src/X509v3CertificateExtensions_Priv.cpp:511 +#: src/X509v3CertificateExtensions_Priv.cpp:577 +#: src/X509v3CertificateExtensions_Priv.cpp:641 +#: src/X509v3CertificateExtensions_Priv.cpp:703 +#: src/X509v3CertificateExtensions_Priv.cpp:773 +#: src/X509v3CertificateExtensions_Priv.cpp:842 +#: src/X509v3CertificateExtensions_Priv.cpp:918 +#: src/X509v3CertificateExtensions_Priv.cpp:1004 #: src/X509v3CRLExtensions_Priv.cpp:135 #: src/X509v3RequestExtensions_Priv.cpp:249 #: src/X509v3RequestExtensions_Priv.cpp:315 @@ -777,14 +796,14 @@ msgid "Extension occurred more than once." msgstr "Rozszerzenie wystÄpuje wiecej niÅ¼ raz." -#: src/X509v3CertificateExtensions_Priv.cpp:514 -#: src/X509v3CertificateExtensions_Priv.cpp:580 -#: src/X509v3CertificateExtensions_Priv.cpp:644 -#: src/X509v3CertificateExtensions_Priv.cpp:707 -#: src/X509v3CertificateExtensions_Priv.cpp:776 -#: src/X509v3CertificateExtensions_Priv.cpp:846 -#: src/X509v3CertificateExtensions_Priv.cpp:921 -#: src/X509v3CertificateExtensions_Priv.cpp:1007 +#: src/X509v3CertificateExtensions_Priv.cpp:516 +#: src/X509v3CertificateExtensions_Priv.cpp:582 +#: src/X509v3CertificateExtensions_Priv.cpp:646 +#: src/X509v3CertificateExtensions_Priv.cpp:709 +#: src/X509v3CertificateExtensions_Priv.cpp:778 +#: src/X509v3CertificateExtensions_Priv.cpp:848 +#: src/X509v3CertificateExtensions_Priv.cpp:923 +#: src/X509v3CertificateExtensions_Priv.cpp:1009 #: src/X509v3CRLExtensions_Priv.cpp:140 #: src/X509v3RequestExtensions_Priv.cpp:254 #: src/X509v3RequestExtensions_Priv.cpp:320 @@ -793,7 +812,7 @@ msgid "Unable to parse the certificate (Crit: %1)." msgstr "Analiza certyfikatu nie byÅa moÅ¼liwa (Crit: %1)." -#: src/X509v3CertificateExtensions_Priv.cpp:941 +#: src/X509v3CertificateExtensions_Priv.cpp:943 msgid "Invalid location in authorityInfoAccess." msgstr "NieprawidÅowa lokalizacja w authorityInfoAccess." @@ -937,3 +956,6 @@ msgid "Invalid value for X509v3RequestExts::setSubjectAlternativeName." msgstr "" "NieprawidÅowa wartoÅÄ dla X509v3RequestExts::setSubjectAlternativeName." + +#~ msgid "Command returned '%1' : %2" +#~ msgstr "Polecenie %2 zwrÃ³ciÅo wartoÅÄ '%1'." Modified: limal-head/limal-ca-mgm/po/pt.po URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/po/pt.po?rev=… ============================================================================== --- limal-head/limal-ca-mgm/po/pt.po (original) +++ limal-head/limal-ca-mgm/po/pt.po Mon Oct 29 11:30:37 2007 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: limal-ca-mgm\n" "Report-Msgid-Bugs-To: translation(a)suse.de\n" -"POT-Creation-Date: 2007-09-28 16:31+0200\n" +"POT-Creation-Date: 2007-10-29 11:25+0100\n" "PO-Revision-Date: 2007-09-08 14:41+0100\n" "Last-Translator: Carlos GonÃ§alves <carlos(a)pinguix.com>\n" "Language-Team: Portuguese <opensuse-pt(a)opensuse.org>\n" @@ -32,8 +32,8 @@ #: src/AuthorityInfoAccessExtension.cpp:259 #: src/AuthorityInfoAccessExtension.cpp:342 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:87 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:194 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:86 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:193 #: src/BasicConstraintsExtension.cpp:84 src/BasicConstraintsExtension.cpp:187 #: src/BitExtensions.cpp:134 src/BitExtensions.cpp:247 #: src/BitExtensions.cpp:374 src/BitExtensions.cpp:482 src/CA.cpp:1565 @@ -80,12 +80,12 @@ msgid "AuthorityKeyIdentifierExt is not present." msgstr "AuthorityKeyIdentifierExt nÃ£o estÃ¡ presente." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:155 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:174 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:154 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:173 msgid "AuthorityKeyIdentifierGenerateExt is not present." msgstr "AuthorityKeyIdentifierGenerateExt nÃ£o estÃ¡ presente." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:186 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:185 msgid "Invalid AuthorityKeyIdentifierGenerateExt object." msgstr "Objecto AuthorityKeyIdentifierGenerateExt invÃ¡lido." @@ -205,7 +205,7 @@ msgid "Duplicate DN. Request already exists." msgstr "DN duplicado. O pedido jÃ¡ existe." -#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:968 +#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:1007 msgid "Cannot parse the certificate name." msgstr "NÃ£o Ã© possÃvel interpretar o nome de certificado." @@ -543,94 +543,113 @@ msgid "Invalid command %1." msgstr "Comando invÃ¡lido %1." -#: src/OpenSSLUtils.cpp:138 src/OpenSSLUtils.cpp:241 src/OpenSSLUtils.cpp:334 -#: src/OpenSSLUtils.cpp:453 src/OpenSSLUtils.cpp:586 src/OpenSSLUtils.cpp:681 -#: src/OpenSSLUtils.cpp:761 -msgid "Command returned '%1' : %2" -msgstr "O comando devolveu '%1' : %2" +#: src/OpenSSLUtils.cpp:132 src/OpenSSLUtils.cpp:240 src/OpenSSLUtils.cpp:338 +#: src/OpenSSLUtils.cpp:462 src/OpenSSLUtils.cpp:600 src/OpenSSLUtils.cpp:700 +#: src/OpenSSLUtils.cpp:782 src/OpenSSLUtils.cpp:871 src/OpenSSLUtils.cpp:952 +#: src/OpenSSLUtils.cpp:1051 src/OpenSSLUtils.cpp:1137 +#: src/OpenSSLUtils.cpp:1271 src/OpenSSLUtils.cpp:1390 +#: src/OpenSSLUtils.cpp:1493 src/OpenSSLUtils.cpp:1645 +#: src/OpenSSLUtils.cpp:1782 +msgid "Executing openssl command failed." +msgstr "" + +#: src/OpenSSLUtils.cpp:143 src/OpenSSLUtils.cpp:251 src/OpenSSLUtils.cpp:349 +#: src/OpenSSLUtils.cpp:473 src/OpenSSLUtils.cpp:611 src/OpenSSLUtils.cpp:711 +#: src/OpenSSLUtils.cpp:796 src/OpenSSLUtils.cpp:1162 +#: src/OpenSSLUtils.cpp:1311 src/OpenSSLUtils.cpp:1415 +#: src/OpenSSLUtils.cpp:1518 src/OpenSSLUtils.cpp:1682 +#: src/OpenSSLUtils.cpp:1822 +msgid "openssl command failed: %1" +msgstr "" -#: src/OpenSSLUtils.cpp:171 src/OpenSSLUtils.cpp:268 src/OpenSSLUtils.cpp:366 -#: src/OpenSSLUtils.cpp:479 src/OpenSSLUtils.cpp:613 src/OpenSSLUtils.cpp:704 +#: src/OpenSSLUtils.cpp:176 src/OpenSSLUtils.cpp:278 src/OpenSSLUtils.cpp:381 +#: src/OpenSSLUtils.cpp:499 src/OpenSSLUtils.cpp:638 src/OpenSSLUtils.cpp:734 msgid "No valid key file specified." msgstr "NÃ£o foi especificado um ficheiro de chave vÃ¡lido." -#: src/OpenSSLUtils.cpp:276 src/OpenSSLUtils.cpp:374 +#: src/OpenSSLUtils.cpp:286 src/OpenSSLUtils.cpp:389 msgid "No valid request file specified." msgstr "NÃ£o foi especificado um ficheiro de pedido vÃ¡lido." -#: src/OpenSSLUtils.cpp:487 src/OpenSSLUtils.cpp:621 src/OpenSSLUtils.cpp:712 +#: src/OpenSSLUtils.cpp:507 src/OpenSSLUtils.cpp:646 src/OpenSSLUtils.cpp:742 msgid "No valid CA certificate file specified." msgstr "NÃ£o foi especificado um certificado de CA vÃ¡lido." -#: src/OpenSSLUtils.cpp:495 src/OpenSSLUtils.cpp:785 +#: src/OpenSSLUtils.cpp:515 src/OpenSSLUtils.cpp:820 msgid "No valid certificate file specified." msgstr "NÃ£o foi especificado um ficheiro de certificado vÃ¡lido." -#: src/OpenSSLUtils.cpp:793 +#: src/OpenSSLUtils.cpp:828 msgid "No valid CA directory specified." msgstr "NÃ£o foi especificado um directÃ³rio de CA vÃ¡lido." -#: src/OpenSSLUtils.cpp:943 +#: src/OpenSSLUtils.cpp:982 msgid "Showing certificate status with serial %1 failed (%2)." msgstr "" "Falhou a apresentaÃ§Ã£o do estado do certificado com o nÃºmero de sÃ©rie %1 (%2)." -#: src/OpenSSLUtils.cpp:979 +#: src/OpenSSLUtils.cpp:1018 msgid "The key file does not exist." msgstr "O ficheiro de chave nÃ£o existe." -#: src/OpenSSLUtils.cpp:1474 +#: src/OpenSSLUtils.cpp:1306 src/OpenSSLUtils.cpp:1677 +#: src/OpenSSLUtils.cpp:1817 +#, fuzzy +msgid "Invalid password." +msgstr "Palavra passe de CA invÃ¡lida." + +#: src/OpenSSLUtils.cpp:1595 msgid "The password for encrypting the output is required." msgstr "Ã necessÃ¡ria a palavra passe para encriptar o resultado." -#: src/OpenSSLUtils.cpp:1579 +#: src/OpenSSLUtils.cpp:1736 msgid "The PKCS12 password is required." msgstr "Ã necessÃ¡ria a palavra passe de PKCS12." -#: src/OpenSSLUtils.cpp:1665 src/OpenSSLUtils.cpp:1865 -#: src/OpenSSLUtils.cpp:2017 +#: src/OpenSSLUtils.cpp:1847 src/OpenSSLUtils.cpp:2047 +#: src/OpenSSLUtils.cpp:2199 msgid "Cannot read directory: %1 (%2) [%3]." msgstr "NÃ£o foi possÃvel ler o directÃ³rio: %1 (%2) [%3]." -#: src/OpenSSLUtils.cpp:1715 +#: src/OpenSSLUtils.cpp:1897 msgid "No serial number found in %1." msgstr "NÃ£o foi encontrado um nÃºmero de sÃ©rie em %1." -#: src/OpenSSLUtils.cpp:1735 +#: src/OpenSSLUtils.cpp:1917 msgid "The request already exists." msgstr "O pedido jÃ¡ existe." -#: src/OpenSSLUtils.cpp:1926 +#: src/OpenSSLUtils.cpp:2108 msgid "Cannot find the request subject." msgstr "NÃ£o Ã© possÃvel encontrar o objecto do pedido." -#: src/OpenSSLUtils.cpp:2087 +#: src/OpenSSLUtils.cpp:2269 msgid "Cannot find the certificate subject." msgstr "NÃ£o Ã© possÃvel encontrar o certificado do pedido." -#: src/OpenSSLUtils.cpp:2186 +#: src/OpenSSLUtils.cpp:2368 msgid "Invalid caName: %1." msgstr "caName invÃ¡lido: %1." -#: src/OpenSSLUtils.cpp:2195 +#: src/OpenSSLUtils.cpp:2377 msgid "'%1' does not exist." msgstr "'%1' nÃ£o existe." -#: src/OpenSSLUtils.cpp:2205 +#: src/OpenSSLUtils.cpp:2387 msgid "%1 still exists." msgstr "%1 ainda existe." -#: src/OpenSSLUtils.cpp:2216 src/OpenSSLUtils.cpp:2264 -#: src/OpenSSLUtils.cpp:2278 src/OpenSSLUtils.cpp:2292 -#: src/OpenSSLUtils.cpp:2306 src/OpenSSLUtils.cpp:2320 +#: src/OpenSSLUtils.cpp:2398 src/OpenSSLUtils.cpp:2446 +#: src/OpenSSLUtils.cpp:2460 src/OpenSSLUtils.cpp:2474 +#: src/OpenSSLUtils.cpp:2488 src/OpenSSLUtils.cpp:2502 msgid "Cannot create directory: %1 (%2 [%3])." msgstr "NÃ£o Ã© possÃvel criar o directÃ³rio: %1 (%2 [%3])." -#: src/OpenSSLUtils.cpp:2251 +#: src/OpenSSLUtils.cpp:2433 msgid "Cannot copy the configuration template." msgstr "NÃ£o Ã© possÃvel copiar o modelo de configuraÃ§Ã£o." -#: src/OpenSSLUtils.cpp:2338 +#: src/OpenSSLUtils.cpp:2520 msgid "Cannot create the file." msgstr "NÃ£o Ã© possÃvel criar o ficheiro." @@ -749,28 +768,28 @@ msgid "Invalid SubjectKeyIdentifierExt object." msgstr "Objecto SubjectKeyIdentifierExt invÃ¡lido." -#: src/X509v3CertificateExtensions_Priv.cpp:394 -#: src/X509v3CertificateExtensions_Priv.cpp:450 +#: src/X509v3CertificateExtensions_Priv.cpp:395 +#: src/X509v3CertificateExtensions_Priv.cpp:452 #: src/X509v3RequestExtensions_Priv.cpp:134 #: src/X509v3RequestExtensions_Priv.cpp:189 msgid "Extension occurred more than once: %1." msgstr "ExtensÃ£o ocorreu mais do que uma vez: %1." -#: src/X509v3CertificateExtensions_Priv.cpp:401 -#: src/X509v3CertificateExtensions_Priv.cpp:457 +#: src/X509v3CertificateExtensions_Priv.cpp:402 +#: src/X509v3CertificateExtensions_Priv.cpp:459 #: src/X509v3RequestExtensions_Priv.cpp:141 #: src/X509v3RequestExtensions_Priv.cpp:196 msgid "Unable to parse the certificate (NID: %1 Crit: %2)." msgstr "NÃ£o foi possÃvel interpretar o certificado (NID: %1 Crit: %2)." -#: src/X509v3CertificateExtensions_Priv.cpp:509 -#: src/X509v3CertificateExtensions_Priv.cpp:575 -#: src/X509v3CertificateExtensions_Priv.cpp:639 -#: src/X509v3CertificateExtensions_Priv.cpp:701 -#: src/X509v3CertificateExtensions_Priv.cpp:771 -#: src/X509v3CertificateExtensions_Priv.cpp:840 -#: src/X509v3CertificateExtensions_Priv.cpp:916 -#: src/X509v3CertificateExtensions_Priv.cpp:1002 +#: src/X509v3CertificateExtensions_Priv.cpp:511 +#: src/X509v3CertificateExtensions_Priv.cpp:577 +#: src/X509v3CertificateExtensions_Priv.cpp:641 +#: src/X509v3CertificateExtensions_Priv.cpp:703 +#: src/X509v3CertificateExtensions_Priv.cpp:773 +#: src/X509v3CertificateExtensions_Priv.cpp:842 +#: src/X509v3CertificateExtensions_Priv.cpp:918 +#: src/X509v3CertificateExtensions_Priv.cpp:1004 #: src/X509v3CRLExtensions_Priv.cpp:135 #: src/X509v3RequestExtensions_Priv.cpp:249 #: src/X509v3RequestExtensions_Priv.cpp:315 @@ -779,14 +798,14 @@ msgid "Extension occurred more than once." msgstr "ExtensÃ£o ocorreu mais do que uma vez." -#: src/X509v3CertificateExtensions_Priv.cpp:514 -#: src/X509v3CertificateExtensions_Priv.cpp:580 -#: src/X509v3CertificateExtensions_Priv.cpp:644 -#: src/X509v3CertificateExtensions_Priv.cpp:707 -#: src/X509v3CertificateExtensions_Priv.cpp:776 -#: src/X509v3CertificateExtensions_Priv.cpp:846 -#: src/X509v3CertificateExtensions_Priv.cpp:921 -#: src/X509v3CertificateExtensions_Priv.cpp:1007 +#: src/X509v3CertificateExtensions_Priv.cpp:516 +#: src/X509v3CertificateExtensions_Priv.cpp:582 +#: src/X509v3CertificateExtensions_Priv.cpp:646 +#: src/X509v3CertificateExtensions_Priv.cpp:709 +#: src/X509v3CertificateExtensions_Priv.cpp:778 +#: src/X509v3CertificateExtensions_Priv.cpp:848 +#: src/X509v3CertificateExtensions_Priv.cpp:923 +#: src/X509v3CertificateExtensions_Priv.cpp:1009 #: src/X509v3CRLExtensions_Priv.cpp:140 #: src/X509v3RequestExtensions_Priv.cpp:254 #: src/X509v3RequestExtensions_Priv.cpp:320 @@ -795,7 +814,7 @@ msgid "Unable to parse the certificate (Crit: %1)." msgstr "NÃ£o foi possÃvel interpretar o certificado (Crit: %1)." -#: src/X509v3CertificateExtensions_Priv.cpp:941 +#: src/X509v3CertificateExtensions_Priv.cpp:943 msgid "Invalid location in authorityInfoAccess." msgstr "LocalizaÃ§Ã£o invÃ¡lida em authorityInfoAccess." @@ -926,3 +945,6 @@ #: src/X509v3RequestExtensions.cpp:231 msgid "Invalid value for X509v3RequestExts::setSubjectAlternativeName." msgstr "Valor invÃ¡lido para X509v3RequestExts::setSubjectAlternativeName." + +#~ msgid "Command returned '%1' : %2" +#~ msgstr "O comando devolveu '%1' : %2" Modified: limal-head/limal-ca-mgm/po/pt_BR.po URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/po/pt_BR.po?r… ============================================================================== --- limal-head/limal-ca-mgm/po/pt_BR.po (original) +++ limal-head/limal-ca-mgm/po/pt_BR.po Mon Oct 29 11:30:37 2007 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: limal-ca-mgm\n" "Report-Msgid-Bugs-To: translation(a)suse.de\n" -"POT-Creation-Date: 2007-09-28 16:31+0200\n" +"POT-Creation-Date: 2007-10-29 11:25+0100\n" "PO-Revision-Date: 2006-11-06 13:58\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" @@ -25,8 +25,8 @@ #: src/AuthorityInfoAccessExtension.cpp:259 #: src/AuthorityInfoAccessExtension.cpp:342 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:87 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:194 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:86 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:193 #: src/BasicConstraintsExtension.cpp:84 src/BasicConstraintsExtension.cpp:187 #: src/BitExtensions.cpp:134 src/BitExtensions.cpp:247 #: src/BitExtensions.cpp:374 src/BitExtensions.cpp:482 src/CA.cpp:1565 @@ -73,12 +73,12 @@ msgid "AuthorityKeyIdentifierExt is not present." msgstr "AuthorityKeyIdentifierExt nÃ£o estÃ¡ presente." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:155 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:174 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:154 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:173 msgid "AuthorityKeyIdentifierGenerateExt is not present." msgstr "AuthorityKeyIdentifierGenerateExt nÃ£o estÃ¡ presente." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:186 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:185 msgid "Invalid AuthorityKeyIdentifierGenerateExt object." msgstr "Objeto AuthorityKeyIdentifierGenerateExt invÃ¡lido." @@ -198,7 +198,7 @@ msgid "Duplicate DN. Request already exists." msgstr "DN duplicado. A solicitaÃ§Ã£o jÃ¡ existe." -#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:968 +#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:1007 msgid "Cannot parse the certificate name." msgstr "NÃ£o Ã© possÃvel analisar o nome do certificado." @@ -535,93 +535,112 @@ msgid "Invalid command %1." msgstr "Comando invÃ¡lido %1." -#: src/OpenSSLUtils.cpp:138 src/OpenSSLUtils.cpp:241 src/OpenSSLUtils.cpp:334 -#: src/OpenSSLUtils.cpp:453 src/OpenSSLUtils.cpp:586 src/OpenSSLUtils.cpp:681 -#: src/OpenSSLUtils.cpp:761 -msgid "Command returned '%1' : %2" -msgstr "O comando retornou '%1' : %2" +#: src/OpenSSLUtils.cpp:132 src/OpenSSLUtils.cpp:240 src/OpenSSLUtils.cpp:338 +#: src/OpenSSLUtils.cpp:462 src/OpenSSLUtils.cpp:600 src/OpenSSLUtils.cpp:700 +#: src/OpenSSLUtils.cpp:782 src/OpenSSLUtils.cpp:871 src/OpenSSLUtils.cpp:952 +#: src/OpenSSLUtils.cpp:1051 src/OpenSSLUtils.cpp:1137 +#: src/OpenSSLUtils.cpp:1271 src/OpenSSLUtils.cpp:1390 +#: src/OpenSSLUtils.cpp:1493 src/OpenSSLUtils.cpp:1645 +#: src/OpenSSLUtils.cpp:1782 +msgid "Executing openssl command failed." +msgstr "" + +#: src/OpenSSLUtils.cpp:143 src/OpenSSLUtils.cpp:251 src/OpenSSLUtils.cpp:349 +#: src/OpenSSLUtils.cpp:473 src/OpenSSLUtils.cpp:611 src/OpenSSLUtils.cpp:711 +#: src/OpenSSLUtils.cpp:796 src/OpenSSLUtils.cpp:1162 +#: src/OpenSSLUtils.cpp:1311 src/OpenSSLUtils.cpp:1415 +#: src/OpenSSLUtils.cpp:1518 src/OpenSSLUtils.cpp:1682 +#: src/OpenSSLUtils.cpp:1822 +msgid "openssl command failed: %1" +msgstr "" -#: src/OpenSSLUtils.cpp:171 src/OpenSSLUtils.cpp:268 src/OpenSSLUtils.cpp:366 -#: src/OpenSSLUtils.cpp:479 src/OpenSSLUtils.cpp:613 src/OpenSSLUtils.cpp:704 +#: src/OpenSSLUtils.cpp:176 src/OpenSSLUtils.cpp:278 src/OpenSSLUtils.cpp:381 +#: src/OpenSSLUtils.cpp:499 src/OpenSSLUtils.cpp:638 src/OpenSSLUtils.cpp:734 msgid "No valid key file specified." msgstr "Nenhum arquivo de chave vÃ¡lido especificado." -#: src/OpenSSLUtils.cpp:276 src/OpenSSLUtils.cpp:374 +#: src/OpenSSLUtils.cpp:286 src/OpenSSLUtils.cpp:389 msgid "No valid request file specified." msgstr "Nenhum arquivo de solicitaÃ§Ã£o vÃ¡lido especificado." -#: src/OpenSSLUtils.cpp:487 src/OpenSSLUtils.cpp:621 src/OpenSSLUtils.cpp:712 +#: src/OpenSSLUtils.cpp:507 src/OpenSSLUtils.cpp:646 src/OpenSSLUtils.cpp:742 msgid "No valid CA certificate file specified." msgstr "Nenhum arquivo de certificado de CA vÃ¡lido especificado." -#: src/OpenSSLUtils.cpp:495 src/OpenSSLUtils.cpp:785 +#: src/OpenSSLUtils.cpp:515 src/OpenSSLUtils.cpp:820 msgid "No valid certificate file specified." msgstr "Nenhum arquivo de certificado vÃ¡lido especificado." -#: src/OpenSSLUtils.cpp:793 +#: src/OpenSSLUtils.cpp:828 msgid "No valid CA directory specified." msgstr "Nenhum diretÃ³rio de CA vÃ¡lido especificado." -#: src/OpenSSLUtils.cpp:943 +#: src/OpenSSLUtils.cpp:982 msgid "Showing certificate status with serial %1 failed (%2)." msgstr "Falha ao mostrar status do certificado com serial %1 (%2)." -#: src/OpenSSLUtils.cpp:979 +#: src/OpenSSLUtils.cpp:1018 msgid "The key file does not exist." msgstr "O arquivo de chave nÃ£o existe." -#: src/OpenSSLUtils.cpp:1474 +#: src/OpenSSLUtils.cpp:1306 src/OpenSSLUtils.cpp:1677 +#: src/OpenSSLUtils.cpp:1817 +#, fuzzy +msgid "Invalid password." +msgstr "Senha de CA invÃ¡lida." + +#: src/OpenSSLUtils.cpp:1595 msgid "The password for encrypting the output is required." msgstr "A senha para criptografar a saÃda Ã© obrigatÃ³ria." -#: src/OpenSSLUtils.cpp:1579 +#: src/OpenSSLUtils.cpp:1736 msgid "The PKCS12 password is required." msgstr "A senha do PKCS12 Ã© obrigatÃ³ria." -#: src/OpenSSLUtils.cpp:1665 src/OpenSSLUtils.cpp:1865 -#: src/OpenSSLUtils.cpp:2017 +#: src/OpenSSLUtils.cpp:1847 src/OpenSSLUtils.cpp:2047 +#: src/OpenSSLUtils.cpp:2199 msgid "Cannot read directory: %1 (%2) [%3]." msgstr "ImpossÃvel ler o diretÃ³rio: %1 (%2) [%3]." -#: src/OpenSSLUtils.cpp:1715 +#: src/OpenSSLUtils.cpp:1897 msgid "No serial number found in %1." msgstr "Nenhum nÃºmero de sÃ©rie encontrado em %1." -#: src/OpenSSLUtils.cpp:1735 +#: src/OpenSSLUtils.cpp:1917 msgid "The request already exists." msgstr "A solicitaÃ§Ã£o jÃ¡ existe." -#: src/OpenSSLUtils.cpp:1926 +#: src/OpenSSLUtils.cpp:2108 msgid "Cannot find the request subject." msgstr "ImpossÃvel encontrar o assunto da solicitaÃ§Ã£o." -#: src/OpenSSLUtils.cpp:2087 +#: src/OpenSSLUtils.cpp:2269 msgid "Cannot find the certificate subject." msgstr "ImpossÃvel encontrar o assunto do certificado." -#: src/OpenSSLUtils.cpp:2186 +#: src/OpenSSLUtils.cpp:2368 msgid "Invalid caName: %1." msgstr "caName invÃ¡lido: %1." -#: src/OpenSSLUtils.cpp:2195 +#: src/OpenSSLUtils.cpp:2377 msgid "'%1' does not exist." msgstr "'%1' nÃ£o existe." -#: src/OpenSSLUtils.cpp:2205 +#: src/OpenSSLUtils.cpp:2387 msgid "%1 still exists." msgstr "%1 ainda existe." -#: src/OpenSSLUtils.cpp:2216 src/OpenSSLUtils.cpp:2264 -#: src/OpenSSLUtils.cpp:2278 src/OpenSSLUtils.cpp:2292 -#: src/OpenSSLUtils.cpp:2306 src/OpenSSLUtils.cpp:2320 +#: src/OpenSSLUtils.cpp:2398 src/OpenSSLUtils.cpp:2446 +#: src/OpenSSLUtils.cpp:2460 src/OpenSSLUtils.cpp:2474 +#: src/OpenSSLUtils.cpp:2488 src/OpenSSLUtils.cpp:2502 msgid "Cannot create directory: %1 (%2 [%3])." msgstr "ImpossÃvel criar o diretÃ³rio: %1 (%2 [%3])." -#: src/OpenSSLUtils.cpp:2251 +#: src/OpenSSLUtils.cpp:2433 msgid "Cannot copy the configuration template." msgstr "ImpossÃvel copiar o gabarito de configuraÃ§Ã£o." -#: src/OpenSSLUtils.cpp:2338 +#: src/OpenSSLUtils.cpp:2520 msgid "Cannot create the file." msgstr "ImpossÃvel criar o arquivo." @@ -740,28 +759,28 @@ msgid "Invalid SubjectKeyIdentifierExt object." msgstr "Objeto SubjectKeyIdentifierExt invÃ¡lido." -#: src/X509v3CertificateExtensions_Priv.cpp:394 -#: src/X509v3CertificateExtensions_Priv.cpp:450 +#: src/X509v3CertificateExtensions_Priv.cpp:395 +#: src/X509v3CertificateExtensions_Priv.cpp:452 #: src/X509v3RequestExtensions_Priv.cpp:134 #: src/X509v3RequestExtensions_Priv.cpp:189 msgid "Extension occurred more than once: %1." msgstr "A extensÃ£o ocorreu mais de uma vez: %1." -#: src/X509v3CertificateExtensions_Priv.cpp:401 -#: src/X509v3CertificateExtensions_Priv.cpp:457 +#: src/X509v3CertificateExtensions_Priv.cpp:402 +#: src/X509v3CertificateExtensions_Priv.cpp:459 #: src/X509v3RequestExtensions_Priv.cpp:141 #: src/X509v3RequestExtensions_Priv.cpp:196 msgid "Unable to parse the certificate (NID: %1 Crit: %2)." msgstr "ImpossÃvel analisar o certificado (NID: %1 CrÃt: %2)." -#: src/X509v3CertificateExtensions_Priv.cpp:509 -#: src/X509v3CertificateExtensions_Priv.cpp:575 -#: src/X509v3CertificateExtensions_Priv.cpp:639 -#: src/X509v3CertificateExtensions_Priv.cpp:701 -#: src/X509v3CertificateExtensions_Priv.cpp:771 -#: src/X509v3CertificateExtensions_Priv.cpp:840 -#: src/X509v3CertificateExtensions_Priv.cpp:916 -#: src/X509v3CertificateExtensions_Priv.cpp:1002 +#: src/X509v3CertificateExtensions_Priv.cpp:511 +#: src/X509v3CertificateExtensions_Priv.cpp:577 +#: src/X509v3CertificateExtensions_Priv.cpp:641 +#: src/X509v3CertificateExtensions_Priv.cpp:703 +#: src/X509v3CertificateExtensions_Priv.cpp:773 +#: src/X509v3CertificateExtensions_Priv.cpp:842 +#: src/X509v3CertificateExtensions_Priv.cpp:918 +#: src/X509v3CertificateExtensions_Priv.cpp:1004 #: src/X509v3CRLExtensions_Priv.cpp:135 #: src/X509v3RequestExtensions_Priv.cpp:249 #: src/X509v3RequestExtensions_Priv.cpp:315 @@ -770,14 +789,14 @@ msgid "Extension occurred more than once." msgstr "A extensÃ£o ocorreu mais de uma vez." -#: src/X509v3CertificateExtensions_Priv.cpp:514 -#: src/X509v3CertificateExtensions_Priv.cpp:580 -#: src/X509v3CertificateExtensions_Priv.cpp:644 -#: src/X509v3CertificateExtensions_Priv.cpp:707 -#: src/X509v3CertificateExtensions_Priv.cpp:776 -#: src/X509v3CertificateExtensions_Priv.cpp:846 -#: src/X509v3CertificateExtensions_Priv.cpp:921 -#: src/X509v3CertificateExtensions_Priv.cpp:1007 +#: src/X509v3CertificateExtensions_Priv.cpp:516 +#: src/X509v3CertificateExtensions_Priv.cpp:582 +#: src/X509v3CertificateExtensions_Priv.cpp:646 +#: src/X509v3CertificateExtensions_Priv.cpp:709 +#: src/X509v3CertificateExtensions_Priv.cpp:778 +#: src/X509v3CertificateExtensions_Priv.cpp:848 +#: src/X509v3CertificateExtensions_Priv.cpp:923 +#: src/X509v3CertificateExtensions_Priv.cpp:1009 #: src/X509v3CRLExtensions_Priv.cpp:140 #: src/X509v3RequestExtensions_Priv.cpp:254 #: src/X509v3RequestExtensions_Priv.cpp:320 @@ -786,7 +805,7 @@ msgid "Unable to parse the certificate (Crit: %1)." msgstr "ImpossÃvel analisar o certificado (CrÃt.: %1)." -#: src/X509v3CertificateExtensions_Priv.cpp:941 +#: src/X509v3CertificateExtensions_Priv.cpp:943 msgid "Invalid location in authorityInfoAccess." msgstr "LocalizaÃ§Ã£o invÃ¡lida em authorityInfoAccess." @@ -917,3 +936,6 @@ #: src/X509v3RequestExtensions.cpp:231 msgid "Invalid value for X509v3RequestExts::setSubjectAlternativeName." msgstr "Valor invÃ¡lido para X509v3RequestExts::setSubjectAlternativeName." + +#~ msgid "Command returned '%1' : %2" +#~ msgstr "O comando retornou '%1' : %2" Modified: limal-head/limal-ca-mgm/po/ru.po URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/po/ru.po?rev=… ============================================================================== --- limal-head/limal-ca-mgm/po/ru.po (original) +++ limal-head/limal-ca-mgm/po/ru.po Mon Oct 29 11:30:37 2007 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: limal-ca-mgm.ru\n" "Report-Msgid-Bugs-To: translation(a)suse.de\n" -"POT-Creation-Date: 2007-09-28 16:31+0200\n" +"POT-Creation-Date: 2007-10-29 11:25+0100\n" "PO-Revision-Date: 2006-11-08 09:11+0200\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" @@ -33,8 +33,8 @@ #: src/AuthorityInfoAccessExtension.cpp:259 #: src/AuthorityInfoAccessExtension.cpp:342 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:87 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:194 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:86 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:193 #: src/BasicConstraintsExtension.cpp:84 src/BasicConstraintsExtension.cpp:187 #: src/BitExtensions.cpp:134 src/BitExtensions.cpp:247 #: src/BitExtensions.cpp:374 src/BitExtensions.cpp:482 src/CA.cpp:1565 @@ -81,12 +81,12 @@ msgid "AuthorityKeyIdentifierExt is not present." msgstr "ÐÑÑÑÑÑÑÐ²ÑÐµÑ AuthorityKeyIdentifierExt." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:155 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:174 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:154 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:173 msgid "AuthorityKeyIdentifierGenerateExt is not present." msgstr "ÐÑÑÑÑÑÑÐ²ÑÐµÑ AuthorityKeyIdentifierGenerateExt." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:186 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:185 msgid "Invalid AuthorityKeyIdentifierGenerateExt object." msgstr "ÐÐµÐ²ÐµÑÐ½ÑÐ¹ Ð¾Ð±ÑÐµÐºÑ AuthorityKeyIdentifierGenerateExt." @@ -207,7 +207,7 @@ msgid "Duplicate DN. Request already exists." msgstr "ÐÑÐ±Ð»Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ DN. ÐÐ°Ð¿ÑÐ¾Ñ ÑÐ¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ." -#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:968 +#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:1007 msgid "Cannot parse the certificate name." msgstr "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ð±ÑÐ°Ð±Ð¾ÑÐ°ÑÑ Ð¸Ð¼Ñ ÑÐµÑÑÐ¸ÑÐ¸ÐºÐ°ÑÐ°." @@ -546,94 +546,113 @@ msgid "Invalid command %1." msgstr "ÐÐµÐ²ÐµÑÐ½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° %1." -#: src/OpenSSLUtils.cpp:138 src/OpenSSLUtils.cpp:241 src/OpenSSLUtils.cpp:334 -#: src/OpenSSLUtils.cpp:453 src/OpenSSLUtils.cpp:586 src/OpenSSLUtils.cpp:681 -#: src/OpenSSLUtils.cpp:761 -msgid "Command returned '%1' : %2" -msgstr "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° Ð²ÐµÑÐ½ÑÐ»Ð° '%1' : %2" +#: src/OpenSSLUtils.cpp:132 src/OpenSSLUtils.cpp:240 src/OpenSSLUtils.cpp:338 +#: src/OpenSSLUtils.cpp:462 src/OpenSSLUtils.cpp:600 src/OpenSSLUtils.cpp:700 +#: src/OpenSSLUtils.cpp:782 src/OpenSSLUtils.cpp:871 src/OpenSSLUtils.cpp:952 +#: src/OpenSSLUtils.cpp:1051 src/OpenSSLUtils.cpp:1137 +#: src/OpenSSLUtils.cpp:1271 src/OpenSSLUtils.cpp:1390 +#: src/OpenSSLUtils.cpp:1493 src/OpenSSLUtils.cpp:1645 +#: src/OpenSSLUtils.cpp:1782 +msgid "Executing openssl command failed." +msgstr "" + +#: src/OpenSSLUtils.cpp:143 src/OpenSSLUtils.cpp:251 src/OpenSSLUtils.cpp:349 +#: src/OpenSSLUtils.cpp:473 src/OpenSSLUtils.cpp:611 src/OpenSSLUtils.cpp:711 +#: src/OpenSSLUtils.cpp:796 src/OpenSSLUtils.cpp:1162 +#: src/OpenSSLUtils.cpp:1311 src/OpenSSLUtils.cpp:1415 +#: src/OpenSSLUtils.cpp:1518 src/OpenSSLUtils.cpp:1682 +#: src/OpenSSLUtils.cpp:1822 +msgid "openssl command failed: %1" +msgstr "" -#: src/OpenSSLUtils.cpp:171 src/OpenSSLUtils.cpp:268 src/OpenSSLUtils.cpp:366 -#: src/OpenSSLUtils.cpp:479 src/OpenSSLUtils.cpp:613 src/OpenSSLUtils.cpp:704 +#: src/OpenSSLUtils.cpp:176 src/OpenSSLUtils.cpp:278 src/OpenSSLUtils.cpp:381 +#: src/OpenSSLUtils.cpp:499 src/OpenSSLUtils.cpp:638 src/OpenSSLUtils.cpp:734 msgid "No valid key file specified." msgstr "ÐÐµ ÑÐºÐ°Ð·Ð°Ð½ Ð´ÐµÐ¹ÑÑÐ²ÑÑÑÐ¸Ð¹ ÑÐ°Ð¹Ð» ÐºÐ»ÑÑÐ°." -#: src/OpenSSLUtils.cpp:276 src/OpenSSLUtils.cpp:374 +#: src/OpenSSLUtils.cpp:286 src/OpenSSLUtils.cpp:389 msgid "No valid request file specified." msgstr "ÐÐµ ÑÐºÐ°Ð·Ð°Ð½ Ð´ÐµÐ¹ÑÑÐ²ÑÑÑÐ¸Ð¹ ÑÐ°Ð¹Ð» Ð·Ð°Ð¿ÑÐ¾ÑÐ°." -#: src/OpenSSLUtils.cpp:487 src/OpenSSLUtils.cpp:621 src/OpenSSLUtils.cpp:712 +#: src/OpenSSLUtils.cpp:507 src/OpenSSLUtils.cpp:646 src/OpenSSLUtils.cpp:742 msgid "No valid CA certificate file specified." msgstr "ÐÐµ ÑÐºÐ°Ð·Ð°Ð½ Ð´ÐµÐ¹ÑÑÐ²ÑÑÑÐ¸Ð¹ ÑÐ°Ð¹Ð» CA ÑÐµÑÑÐ¸ÑÐ¸ÐºÐ°ÑÐ°." -#: src/OpenSSLUtils.cpp:495 src/OpenSSLUtils.cpp:785 +#: src/OpenSSLUtils.cpp:515 src/OpenSSLUtils.cpp:820 msgid "No valid certificate file specified." msgstr "ÐÐµ ÑÐºÐ°Ð·Ð°Ð½ Ð´ÐµÐ¹ÑÑÐ²ÑÑÑÐ¸Ð¹ ÑÐ°Ð¹Ð» ÑÐµÑÑÐ¸ÑÐ¸ÐºÐ°ÑÐ°." -#: src/OpenSSLUtils.cpp:793 +#: src/OpenSSLUtils.cpp:828 msgid "No valid CA directory specified." msgstr "ÐÐµ ÑÐºÐ°Ð·Ð°Ð½ Ð´ÐµÐ¹ÑÑÐ²ÑÑÑÐ¸Ð¹ CA ÐºÐ°ÑÐ°Ð»Ð¾Ð³." -#: src/OpenSSLUtils.cpp:943 +#: src/OpenSSLUtils.cpp:982 msgid "Showing certificate status with serial %1 failed (%2)." msgstr "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿Ð¾ÐºÐ°Ð·Ð°ÑÑ ÑÑÐ°ÑÑÑ ÑÐµÑÑÐ¸ÑÐ¸ÐºÐ°ÑÐ° Ñ ÑÐµÑÐ¸Ð¹Ð½ÑÐ¼ Ð½Ð¾Ð¼ÐµÑÐ¾Ð¼ %1 (%2)." -#: src/OpenSSLUtils.cpp:979 +#: src/OpenSSLUtils.cpp:1018 msgid "The key file does not exist." msgstr "Ð¤Ð°Ð¹Ð» ÐºÐ»ÑÑÐ° Ð½Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ." -#: src/OpenSSLUtils.cpp:1474 +#: src/OpenSSLUtils.cpp:1306 src/OpenSSLUtils.cpp:1677 +#: src/OpenSSLUtils.cpp:1817 +#, fuzzy +msgid "Invalid password." +msgstr "ÐÐµÐ²ÐµÑÐ½ÑÐ¹ CA Ð¿Ð°ÑÐ¾Ð»Ñ." + +#: src/OpenSSLUtils.cpp:1595 msgid "The password for encrypting the output is required." msgstr "ÐÐ°ÑÐ¾Ð»Ñ Ð´Ð»Ñ ÑÐ¸ÑÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð²ÑÐ²Ð¾Ð´Ð° ÑÐ²Ð»ÑÐµÑÑÑ Ð¾Ð±ÑÐ·Ð°ÑÐµÐ»ÑÐ½ÑÐ¼." -#: src/OpenSSLUtils.cpp:1579 +#: src/OpenSSLUtils.cpp:1736 msgid "The PKCS12 password is required." msgstr "ÐÐ°ÑÐ¾Ð»Ñ PKCS12 ÑÐ²Ð»ÑÐµÑÑÑ Ð¾Ð±ÑÐ·Ð°ÑÐµÐ»ÑÐ½ÑÐ¼." -#: src/OpenSSLUtils.cpp:1665 src/OpenSSLUtils.cpp:1865 -#: src/OpenSSLUtils.cpp:2017 +#: src/OpenSSLUtils.cpp:1847 src/OpenSSLUtils.cpp:2047 +#: src/OpenSSLUtils.cpp:2199 msgid "Cannot read directory: %1 (%2) [%3]." msgstr "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿ÑÐ¾ÑÐ¸ÑÐ°ÑÑ ÐºÐ°ÑÐ°Ð»Ð¾Ð³: %1 (%2) [%3]." -#: src/OpenSSLUtils.cpp:1715 +#: src/OpenSSLUtils.cpp:1897 msgid "No serial number found in %1." msgstr "ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½ ÑÐµÑÐ¸Ð¹Ð½ÑÐ¹ Ð½Ð¾Ð¼ÐµÑ Ð² %1." # translators: error message for "add share" command line action -#: src/OpenSSLUtils.cpp:1735 +#: src/OpenSSLUtils.cpp:1917 msgid "The request already exists." msgstr "ÐÐ°Ð¿ÑÐ¾Ñ ÑÐ¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ." -#: src/OpenSSLUtils.cpp:1926 +#: src/OpenSSLUtils.cpp:2108 msgid "Cannot find the request subject." msgstr "ÐÐµ ÑÐ´Ð°ÐµÑÑÑ Ð½Ð°Ð¹ÑÐ¸ ÑÐµÐ¼Ñ Ð·Ð°Ð¿ÑÐ¾ÑÐ°." -#: src/OpenSSLUtils.cpp:2087 +#: src/OpenSSLUtils.cpp:2269 msgid "Cannot find the certificate subject." msgstr "ÐÐµ ÑÐ´Ð°ÐµÑÑÑ Ð½Ð°Ð¹ÑÐ¸ ÑÐµÐ¼Ñ ÑÐµÑÑÐ¸ÑÐ¸ÐºÐ°ÑÐ°." -#: src/OpenSSLUtils.cpp:2186 +#: src/OpenSSLUtils.cpp:2368 msgid "Invalid caName: %1." msgstr "ÐÐµÐ²ÐµÑÐ½Ð¾Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ caName: %1." -#: src/OpenSSLUtils.cpp:2195 +#: src/OpenSSLUtils.cpp:2377 msgid "'%1' does not exist." msgstr "'%1' Ð½Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ." -#: src/OpenSSLUtils.cpp:2205 +#: src/OpenSSLUtils.cpp:2387 msgid "%1 still exists." msgstr "%1 Ð²ÑÐµ ÐµÑÐµ ÑÑÑÐµÑÑÐ²ÑÐµÑ." -#: src/OpenSSLUtils.cpp:2216 src/OpenSSLUtils.cpp:2264 -#: src/OpenSSLUtils.cpp:2278 src/OpenSSLUtils.cpp:2292 -#: src/OpenSSLUtils.cpp:2306 src/OpenSSLUtils.cpp:2320 +#: src/OpenSSLUtils.cpp:2398 src/OpenSSLUtils.cpp:2446 +#: src/OpenSSLUtils.cpp:2460 src/OpenSSLUtils.cpp:2474 +#: src/OpenSSLUtils.cpp:2488 src/OpenSSLUtils.cpp:2502 msgid "Cannot create directory: %1 (%2 [%3])." msgstr "ÐÐµ ÑÐ´Ð°ÐµÑÑÑ ÑÐ¾Ð·Ð´Ð°ÑÑ ÐºÐ°ÑÐ°Ð»Ð¾Ð³: %1 (%2 [%3])." -#: src/OpenSSLUtils.cpp:2251 +#: src/OpenSSLUtils.cpp:2433 msgid "Cannot copy the configuration template." msgstr "ÐÐµ ÑÐ´Ð°ÐµÑÑÑ ÑÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ ÑÐ°Ð±Ð»Ð¾Ð½ Ð½Ð°ÑÑÑÐ¾ÐµÐº." -#: src/OpenSSLUtils.cpp:2338 +#: src/OpenSSLUtils.cpp:2520 msgid "Cannot create the file." msgstr "ÐÐµ ÑÐ´Ð°ÐµÑÑÑ ÑÐ¾Ð·Ð´Ð°ÑÑ ÑÐ°Ð¹Ð»." @@ -752,28 +771,28 @@ msgid "Invalid SubjectKeyIdentifierExt object." msgstr "ÐÐµÐ²ÐµÑÐ½ÑÐ¹ Ð¾Ð±ÑÐµÐºÑ SubjectKeyIdentifierExt." -#: src/X509v3CertificateExtensions_Priv.cpp:394 -#: src/X509v3CertificateExtensions_Priv.cpp:450 +#: src/X509v3CertificateExtensions_Priv.cpp:395 +#: src/X509v3CertificateExtensions_Priv.cpp:452 #: src/X509v3RequestExtensions_Priv.cpp:134 #: src/X509v3RequestExtensions_Priv.cpp:189 msgid "Extension occurred more than once: %1." msgstr "Ð Ð°ÑÑÐ¸ÑÐµÐ½Ð¸Ðµ Ð´ÑÐ±Ð»Ð¸ÑÐ¾Ð²Ð°Ð½Ð¾: %1." -#: src/X509v3CertificateExtensions_Priv.cpp:401 -#: src/X509v3CertificateExtensions_Priv.cpp:457 +#: src/X509v3CertificateExtensions_Priv.cpp:402 +#: src/X509v3CertificateExtensions_Priv.cpp:459 #: src/X509v3RequestExtensions_Priv.cpp:141 #: src/X509v3RequestExtensions_Priv.cpp:196 msgid "Unable to parse the certificate (NID: %1 Crit: %2)." msgstr "ÐÐµ ÑÐ´Ð°ÐµÑÑÑ Ð²ÑÐ¿Ð¾Ð»Ð½Ð¸ÑÑ Ð°Ð½Ð°Ð»Ð¸Ð· ÑÐµÑÑÐ¸ÑÐ¸ÐºÐ°ÑÐ° (NID: %1 Crit: %2)." -#: src/X509v3CertificateExtensions_Priv.cpp:509 -#: src/X509v3CertificateExtensions_Priv.cpp:575 -#: src/X509v3CertificateExtensions_Priv.cpp:639 -#: src/X509v3CertificateExtensions_Priv.cpp:701 -#: src/X509v3CertificateExtensions_Priv.cpp:771 -#: src/X509v3CertificateExtensions_Priv.cpp:840 -#: src/X509v3CertificateExtensions_Priv.cpp:916 -#: src/X509v3CertificateExtensions_Priv.cpp:1002 +#: src/X509v3CertificateExtensions_Priv.cpp:511 +#: src/X509v3CertificateExtensions_Priv.cpp:577 +#: src/X509v3CertificateExtensions_Priv.cpp:641 +#: src/X509v3CertificateExtensions_Priv.cpp:703 +#: src/X509v3CertificateExtensions_Priv.cpp:773 +#: src/X509v3CertificateExtensions_Priv.cpp:842 +#: src/X509v3CertificateExtensions_Priv.cpp:918 +#: src/X509v3CertificateExtensions_Priv.cpp:1004 #: src/X509v3CRLExtensions_Priv.cpp:135 #: src/X509v3RequestExtensions_Priv.cpp:249 #: src/X509v3RequestExtensions_Priv.cpp:315 @@ -782,14 +801,14 @@ msgid "Extension occurred more than once." msgstr "Ð Ð°ÑÑÐ¸ÑÐµÐ½Ð¸Ðµ Ð´ÑÐ±Ð»Ð¸ÑÐ¾Ð²Ð°Ð½Ð¾." -#: src/X509v3CertificateExtensions_Priv.cpp:514 -#: src/X509v3CertificateExtensions_Priv.cpp:580 -#: src/X509v3CertificateExtensions_Priv.cpp:644 -#: src/X509v3CertificateExtensions_Priv.cpp:707 -#: src/X509v3CertificateExtensions_Priv.cpp:776 -#: src/X509v3CertificateExtensions_Priv.cpp:846 -#: src/X509v3CertificateExtensions_Priv.cpp:921 -#: src/X509v3CertificateExtensions_Priv.cpp:1007 +#: src/X509v3CertificateExtensions_Priv.cpp:516 +#: src/X509v3CertificateExtensions_Priv.cpp:582 +#: src/X509v3CertificateExtensions_Priv.cpp:646 +#: src/X509v3CertificateExtensions_Priv.cpp:709 +#: src/X509v3CertificateExtensions_Priv.cpp:778 +#: src/X509v3CertificateExtensions_Priv.cpp:848 +#: src/X509v3CertificateExtensions_Priv.cpp:923 +#: src/X509v3CertificateExtensions_Priv.cpp:1009 #: src/X509v3CRLExtensions_Priv.cpp:140 #: src/X509v3RequestExtensions_Priv.cpp:254 #: src/X509v3RequestExtensions_Priv.cpp:320 @@ -798,7 +817,7 @@ msgid "Unable to parse the certificate (Crit: %1)." msgstr "ÐÐµ ÑÐ´Ð°ÐµÑÑÑ Ð²ÑÐ¿Ð¾Ð»Ð½Ð¸ÑÑ Ð°Ð½Ð°Ð»Ð¸Ð· ÑÐµÑÑÐ¸ÑÐ¸ÐºÐ°ÑÐ° (Crit: %1)." -#: src/X509v3CertificateExtensions_Priv.cpp:941 +#: src/X509v3CertificateExtensions_Priv.cpp:943 msgid "Invalid location in authorityInfoAccess." msgstr "ÐÐµÐ²ÐµÑÐ½Ð¾Ðµ Ð¼ÐµÑÑÐ¾Ð½Ð°ÑÐ¾Ð¶Ð´ÐµÐ½Ð¸Ðµ Ð² authorityInfoAccess." @@ -931,3 +950,6 @@ #: src/X509v3RequestExtensions.cpp:231 msgid "Invalid value for X509v3RequestExts::setSubjectAlternativeName." msgstr "ÐÐµÐ²ÐµÑÐ½Ð¾Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ Ð´Ð»Ñ X509v3RequestExts::setSubjectAlternativeName." + +#~ msgid "Command returned '%1' : %2" +#~ msgstr "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° Ð²ÐµÑÐ½ÑÐ»Ð° '%1' : %2" Modified: limal-head/limal-ca-mgm/po/sv.po URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/po/sv.po?rev=… ============================================================================== --- limal-head/limal-ca-mgm/po/sv.po (original) +++ limal-head/limal-ca-mgm/po/sv.po Mon Oct 29 11:30:37 2007 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: @PACKAGE@\n" "Report-Msgid-Bugs-To: translation(a)suse.de\n" -"POT-Creation-Date: 2007-09-28 16:31+0200\n" +"POT-Creation-Date: 2007-10-29 11:25+0100\n" "PO-Revision-Date: 2005-09-18 19:09+0200\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" @@ -30,8 +30,8 @@ #: src/AuthorityInfoAccessExtension.cpp:259 #: src/AuthorityInfoAccessExtension.cpp:342 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:87 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:194 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:86 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:193 #: src/BasicConstraintsExtension.cpp:84 src/BasicConstraintsExtension.cpp:187 #: src/BitExtensions.cpp:134 src/BitExtensions.cpp:247 #: src/BitExtensions.cpp:374 src/BitExtensions.cpp:482 src/CA.cpp:1565 @@ -78,12 +78,12 @@ msgid "AuthorityKeyIdentifierExt is not present." msgstr "AuthorityKeyIdentifierExt finns inte." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:155 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:174 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:154 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:173 msgid "AuthorityKeyIdentifierGenerateExt is not present." msgstr "AuthorityKeyIdentifierGenerateExt finns inte." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:186 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:185 msgid "Invalid AuthorityKeyIdentifierGenerateExt object." msgstr "Ogiltigt AuthorityKeyIdentifierGenerateExt-objekt." @@ -203,7 +203,7 @@ msgid "Duplicate DN. Request already exists." msgstr "DN Ã¤r en dubblett. BegÃ¤ran finns redan." -#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:968 +#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:1007 msgid "Cannot parse the certificate name." msgstr "Det gick inte att tyda certifikatnamnet." @@ -541,93 +541,112 @@ msgid "Invalid command %1." msgstr "Ogiltigt kommando %1." -#: src/OpenSSLUtils.cpp:138 src/OpenSSLUtils.cpp:241 src/OpenSSLUtils.cpp:334 -#: src/OpenSSLUtils.cpp:453 src/OpenSSLUtils.cpp:586 src/OpenSSLUtils.cpp:681 -#: src/OpenSSLUtils.cpp:761 -msgid "Command returned '%1' : %2" -msgstr "Kommandot '%1' returnerades: %2" +#: src/OpenSSLUtils.cpp:132 src/OpenSSLUtils.cpp:240 src/OpenSSLUtils.cpp:338 +#: src/OpenSSLUtils.cpp:462 src/OpenSSLUtils.cpp:600 src/OpenSSLUtils.cpp:700 +#: src/OpenSSLUtils.cpp:782 src/OpenSSLUtils.cpp:871 src/OpenSSLUtils.cpp:952 +#: src/OpenSSLUtils.cpp:1051 src/OpenSSLUtils.cpp:1137 +#: src/OpenSSLUtils.cpp:1271 src/OpenSSLUtils.cpp:1390 +#: src/OpenSSLUtils.cpp:1493 src/OpenSSLUtils.cpp:1645 +#: src/OpenSSLUtils.cpp:1782 +msgid "Executing openssl command failed." +msgstr "" + +#: src/OpenSSLUtils.cpp:143 src/OpenSSLUtils.cpp:251 src/OpenSSLUtils.cpp:349 +#: src/OpenSSLUtils.cpp:473 src/OpenSSLUtils.cpp:611 src/OpenSSLUtils.cpp:711 +#: src/OpenSSLUtils.cpp:796 src/OpenSSLUtils.cpp:1162 +#: src/OpenSSLUtils.cpp:1311 src/OpenSSLUtils.cpp:1415 +#: src/OpenSSLUtils.cpp:1518 src/OpenSSLUtils.cpp:1682 +#: src/OpenSSLUtils.cpp:1822 +msgid "openssl command failed: %1" +msgstr "" -#: src/OpenSSLUtils.cpp:171 src/OpenSSLUtils.cpp:268 src/OpenSSLUtils.cpp:366 -#: src/OpenSSLUtils.cpp:479 src/OpenSSLUtils.cpp:613 src/OpenSSLUtils.cpp:704 +#: src/OpenSSLUtils.cpp:176 src/OpenSSLUtils.cpp:278 src/OpenSSLUtils.cpp:381 +#: src/OpenSSLUtils.cpp:499 src/OpenSSLUtils.cpp:638 src/OpenSSLUtils.cpp:734 msgid "No valid key file specified." msgstr "Ingen giltig nyckelfil har angetts." -#: src/OpenSSLUtils.cpp:276 src/OpenSSLUtils.cpp:374 +#: src/OpenSSLUtils.cpp:286 src/OpenSSLUtils.cpp:389 msgid "No valid request file specified." msgstr "Ingen giltig begÃ¤randefil har angetts." -#: src/OpenSSLUtils.cpp:487 src/OpenSSLUtils.cpp:621 src/OpenSSLUtils.cpp:712 +#: src/OpenSSLUtils.cpp:507 src/OpenSSLUtils.cpp:646 src/OpenSSLUtils.cpp:742 msgid "No valid CA certificate file specified." msgstr "Ingen giltig CA-certifikatfil har angetts." -#: src/OpenSSLUtils.cpp:495 src/OpenSSLUtils.cpp:785 +#: src/OpenSSLUtils.cpp:515 src/OpenSSLUtils.cpp:820 msgid "No valid certificate file specified." msgstr "Ingen giltig certifikatfil har angetts." -#: src/OpenSSLUtils.cpp:793 +#: src/OpenSSLUtils.cpp:828 msgid "No valid CA directory specified." msgstr "Ingen giltig CA-katalog har angetts." -#: src/OpenSSLUtils.cpp:943 +#: src/OpenSSLUtils.cpp:982 msgid "Showing certificate status with serial %1 failed (%2)." msgstr "Det gick inte att visa certifikatstatus med serienumret %1 (%2)." -#: src/OpenSSLUtils.cpp:979 +#: src/OpenSSLUtils.cpp:1018 msgid "The key file does not exist." msgstr "Nyckelfilen finns inte." -#: src/OpenSSLUtils.cpp:1474 +#: src/OpenSSLUtils.cpp:1306 src/OpenSSLUtils.cpp:1677 +#: src/OpenSSLUtils.cpp:1817 +#, fuzzy +msgid "Invalid password." +msgstr "Ogiltigt CA-lÃ¶senord." + +#: src/OpenSSLUtils.cpp:1595 msgid "The password for encrypting the output is required." msgstr "LÃ¶senordet fÃ¶r kryptering av utdata krÃ¤vs." -#: src/OpenSSLUtils.cpp:1579 +#: src/OpenSSLUtils.cpp:1736 msgid "The PKCS12 password is required." msgstr "PKCS12-lÃ¶senordet krÃ¤vs." -#: src/OpenSSLUtils.cpp:1665 src/OpenSSLUtils.cpp:1865 -#: src/OpenSSLUtils.cpp:2017 +#: src/OpenSSLUtils.cpp:1847 src/OpenSSLUtils.cpp:2047 +#: src/OpenSSLUtils.cpp:2199 msgid "Cannot read directory: %1 (%2) [%3]." msgstr "Det gick inte att lÃ¤sa katalogen: %1 (%2) [%3]." -#: src/OpenSSLUtils.cpp:1715 +#: src/OpenSSLUtils.cpp:1897 msgid "No serial number found in %1." msgstr "Det gick inte att hitta nÃ¥got serienummer i %1." -#: src/OpenSSLUtils.cpp:1735 +#: src/OpenSSLUtils.cpp:1917 msgid "The request already exists." msgstr "BegÃ¤ran finns redan." -#: src/OpenSSLUtils.cpp:1926 +#: src/OpenSSLUtils.cpp:2108 msgid "Cannot find the request subject." msgstr "Det gick inte att hitta Ã¤rendet fÃ¶r begÃ¤ran." -#: src/OpenSSLUtils.cpp:2087 +#: src/OpenSSLUtils.cpp:2269 msgid "Cannot find the certificate subject." msgstr "Det gick inte att hitta Ã¤rendet fÃ¶r certifikatet." -#: src/OpenSSLUtils.cpp:2186 +#: src/OpenSSLUtils.cpp:2368 msgid "Invalid caName: %1." msgstr "Ogiltigt caName: %1." -#: src/OpenSSLUtils.cpp:2195 +#: src/OpenSSLUtils.cpp:2377 msgid "'%1' does not exist." msgstr "%1 finns inte." -#: src/OpenSSLUtils.cpp:2205 +#: src/OpenSSLUtils.cpp:2387 msgid "%1 still exists." msgstr "%1 finns fortfarande." -#: src/OpenSSLUtils.cpp:2216 src/OpenSSLUtils.cpp:2264 -#: src/OpenSSLUtils.cpp:2278 src/OpenSSLUtils.cpp:2292 -#: src/OpenSSLUtils.cpp:2306 src/OpenSSLUtils.cpp:2320 +#: src/OpenSSLUtils.cpp:2398 src/OpenSSLUtils.cpp:2446 +#: src/OpenSSLUtils.cpp:2460 src/OpenSSLUtils.cpp:2474 +#: src/OpenSSLUtils.cpp:2488 src/OpenSSLUtils.cpp:2502 msgid "Cannot create directory: %1 (%2 [%3])." msgstr "Det gick inte att skapa katalogen: %1 (%2 [%3])." -#: src/OpenSSLUtils.cpp:2251 +#: src/OpenSSLUtils.cpp:2433 msgid "Cannot copy the configuration template." msgstr "Det gick inte att kopiera konfigurationsmallen." -#: src/OpenSSLUtils.cpp:2338 +#: src/OpenSSLUtils.cpp:2520 msgid "Cannot create the file." msgstr "Det gick inte att skapa filen." @@ -746,28 +765,28 @@ msgid "Invalid SubjectKeyIdentifierExt object." msgstr "Ogiltigt SubjectKeyIdentifierExt-objekt." -#: src/X509v3CertificateExtensions_Priv.cpp:394 -#: src/X509v3CertificateExtensions_Priv.cpp:450 +#: src/X509v3CertificateExtensions_Priv.cpp:395 +#: src/X509v3CertificateExtensions_Priv.cpp:452 #: src/X509v3RequestExtensions_Priv.cpp:134 #: src/X509v3RequestExtensions_Priv.cpp:189 msgid "Extension occurred more than once: %1." msgstr "TillÃ¤gget fÃ¶rekom mer Ã¤n en gÃ¥ng: %1." -#: src/X509v3CertificateExtensions_Priv.cpp:401 -#: src/X509v3CertificateExtensions_Priv.cpp:457 +#: src/X509v3CertificateExtensions_Priv.cpp:402 +#: src/X509v3CertificateExtensions_Priv.cpp:459 #: src/X509v3RequestExtensions_Priv.cpp:141 #: src/X509v3RequestExtensions_Priv.cpp:196 msgid "Unable to parse the certificate (NID: %1 Crit: %2)." msgstr "Det gick inte att tolka certifikatet (NID: %1 Crit: %2)." -#: src/X509v3CertificateExtensions_Priv.cpp:509 -#: src/X509v3CertificateExtensions_Priv.cpp:575 -#: src/X509v3CertificateExtensions_Priv.cpp:639 -#: src/X509v3CertificateExtensions_Priv.cpp:701 -#: src/X509v3CertificateExtensions_Priv.cpp:771 -#: src/X509v3CertificateExtensions_Priv.cpp:840 -#: src/X509v3CertificateExtensions_Priv.cpp:916 -#: src/X509v3CertificateExtensions_Priv.cpp:1002 +#: src/X509v3CertificateExtensions_Priv.cpp:511 +#: src/X509v3CertificateExtensions_Priv.cpp:577 +#: src/X509v3CertificateExtensions_Priv.cpp:641 +#: src/X509v3CertificateExtensions_Priv.cpp:703 +#: src/X509v3CertificateExtensions_Priv.cpp:773 +#: src/X509v3CertificateExtensions_Priv.cpp:842 +#: src/X509v3CertificateExtensions_Priv.cpp:918 +#: src/X509v3CertificateExtensions_Priv.cpp:1004 #: src/X509v3CRLExtensions_Priv.cpp:135 #: src/X509v3RequestExtensions_Priv.cpp:249 #: src/X509v3RequestExtensions_Priv.cpp:315 @@ -776,14 +795,14 @@ msgid "Extension occurred more than once." msgstr "TillÃ¤gget fÃ¶rekom mer Ã¤n en gÃ¥ng." -#: src/X509v3CertificateExtensions_Priv.cpp:514 -#: src/X509v3CertificateExtensions_Priv.cpp:580 -#: src/X509v3CertificateExtensions_Priv.cpp:644 -#: src/X509v3CertificateExtensions_Priv.cpp:707 -#: src/X509v3CertificateExtensions_Priv.cpp:776 -#: src/X509v3CertificateExtensions_Priv.cpp:846 -#: src/X509v3CertificateExtensions_Priv.cpp:921 -#: src/X509v3CertificateExtensions_Priv.cpp:1007 +#: src/X509v3CertificateExtensions_Priv.cpp:516 +#: src/X509v3CertificateExtensions_Priv.cpp:582 +#: src/X509v3CertificateExtensions_Priv.cpp:646 +#: src/X509v3CertificateExtensions_Priv.cpp:709 +#: src/X509v3CertificateExtensions_Priv.cpp:778 +#: src/X509v3CertificateExtensions_Priv.cpp:848 +#: src/X509v3CertificateExtensions_Priv.cpp:923 +#: src/X509v3CertificateExtensions_Priv.cpp:1009 #: src/X509v3CRLExtensions_Priv.cpp:140 #: src/X509v3RequestExtensions_Priv.cpp:254 #: src/X509v3RequestExtensions_Priv.cpp:320 @@ -792,7 +811,7 @@ msgid "Unable to parse the certificate (Crit: %1)." msgstr "Det gick inte att tolka certifikatet (Crit: %1)." -#: src/X509v3CertificateExtensions_Priv.cpp:941 +#: src/X509v3CertificateExtensions_Priv.cpp:943 msgid "Invalid location in authorityInfoAccess." msgstr "Ogiltig plats i authorityInfoAccess." @@ -927,3 +946,6 @@ #: src/X509v3RequestExtensions.cpp:231 msgid "Invalid value for X509v3RequestExts::setSubjectAlternativeName." msgstr "VÃ¤rdet fÃ¶r X509v3RequestExts::setSubjectAlternativeName Ã¤r ogiltigt." + +#~ msgid "Command returned '%1' : %2" +#~ msgstr "Kommandot '%1' returnerades: %2" Modified: limal-head/limal-ca-mgm/po/ta.po URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/po/ta.po?rev=… ============================================================================== --- limal-head/limal-ca-mgm/po/ta.po (original) +++ limal-head/limal-ca-mgm/po/ta.po Mon Oct 29 11:30:37 2007 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: @PACKAGE@\n" "Report-Msgid-Bugs-To: translation(a)suse.de\n" -"POT-Creation-Date: 2007-09-28 16:31+0200\n" +"POT-Creation-Date: 2007-10-29 11:25+0100\n" "PO-Revision-Date: 2003-08-14 10:47+0200\n" "Last-Translator: Priyavert Sharma<priyavert.sharma(a)agreeya.com>\n" "Language-Team: AgreeYa Solutions<linux_team(a)agreeya.com>\n" @@ -23,8 +23,8 @@ #: src/AuthorityInfoAccessExtension.cpp:259 #: src/AuthorityInfoAccessExtension.cpp:342 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:87 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:194 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:86 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:193 #: src/BasicConstraintsExtension.cpp:84 src/BasicConstraintsExtension.cpp:187 #: src/BitExtensions.cpp:134 src/BitExtensions.cpp:247 #: src/BitExtensions.cpp:374 src/BitExtensions.cpp:482 src/CA.cpp:1565 @@ -71,12 +71,12 @@ msgid "AuthorityKeyIdentifierExt is not present." msgstr "à®à®¤à®¿à®à®¾à®°à®µà®¿à®à¯à®à®à¯à®¯à®¾à®³à®à¯à®à®¾à®à¯à®à®¿à®µà®¿à®°à®¿à®µà¯ à®à®²à¯à®²à¯." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:155 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:174 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:154 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:173 msgid "AuthorityKeyIdentifierGenerateExt is not present." msgstr "à®à®¤à®¿à®à®¾à®°à®µà®¿à®à¯à®à®à¯à®¯à®¾à®³à®à¯à®à®¾à®à¯à®à®¿à®à®°à¯à®µà®¾à®à¯à®à®µà®¿à®°à®¿à®µà¯ à®à®²à¯à®²à¯." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:186 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:185 msgid "Invalid AuthorityKeyIdentifierGenerateExt object." msgstr "à®à¯à®²à¯à®²à®¾à®¤ à®¤à®¿à®à®¾à®°à®µà®¿à®à¯à®à®à¯à®¯à®¾à®³à®à¯à®à®¾à®à¯à®à®¿à®à®°à¯à®µà®¾à®à¯à®à®µà®¿à®°à®¿à®µà¯ à®ªà¯à®¾à®°à¯à®³à¯." @@ -196,7 +196,7 @@ msgid "Duplicate DN. Request already exists." msgstr "à®à®¿à®à®©à¯ à®¨à®à®²à¯à®à¯. à®à¯à®¾à®°à®¿à®à¯à®à¯ à®à®±à¯à®à®©à®µà¯ à®à®³à¯à®³à®¤à¯." -#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:968 +#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:1007 msgid "Cannot parse the certificate name." msgstr "à®à®¾à®©à¯à®±à®¿à®¤à®´à¯ à®ªà¯à®¯à®°à¯ à®µà®¿à®³à®à¯à® à®®à¯à®à®¿à®¯à®µà®¿à®²à¯à®²à¯." @@ -534,93 +534,112 @@ msgid "Invalid command %1." msgstr "à®à¯à®²à¯à®²à®¾à®¤ à®à®£à¯ %1." -#: src/OpenSSLUtils.cpp:138 src/OpenSSLUtils.cpp:241 src/OpenSSLUtils.cpp:334 -#: src/OpenSSLUtils.cpp:453 src/OpenSSLUtils.cpp:586 src/OpenSSLUtils.cpp:681 -#: src/OpenSSLUtils.cpp:761 -msgid "Command returned '%1' : %2" -msgstr "à®à®£à¯ à®¤à®¿à®°à¯à®ªà¯à®ªà®ªà¯à®ªà®à¯à®à®¤à¯'%1' : %2" +#: src/OpenSSLUtils.cpp:132 src/OpenSSLUtils.cpp:240 src/OpenSSLUtils.cpp:338 +#: src/OpenSSLUtils.cpp:462 src/OpenSSLUtils.cpp:600 src/OpenSSLUtils.cpp:700 +#: src/OpenSSLUtils.cpp:782 src/OpenSSLUtils.cpp:871 src/OpenSSLUtils.cpp:952 +#: src/OpenSSLUtils.cpp:1051 src/OpenSSLUtils.cpp:1137 +#: src/OpenSSLUtils.cpp:1271 src/OpenSSLUtils.cpp:1390 +#: src/OpenSSLUtils.cpp:1493 src/OpenSSLUtils.cpp:1645 +#: src/OpenSSLUtils.cpp:1782 +msgid "Executing openssl command failed." +msgstr "" + +#: src/OpenSSLUtils.cpp:143 src/OpenSSLUtils.cpp:251 src/OpenSSLUtils.cpp:349 +#: src/OpenSSLUtils.cpp:473 src/OpenSSLUtils.cpp:611 src/OpenSSLUtils.cpp:711 +#: src/OpenSSLUtils.cpp:796 src/OpenSSLUtils.cpp:1162 +#: src/OpenSSLUtils.cpp:1311 src/OpenSSLUtils.cpp:1415 +#: src/OpenSSLUtils.cpp:1518 src/OpenSSLUtils.cpp:1682 +#: src/OpenSSLUtils.cpp:1822 +msgid "openssl command failed: %1" +msgstr "" -#: src/OpenSSLUtils.cpp:171 src/OpenSSLUtils.cpp:268 src/OpenSSLUtils.cpp:366 -#: src/OpenSSLUtils.cpp:479 src/OpenSSLUtils.cpp:613 src/OpenSSLUtils.cpp:704 +#: src/OpenSSLUtils.cpp:176 src/OpenSSLUtils.cpp:278 src/OpenSSLUtils.cpp:381 +#: src/OpenSSLUtils.cpp:499 src/OpenSSLUtils.cpp:638 src/OpenSSLUtils.cpp:734 msgid "No valid key file specified." msgstr "à®à¯à®²à¯à®²à®¤à¯à®¤à®à¯à® à®µà®¿à®à¯ à®à¯à®¾à®ªà¯à®ªà¯ à®à¯à®±à®¿à®ªà¯à®ªà®¿à®à®ªà¯à®ªà®à®µà®¿à®²à¯à®²à¯." -#: src/OpenSSLUtils.cpp:276 src/OpenSSLUtils.cpp:374 +#: src/OpenSSLUtils.cpp:286 src/OpenSSLUtils.cpp:389 msgid "No valid request file specified." msgstr "à®à¯à®²à¯à®²à®¤à¯à®¤à®à¯à® à®à¯à®¾à®°à®¿à®à¯à®à¯ à®à¯à®¾à®ªà¯à®ªà¯ à®à¯à®±à®¿à®ªà¯à®ªà®¿à®à®ªà¯à®ªà®à®µà®¿à®²à¯à®²à¯. " -#: src/OpenSSLUtils.cpp:487 src/OpenSSLUtils.cpp:621 src/OpenSSLUtils.cpp:712 +#: src/OpenSSLUtils.cpp:507 src/OpenSSLUtils.cpp:646 src/OpenSSLUtils.cpp:742 msgid "No valid CA certificate file specified." msgstr "à®à¯à®²à¯à®²à®¤à¯à®¤à®à¯à® à®à®¿à® à®à®¾à®©à¯à®±à®¿à®¤à®´à¯ à®à¯à®¾à®ªà¯à®ªà¯ à®à¯à®±à®¿à®ªà¯à®ªà®¿à®à®ªà¯à®ªà®à®µà®¿à®²à¯à®²à¯." -#: src/OpenSSLUtils.cpp:495 src/OpenSSLUtils.cpp:785 +#: src/OpenSSLUtils.cpp:515 src/OpenSSLUtils.cpp:820 msgid "No valid certificate file specified." msgstr "à®à¯à®²à¯à®²à®¤à¯à®¤à®à¯à® à®à®¾à®©à¯à®±à®¿à®¤à®´à¯ à®à¯à®¾à®ªà¯à®ªà¯ à®à¯à®±à®¿à®ªà¯à®ªà®¿à®à®ªà¯à®ªà®à®µà®¿à®²à¯à®²à¯." -#: src/OpenSSLUtils.cpp:793 +#: src/OpenSSLUtils.cpp:828 msgid "No valid CA directory specified." msgstr "à®à¯à®²à¯à®²à®¤à¯à®¤à®à¯à® à®à®¿à® à®à®à¯à®µà¯ à®à¯à®±à®¿à®ªà¯à®ªà®¿à®à®ªà¯à®ªà®à®µà®¿à®²à¯à®²à¯." -#: src/OpenSSLUtils.cpp:943 +#: src/OpenSSLUtils.cpp:982 msgid "Showing certificate status with serial %1 failed (%2)." msgstr "%1 à®µà®°à®¿à®à¯ à®®à¯à®²à®®à¯ à®à®¾à®©à¯à®±à®¿à®¤à®´à¯ à®¨à®¿à®²à¯à®¯à¯ à®à®¾à®à¯à®à®µà®¤à¯ à®¤à¯à®¾à®²à¯à®µà®¿à®¯à¯à®±à¯à®±à®¤à¯(%2)." -#: src/OpenSSLUtils.cpp:979 +#: src/OpenSSLUtils.cpp:1018 msgid "The key file does not exist." msgstr "à®µà®¿à®à¯ à®à¯à®¾à®ªà¯à®ªà¯ à®à®²à¯à®²à¯." -#: src/OpenSSLUtils.cpp:1474 +#: src/OpenSSLUtils.cpp:1306 src/OpenSSLUtils.cpp:1677 +#: src/OpenSSLUtils.cpp:1817 +#, fuzzy +msgid "Invalid password." +msgstr "à®à¯à®²à¯à®²à®¾à®¤ à®à®¿à® à®à®à®µà¯à®à¯à®à¯à®¾à®²à¯." + +#: src/OpenSSLUtils.cpp:1595 msgid "The password for encrypting the output is required." msgstr "à®µà¯à®³à®¿à®¯à¯à®à¯à®à¯ à®à®©à¯à®à®¿à®°à®¿à®ªà¯à®à¯ à®à¯à®¯à¯à®µà®¤à®±à¯à®à®¾à®© à®à®à®µà¯à®à¯à®à¯à®¾à®²à¯ à®¤à¯à®µà¯." -#: src/OpenSSLUtils.cpp:1579 +#: src/OpenSSLUtils.cpp:1736 msgid "The PKCS12 password is required." msgstr "PKCS12 à®à®à®µà¯à®à¯à®à¯à®¾à®²à¯ à®¤à¯à®µà¯." -#: src/OpenSSLUtils.cpp:1665 src/OpenSSLUtils.cpp:1865 -#: src/OpenSSLUtils.cpp:2017 +#: src/OpenSSLUtils.cpp:1847 src/OpenSSLUtils.cpp:2047 +#: src/OpenSSLUtils.cpp:2199 msgid "Cannot read directory: %1 (%2) [%3]." msgstr "à®à®à¯à®µà¯ à®ªà®à®¿à®à¯à® à®®à¯à®à®¿à®¯à®µà®¿à®²à¯à®²à¯: %1 (%2) [%3]." -#: src/OpenSSLUtils.cpp:1715 +#: src/OpenSSLUtils.cpp:1897 msgid "No serial number found in %1." msgstr "%1-à®²à¯ à®µà®°à®¿à®à¯ à®à®£à¯ à®à®¾à®£à®ªà¯à®ªà®à®µà®¿à®²à¯à®²à¯." -#: src/OpenSSLUtils.cpp:1735 +#: src/OpenSSLUtils.cpp:1917 msgid "The request already exists." msgstr "à®à¯à®¾à®°à®¿à®à¯à®à¯ à®à®±à¯à®à®©à®µà¯ à®à®³à¯à®³à®¤à¯." -#: src/OpenSSLUtils.cpp:1926 +#: src/OpenSSLUtils.cpp:2108 msgid "Cannot find the request subject." msgstr "à®à¯à®¾à®°à®¿à®à¯à®à¯à®¯à®¿à®©à¯ à®ªà¯à®¾à®°à¯à®³à¯ à®à®¾à®£à®®à¯à®à®¿à®¯à®µà®¿à®²à¯à®²à¯." -#: src/OpenSSLUtils.cpp:2087 +#: src/OpenSSLUtils.cpp:2269 msgid "Cannot find the certificate subject." msgstr "à®à®¾à®©à¯à®±à®¿à®¤à®´à®¿à®©à¯ à®ªà¯à®¾à®°à¯à®³à¯ à®à®¾à®£à®®à¯à®à®¿à®¯à®µà®¿à®²à¯à®²à¯." -#: src/OpenSSLUtils.cpp:2186 +#: src/OpenSSLUtils.cpp:2368 msgid "Invalid caName: %1." msgstr "à®à¯à®²à¯à®²à®¾à®¤ à®à®¿à®à®ªà¯à®¯à®°à¯: %1." -#: src/OpenSSLUtils.cpp:2195 +#: src/OpenSSLUtils.cpp:2377 msgid "'%1' does not exist." msgstr "'%1' à®à®¾à®£à®ªà¯à®ªà®à®µà®¿à®²à¯à®²à¯." -#: src/OpenSSLUtils.cpp:2205 +#: src/OpenSSLUtils.cpp:2387 msgid "%1 still exists." msgstr "%1 à®à®©à¯à®©à¯à®®à¯ à®à®³à¯à®³à®¤à¯." -#: src/OpenSSLUtils.cpp:2216 src/OpenSSLUtils.cpp:2264 -#: src/OpenSSLUtils.cpp:2278 src/OpenSSLUtils.cpp:2292 -#: src/OpenSSLUtils.cpp:2306 src/OpenSSLUtils.cpp:2320 +#: src/OpenSSLUtils.cpp:2398 src/OpenSSLUtils.cpp:2446 +#: src/OpenSSLUtils.cpp:2460 src/OpenSSLUtils.cpp:2474 +#: src/OpenSSLUtils.cpp:2488 src/OpenSSLUtils.cpp:2502 msgid "Cannot create directory: %1 (%2 [%3])." msgstr "à®à®à¯à®µà¯ à®à®°à¯à®µà®¾à®à¯à® à®®à¯à®à®¿à®¯à®µà®¿à®²à¯à®²à¯: %1 (%2) [%3]." -#: src/OpenSSLUtils.cpp:2251 +#: src/OpenSSLUtils.cpp:2433 msgid "Cannot copy the configuration template." msgstr "à®à®³à¯à®³à®®à¯à®µà¯ à®µà®¾à®°à¯à®ªà¯à®ªà¯à®°à¯à®µà¯ à®ªà®¿à®°à®¤à®¿à®¯à¯à®à¯à®à¯à® à®®à¯à®à®¿à®¯à®µà®¿à®²à¯à®²à¯." -#: src/OpenSSLUtils.cpp:2338 +#: src/OpenSSLUtils.cpp:2520 msgid "Cannot create the file." msgstr "à®à¯à®¾à®ªà¯à®ªà¯ à®à®°à¯à®µà®¾à®à¯à® à®®à¯à®à®¿à®¯à®µà®¿à®²à¯à®²à¯." @@ -739,28 +758,28 @@ msgid "Invalid SubjectKeyIdentifierExt object." msgstr "à®à¯à®²à¯à®²à®¾à®¤ à®ªà¯à®¾à®°à¯à®³à¯à®µà®¿à®à¯à®à®à¯à®¯à®¾à®³à®à¯à®à®¾à®à¯à®à®¿à®µà®¿à®°à®¿à®µà¯ à®ªà¯à®¾à®°à¯à®³à¯." -#: src/X509v3CertificateExtensions_Priv.cpp:394 -#: src/X509v3CertificateExtensions_Priv.cpp:450 +#: src/X509v3CertificateExtensions_Priv.cpp:395 +#: src/X509v3CertificateExtensions_Priv.cpp:452 #: src/X509v3RequestExtensions_Priv.cpp:134 #: src/X509v3RequestExtensions_Priv.cpp:189 msgid "Extension occurred more than once: %1." msgstr "à®µà®¿à®°à®¿à®µà®¾à®à¯à®à®®à¯ à®à®°à¯à®®à¯à®±à¯à®à¯à®à¯à®®à¯ à®à®¤à®¿à®à®®à®¾à® à®à®±à¯à®ªà®à¯à®à®¤à¯: %1." -#: src/X509v3CertificateExtensions_Priv.cpp:401 -#: src/X509v3CertificateExtensions_Priv.cpp:457 +#: src/X509v3CertificateExtensions_Priv.cpp:402 +#: src/X509v3CertificateExtensions_Priv.cpp:459 #: src/X509v3RequestExtensions_Priv.cpp:141 #: src/X509v3RequestExtensions_Priv.cpp:196 msgid "Unable to parse the certificate (NID: %1 Crit: %2)." msgstr "(NID: %1 Crit: %2) à®à®¾à®©à¯à®±à®¿à®¤à®´à¯ à®µà®¿à®³à®à¯à® à®®à¯à®à®¿à®¯à®µà®¿à®²à¯à®²à¯." -#: src/X509v3CertificateExtensions_Priv.cpp:509 -#: src/X509v3CertificateExtensions_Priv.cpp:575 -#: src/X509v3CertificateExtensions_Priv.cpp:639 -#: src/X509v3CertificateExtensions_Priv.cpp:701 -#: src/X509v3CertificateExtensions_Priv.cpp:771 -#: src/X509v3CertificateExtensions_Priv.cpp:840 -#: src/X509v3CertificateExtensions_Priv.cpp:916 -#: src/X509v3CertificateExtensions_Priv.cpp:1002 +#: src/X509v3CertificateExtensions_Priv.cpp:511 +#: src/X509v3CertificateExtensions_Priv.cpp:577 +#: src/X509v3CertificateExtensions_Priv.cpp:641 +#: src/X509v3CertificateExtensions_Priv.cpp:703 +#: src/X509v3CertificateExtensions_Priv.cpp:773 +#: src/X509v3CertificateExtensions_Priv.cpp:842 +#: src/X509v3CertificateExtensions_Priv.cpp:918 +#: src/X509v3CertificateExtensions_Priv.cpp:1004 #: src/X509v3CRLExtensions_Priv.cpp:135 #: src/X509v3RequestExtensions_Priv.cpp:249 #: src/X509v3RequestExtensions_Priv.cpp:315 @@ -769,14 +788,14 @@ msgid "Extension occurred more than once." msgstr "à®µà®¿à®°à®¿à®µà®¾à®à¯à®à®®à¯ à®à®°à¯à®®à¯à®±à¯à®à¯à®à¯à®®à¯ à®à®¤à®¿à®à®®à®¾à® à®à®±à¯à®ªà®à¯à®à®¤à¯." -#: src/X509v3CertificateExtensions_Priv.cpp:514 -#: src/X509v3CertificateExtensions_Priv.cpp:580 -#: src/X509v3CertificateExtensions_Priv.cpp:644 -#: src/X509v3CertificateExtensions_Priv.cpp:707 -#: src/X509v3CertificateExtensions_Priv.cpp:776 -#: src/X509v3CertificateExtensions_Priv.cpp:846 -#: src/X509v3CertificateExtensions_Priv.cpp:921 -#: src/X509v3CertificateExtensions_Priv.cpp:1007 +#: src/X509v3CertificateExtensions_Priv.cpp:516 +#: src/X509v3CertificateExtensions_Priv.cpp:582 +#: src/X509v3CertificateExtensions_Priv.cpp:646 +#: src/X509v3CertificateExtensions_Priv.cpp:709 +#: src/X509v3CertificateExtensions_Priv.cpp:778 +#: src/X509v3CertificateExtensions_Priv.cpp:848 +#: src/X509v3CertificateExtensions_Priv.cpp:923 +#: src/X509v3CertificateExtensions_Priv.cpp:1009 #: src/X509v3CRLExtensions_Priv.cpp:140 #: src/X509v3RequestExtensions_Priv.cpp:254 #: src/X509v3RequestExtensions_Priv.cpp:320 @@ -785,7 +804,7 @@ msgid "Unable to parse the certificate (Crit: %1)." msgstr "(Crit: %1)à®à®¾à®©à¯à®±à®¿à®¤à®´à¯ à®µà®¿à®³à®à¯à® à®®à¯à®à®¿à®¯à®µà®¿à®²à¯à®²à¯." -#: src/X509v3CertificateExtensions_Priv.cpp:941 +#: src/X509v3CertificateExtensions_Priv.cpp:943 msgid "Invalid location in authorityInfoAccess." msgstr "à®à®¤à®¿à®à®¾à®°à®µà®¿à®µà®°à®à®£à¯à®à¯à®à®¤à¯à®¤à®¿à®²à¯ à®à¯à®²à¯à®²à®¾à®¤ à®à®®à¯à®µà®¿à®à®®à¯." @@ -913,3 +932,6 @@ #: src/X509v3RequestExtensions.cpp:231 msgid "Invalid value for X509v3RequestExts::setSubjectAlternativeName." msgstr "X509v3à®à¯à®¾à®°à®¿à®à¯à®à¯à®µà®¿à®°à®¿à®µà¯::à®ªà¯à®¾à®°à¯à®³à¯à®®à®¾à®±à¯à®±à¯à®ªà¯à®¯à®°à¯à®à®®à¯.à®à¯à®à¯ à®à¯à®²à¯à®²à®¾à®¤ à®®à®¤à®¿à®ªà¯à®ªà¯." + +#~ msgid "Command returned '%1' : %2" +#~ msgstr "à®à®£à¯ à®¤à®¿à®°à¯à®ªà¯à®ªà®ªà¯à®ªà®à¯à®à®¤à¯'%1' : %2" Modified: limal-head/limal-ca-mgm/po/uk.po URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/po/uk.po?rev=… ============================================================================== --- limal-head/limal-ca-mgm/po/uk.po (original) +++ limal-head/limal-ca-mgm/po/uk.po Mon Oct 29 11:30:37 2007 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: limal-ca-mgm.uk\n" "Report-Msgid-Bugs-To: translation(a)suse.de\n" -"POT-Creation-Date: 2007-09-28 16:31+0200\n" +"POT-Creation-Date: 2007-10-29 11:25+0100\n" "PO-Revision-Date: 2007-08-19 22:19-0700\n" "Last-Translator: Ivan Petrouchtchak <ivanpetrouchtchak(a)yahoo.com>\n" "Language-Team: Ukrainian <translation(a)linux.org.ua>\n" @@ -32,8 +32,8 @@ #: src/AuthorityInfoAccessExtension.cpp:259 #: src/AuthorityInfoAccessExtension.cpp:342 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:87 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:194 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:86 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:193 #: src/BasicConstraintsExtension.cpp:84 src/BasicConstraintsExtension.cpp:187 #: src/BitExtensions.cpp:134 src/BitExtensions.cpp:247 #: src/BitExtensions.cpp:374 src/BitExtensions.cpp:482 src/CA.cpp:1565 @@ -80,12 +80,12 @@ msgid "AuthorityKeyIdentifierExt is not present." msgstr "ÐÐµÐ¼Ð°Ñ AuthorityKeyIdentifierExt." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:155 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:174 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:154 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:173 msgid "AuthorityKeyIdentifierGenerateExt is not present." msgstr "ÐÐµÐ¼Ð°Ñ AuthorityKeyIdentifierGenerateExt." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:186 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:185 msgid "Invalid AuthorityKeyIdentifierGenerateExt object." msgstr "ÐÐµ ÑÐ¸Ð½Ð½Ð¸Ð¹ Ð¾Ð±'ÑÐºÑ AuthorityKeyIdentifierGenerateExt." @@ -205,7 +205,7 @@ msgid "Duplicate DN. Request already exists." msgstr "ÐÑÐ±Ð»ÑÐºÐ°Ñ DN. ÐÐ°Ð¿Ð¸Ñ Ð²Ð¶Ðµ ÑÑÐ½ÑÑ." -#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:968 +#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:1007 msgid "Cannot parse the certificate name." msgstr "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð¿ÑÐ¾Ð°Ð½Ð°Ð»ÑÐ·ÑÐ²Ð°ÑÐ¸ Ð½Ð°Ð·Ð²Ñ ÑÐµÑÑÐ¸ÑÑÐºÐ°ÑÐ°." @@ -545,93 +545,112 @@ msgid "Invalid command %1." msgstr "ÐÐµ ÑÐ¸Ð½Ð½Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° %1." -#: src/OpenSSLUtils.cpp:138 src/OpenSSLUtils.cpp:241 src/OpenSSLUtils.cpp:334 -#: src/OpenSSLUtils.cpp:453 src/OpenSSLUtils.cpp:586 src/OpenSSLUtils.cpp:681 -#: src/OpenSSLUtils.cpp:761 -msgid "Command returned '%1' : %2" -msgstr "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° Ð¿Ð¾Ð²ÐµÑÐ½ÑÐ»Ð° \"%1\" : %2" +#: src/OpenSSLUtils.cpp:132 src/OpenSSLUtils.cpp:240 src/OpenSSLUtils.cpp:338 +#: src/OpenSSLUtils.cpp:462 src/OpenSSLUtils.cpp:600 src/OpenSSLUtils.cpp:700 +#: src/OpenSSLUtils.cpp:782 src/OpenSSLUtils.cpp:871 src/OpenSSLUtils.cpp:952 +#: src/OpenSSLUtils.cpp:1051 src/OpenSSLUtils.cpp:1137 +#: src/OpenSSLUtils.cpp:1271 src/OpenSSLUtils.cpp:1390 +#: src/OpenSSLUtils.cpp:1493 src/OpenSSLUtils.cpp:1645 +#: src/OpenSSLUtils.cpp:1782 +msgid "Executing openssl command failed." +msgstr "" + +#: src/OpenSSLUtils.cpp:143 src/OpenSSLUtils.cpp:251 src/OpenSSLUtils.cpp:349 +#: src/OpenSSLUtils.cpp:473 src/OpenSSLUtils.cpp:611 src/OpenSSLUtils.cpp:711 +#: src/OpenSSLUtils.cpp:796 src/OpenSSLUtils.cpp:1162 +#: src/OpenSSLUtils.cpp:1311 src/OpenSSLUtils.cpp:1415 +#: src/OpenSSLUtils.cpp:1518 src/OpenSSLUtils.cpp:1682 +#: src/OpenSSLUtils.cpp:1822 +msgid "openssl command failed: %1" +msgstr "" -#: src/OpenSSLUtils.cpp:171 src/OpenSSLUtils.cpp:268 src/OpenSSLUtils.cpp:366 -#: src/OpenSSLUtils.cpp:479 src/OpenSSLUtils.cpp:613 src/OpenSSLUtils.cpp:704 +#: src/OpenSSLUtils.cpp:176 src/OpenSSLUtils.cpp:278 src/OpenSSLUtils.cpp:381 +#: src/OpenSSLUtils.cpp:499 src/OpenSSLUtils.cpp:638 src/OpenSSLUtils.cpp:734 msgid "No valid key file specified." msgstr "ÐÐµ Ð²ÐºÐ°Ð·Ð°Ð½Ð¾ ÑÐ¸Ð½Ð½Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð° ÐºÐ»ÑÑÐ°." -#: src/OpenSSLUtils.cpp:276 src/OpenSSLUtils.cpp:374 +#: src/OpenSSLUtils.cpp:286 src/OpenSSLUtils.cpp:389 msgid "No valid request file specified." msgstr "ÐÐµ Ð²ÐºÐ°Ð·Ð°Ð½Ð¾ ÑÐ¸Ð½Ð½Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð° Ð·Ð°Ð¿Ð¸ÑÑ." -#: src/OpenSSLUtils.cpp:487 src/OpenSSLUtils.cpp:621 src/OpenSSLUtils.cpp:712 +#: src/OpenSSLUtils.cpp:507 src/OpenSSLUtils.cpp:646 src/OpenSSLUtils.cpp:742 msgid "No valid CA certificate file specified." msgstr "ÐÐµ Ð²ÐºÐ°Ð·Ð°Ð½Ð¾ ÑÐ¸Ð½Ð½Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð° ÑÐµÑÑÐ¸ÑÑÐºÐ°ÑÐ° CA." -#: src/OpenSSLUtils.cpp:495 src/OpenSSLUtils.cpp:785 +#: src/OpenSSLUtils.cpp:515 src/OpenSSLUtils.cpp:820 msgid "No valid certificate file specified." msgstr "Ð½Ðµ Ð²ÐºÐ°Ð·Ð°Ð½Ð¾ ÑÐ¸Ð½Ð½Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð° ÑÐµÑÑÐ¸ÑÑÐºÐ°ÑÐ°." -#: src/OpenSSLUtils.cpp:793 +#: src/OpenSSLUtils.cpp:828 msgid "No valid CA directory specified." msgstr "ÐÐµ Ð²ÐºÐ°Ð·Ð°Ð½Ð¾ ÑÐ¸Ð½Ð½Ð¾Ð³Ð¾ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ñ CA." -#: src/OpenSSLUtils.cpp:943 +#: src/OpenSSLUtils.cpp:982 msgid "Showing certificate status with serial %1 failed (%2)." msgstr "ÐÐ¾ÐºÐ°Ð· ÑÑÐ°Ð½Ñ ÑÐµÑÑÐ¸ÑÑÐºÐ°ÑÐ° Ð· ÑÐµÑÑÐ¹Ð½Ð¸Ð¼ Ð½Ð¾Ð¼ÐµÑÐ¾Ð¼ %1 Ð·Ð°Ð·Ð½Ð°Ð² Ð½ÐµÐ²Ð´Ð°ÑÑ (%2)." -#: src/OpenSSLUtils.cpp:979 +#: src/OpenSSLUtils.cpp:1018 msgid "The key file does not exist." msgstr "ÐÐµ ÑÑÐ½ÑÑ ÑÐ°Ð¹Ð»Ð° ÐºÐ»ÑÑÐ°." -#: src/OpenSSLUtils.cpp:1474 +#: src/OpenSSLUtils.cpp:1306 src/OpenSSLUtils.cpp:1677 +#: src/OpenSSLUtils.cpp:1817 +#, fuzzy +msgid "Invalid password." +msgstr "ÐÐµ ÑÐ¸Ð½Ð½Ð¸Ð¹ Ð¿Ð°ÑÐ¾Ð»Ñ CA." + +#: src/OpenSSLUtils.cpp:1595 msgid "The password for encrypting the output is required." msgstr "ÐÐ»Ñ ÑÐ¸ÑÑÑÐ²Ð°Ð½Ð½Ñ Ð²Ð¸Ð²Ð¾Ð´Ñ Ð¿Ð¾ÑÑÑÐ±Ð½Ð¸Ð¹ Ð¿Ð°ÑÐ¾Ð»Ñ." -#: src/OpenSSLUtils.cpp:1579 +#: src/OpenSSLUtils.cpp:1736 msgid "The PKCS12 password is required." msgstr "ÐÐ¾ÑÑÑÐ±Ð½Ð¸Ð¹ Ð¿Ð°ÑÐ¾Ð»Ñ PKCS12." -#: src/OpenSSLUtils.cpp:1665 src/OpenSSLUtils.cpp:1865 -#: src/OpenSSLUtils.cpp:2017 +#: src/OpenSSLUtils.cpp:1847 src/OpenSSLUtils.cpp:2047 +#: src/OpenSSLUtils.cpp:2199 msgid "Cannot read directory: %1 (%2) [%3]." msgstr "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð¿ÑÐ¾ÑÐ¸ÑÐ°ÑÐ¸ ÐºÐ°ÑÐ°Ð»Ð¾Ð³: %1 (%2) [%3]." -#: src/OpenSSLUtils.cpp:1715 +#: src/OpenSSLUtils.cpp:1897 msgid "No serial number found in %1." msgstr "Ð %1 Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ ÑÐµÑÑÐ¹Ð½Ð¾Ð³Ð¾ Ð½Ð¾Ð¼ÐµÑÐ°." -#: src/OpenSSLUtils.cpp:1735 +#: src/OpenSSLUtils.cpp:1917 msgid "The request already exists." msgstr "ÐÐ°Ð¿Ð¸Ñ Ð²Ð¶Ðµ ÑÑÐ½ÑÑ." -#: src/OpenSSLUtils.cpp:1926 +#: src/OpenSSLUtils.cpp:2108 msgid "Cannot find the request subject." msgstr "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð·Ð½Ð°Ð¹ÑÐ¸ ÑÐµÐ¼Ñ Ð·Ð°Ð¿Ð¸ÑÑ." -#: src/OpenSSLUtils.cpp:2087 +#: src/OpenSSLUtils.cpp:2269 msgid "Cannot find the certificate subject." msgstr "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð·Ð½Ð°Ð¹ÑÐ¸ ÑÐµÐ¼Ñ ÑÐµÑÑÐ¸ÑÑÐºÐ°ÑÐ°." -#: src/OpenSSLUtils.cpp:2186 +#: src/OpenSSLUtils.cpp:2368 msgid "Invalid caName: %1." msgstr "ÐÐµ ÑÐ¸Ð½Ð½Ð° caName: %1." -#: src/OpenSSLUtils.cpp:2195 +#: src/OpenSSLUtils.cpp:2377 msgid "'%1' does not exist." msgstr "\"%1\" Ð½Ðµ ÑÑÐ½ÑÑ." -#: src/OpenSSLUtils.cpp:2205 +#: src/OpenSSLUtils.cpp:2387 msgid "%1 still exists." msgstr "%1 ÑÐµ ÑÑÐ½ÑÑ." -#: src/OpenSSLUtils.cpp:2216 src/OpenSSLUtils.cpp:2264 -#: src/OpenSSLUtils.cpp:2278 src/OpenSSLUtils.cpp:2292 -#: src/OpenSSLUtils.cpp:2306 src/OpenSSLUtils.cpp:2320 +#: src/OpenSSLUtils.cpp:2398 src/OpenSSLUtils.cpp:2446 +#: src/OpenSSLUtils.cpp:2460 src/OpenSSLUtils.cpp:2474 +#: src/OpenSSLUtils.cpp:2488 src/OpenSSLUtils.cpp:2502 msgid "Cannot create directory: %1 (%2 [%3])." msgstr "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ ÑÑÐ²Ð¾ÑÐ¸ÑÐ¸ ÐºÐ°ÑÐ°Ð»Ð¾Ð³: %1 (%2 [%3])." -#: src/OpenSSLUtils.cpp:2251 +#: src/OpenSSLUtils.cpp:2433 msgid "Cannot copy the configuration template." msgstr "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ ÑÐºÐ¾Ð¿ÑÑÐ²Ð°ÑÐ¸ ÑÐ°Ð±Ð»Ð¾Ð½ ÐºÐ¾Ð½ÑÑÐ³ÑÑÐ°ÑÑÑ." -#: src/OpenSSLUtils.cpp:2338 +#: src/OpenSSLUtils.cpp:2520 msgid "Cannot create the file." msgstr "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ ÑÑÐ²Ð¾ÑÐ¸ÑÐ¸ ÑÐ°Ð¹Ð»." @@ -750,28 +769,28 @@ msgid "Invalid SubjectKeyIdentifierExt object." msgstr "ÐÐµ ÑÐ¸Ð½Ð½Ð¸Ð¹ Ð¾Ð±'ÑÐºÑ SubjectKeyIdentifierExt." -#: src/X509v3CertificateExtensions_Priv.cpp:394 -#: src/X509v3CertificateExtensions_Priv.cpp:450 +#: src/X509v3CertificateExtensions_Priv.cpp:395 +#: src/X509v3CertificateExtensions_Priv.cpp:452 #: src/X509v3RequestExtensions_Priv.cpp:134 #: src/X509v3RequestExtensions_Priv.cpp:189 msgid "Extension occurred more than once: %1." msgstr "Ð Ð¾Ð·ÑÐ¸ÑÐµÐ½Ð½Ñ ÑÑÐ°Ð¿Ð¸Ð»Ð¾ÑÑ Ð±ÑÐ»ÑÑÐµ Ð¾Ð´Ð½Ð¾Ð³Ð¾ ÑÐ°Ð·Ñ: %1." -#: src/X509v3CertificateExtensions_Priv.cpp:401 -#: src/X509v3CertificateExtensions_Priv.cpp:457 +#: src/X509v3CertificateExtensions_Priv.cpp:402 +#: src/X509v3CertificateExtensions_Priv.cpp:459 #: src/X509v3RequestExtensions_Priv.cpp:141 #: src/X509v3RequestExtensions_Priv.cpp:196 msgid "Unable to parse the certificate (NID: %1 Crit: %2)." msgstr "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð¿ÑÐ¾Ð°Ð½Ð°Ð»ÑÐ·ÑÐ²Ð°ÑÐ¸ ÑÐµÑÑÐ¸ÑÑÐºÐ°Ñ (NID: %1 Crit: %2)." -#: src/X509v3CertificateExtensions_Priv.cpp:509 -#: src/X509v3CertificateExtensions_Priv.cpp:575 -#: src/X509v3CertificateExtensions_Priv.cpp:639 -#: src/X509v3CertificateExtensions_Priv.cpp:701 -#: src/X509v3CertificateExtensions_Priv.cpp:771 -#: src/X509v3CertificateExtensions_Priv.cpp:840 -#: src/X509v3CertificateExtensions_Priv.cpp:916 -#: src/X509v3CertificateExtensions_Priv.cpp:1002 +#: src/X509v3CertificateExtensions_Priv.cpp:511 +#: src/X509v3CertificateExtensions_Priv.cpp:577 +#: src/X509v3CertificateExtensions_Priv.cpp:641 +#: src/X509v3CertificateExtensions_Priv.cpp:703 +#: src/X509v3CertificateExtensions_Priv.cpp:773 +#: src/X509v3CertificateExtensions_Priv.cpp:842 +#: src/X509v3CertificateExtensions_Priv.cpp:918 +#: src/X509v3CertificateExtensions_Priv.cpp:1004 #: src/X509v3CRLExtensions_Priv.cpp:135 #: src/X509v3RequestExtensions_Priv.cpp:249 #: src/X509v3RequestExtensions_Priv.cpp:315 @@ -780,14 +799,14 @@ msgid "Extension occurred more than once." msgstr "Ð Ð¾Ð·ÑÐ¸ÑÐµÐ½Ð½Ñ ÑÑÐ°Ð¿Ð¸Ð»Ð¾ÑÑ Ð±ÑÐ»ÑÑÐµ Ð¾Ð´Ð½Ð¾Ð³Ð¾ ÑÐ°Ð·Ñ." -#: src/X509v3CertificateExtensions_Priv.cpp:514 -#: src/X509v3CertificateExtensions_Priv.cpp:580 -#: src/X509v3CertificateExtensions_Priv.cpp:644 -#: src/X509v3CertificateExtensions_Priv.cpp:707 -#: src/X509v3CertificateExtensions_Priv.cpp:776 -#: src/X509v3CertificateExtensions_Priv.cpp:846 -#: src/X509v3CertificateExtensions_Priv.cpp:921 -#: src/X509v3CertificateExtensions_Priv.cpp:1007 +#: src/X509v3CertificateExtensions_Priv.cpp:516 +#: src/X509v3CertificateExtensions_Priv.cpp:582 +#: src/X509v3CertificateExtensions_Priv.cpp:646 +#: src/X509v3CertificateExtensions_Priv.cpp:709 +#: src/X509v3CertificateExtensions_Priv.cpp:778 +#: src/X509v3CertificateExtensions_Priv.cpp:848 +#: src/X509v3CertificateExtensions_Priv.cpp:923 +#: src/X509v3CertificateExtensions_Priv.cpp:1009 #: src/X509v3CRLExtensions_Priv.cpp:140 #: src/X509v3RequestExtensions_Priv.cpp:254 #: src/X509v3RequestExtensions_Priv.cpp:320 @@ -796,7 +815,7 @@ msgid "Unable to parse the certificate (Crit: %1)." msgstr "ÐÐµ Ð²Ð´Ð°ÑÑÑÑÑ Ð¿ÑÐ¾Ð°Ð½Ð°Ð»ÑÐ·ÑÐ²Ð°ÑÐ¸ ÑÐµÑÑÐ¸ÑÑÐºÐ°Ñ. (Crit: %1)." -#: src/X509v3CertificateExtensions_Priv.cpp:941 +#: src/X509v3CertificateExtensions_Priv.cpp:943 msgid "Invalid location in authorityInfoAccess." msgstr "ÐÐµ ÑÐ¸Ð½Ð½Ð° Ð°Ð´ÑÐµÑÐ° Ð² Ð°uthorityInfoAccess." @@ -929,3 +948,6 @@ #: src/X509v3RequestExtensions.cpp:231 msgid "Invalid value for X509v3RequestExts::setSubjectAlternativeName." msgstr "ÐÐµ ÑÐ¸Ð½Ð½Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð½Ñ Ð´Ð»Ñ X509v3RequestExts::setSubjectAlternativeName." + +#~ msgid "Command returned '%1' : %2" +#~ msgstr "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° Ð¿Ð¾Ð²ÐµÑÐ½ÑÐ»Ð° \"%1\" : %2" Modified: limal-head/limal-ca-mgm/po/xh.po URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/po/xh.po?rev=… ============================================================================== --- limal-head/limal-ca-mgm/po/xh.po (original) +++ limal-head/limal-ca-mgm/po/xh.po Mon Oct 29 11:30:37 2007 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: limal-ca-mgm\n" "Report-Msgid-Bugs-To: translation(a)suse.de\n" -"POT-Creation-Date: 2007-09-28 16:31+0200\n" +"POT-Creation-Date: 2007-10-29 11:25+0100\n" "PO-Revision-Date: 2006-11-03 12:03\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" @@ -25,8 +25,8 @@ #: src/AuthorityInfoAccessExtension.cpp:259 #: src/AuthorityInfoAccessExtension.cpp:342 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:87 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:194 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:86 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:193 #: src/BasicConstraintsExtension.cpp:84 src/BasicConstraintsExtension.cpp:187 #: src/BitExtensions.cpp:134 src/BitExtensions.cpp:247 #: src/BitExtensions.cpp:374 src/BitExtensions.cpp:482 src/CA.cpp:1565 @@ -73,12 +73,12 @@ msgid "AuthorityKeyIdentifierExt is not present." msgstr "IsoluloSesichongiSeqhoshaLogunyaziso asikho." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:155 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:174 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:154 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:173 msgid "AuthorityKeyIdentifierGenerateExt is not present." msgstr "IsoluloSoyiloLwesichongiSeqhoshaLogunyaziso alukho." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:186 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:185 msgid "Invalid AuthorityKeyIdentifierGenerateExt object." msgstr "Into YesoluloSofikelelekoKulwaziLogunyaziso Ayisebenziseki." @@ -198,7 +198,7 @@ msgid "Duplicate DN. Request already exists." msgstr "i-DN Yekopi Yesibini. Isicelo sesikhona kakade." -#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:968 +#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:1007 msgid "Cannot parse the certificate name." msgstr "Akukwazeki ukwahlula igama lesatifikethi " @@ -537,93 +537,112 @@ msgid "Invalid command %1." msgstr "Umyalelo %1.awusebenziseki." -#: src/OpenSSLUtils.cpp:138 src/OpenSSLUtils.cpp:241 src/OpenSSLUtils.cpp:334 -#: src/OpenSSLUtils.cpp:453 src/OpenSSLUtils.cpp:586 src/OpenSSLUtils.cpp:681 -#: src/OpenSSLUtils.cpp:761 -msgid "Command returned '%1' : %2" -msgstr "Umyalelo '%1' ubuyiselwe: %2" +#: src/OpenSSLUtils.cpp:132 src/OpenSSLUtils.cpp:240 src/OpenSSLUtils.cpp:338 +#: src/OpenSSLUtils.cpp:462 src/OpenSSLUtils.cpp:600 src/OpenSSLUtils.cpp:700 +#: src/OpenSSLUtils.cpp:782 src/OpenSSLUtils.cpp:871 src/OpenSSLUtils.cpp:952 +#: src/OpenSSLUtils.cpp:1051 src/OpenSSLUtils.cpp:1137 +#: src/OpenSSLUtils.cpp:1271 src/OpenSSLUtils.cpp:1390 +#: src/OpenSSLUtils.cpp:1493 src/OpenSSLUtils.cpp:1645 +#: src/OpenSSLUtils.cpp:1782 +msgid "Executing openssl command failed." +msgstr "" + +#: src/OpenSSLUtils.cpp:143 src/OpenSSLUtils.cpp:251 src/OpenSSLUtils.cpp:349 +#: src/OpenSSLUtils.cpp:473 src/OpenSSLUtils.cpp:611 src/OpenSSLUtils.cpp:711 +#: src/OpenSSLUtils.cpp:796 src/OpenSSLUtils.cpp:1162 +#: src/OpenSSLUtils.cpp:1311 src/OpenSSLUtils.cpp:1415 +#: src/OpenSSLUtils.cpp:1518 src/OpenSSLUtils.cpp:1682 +#: src/OpenSSLUtils.cpp:1822 +msgid "openssl command failed: %1" +msgstr "" -#: src/OpenSSLUtils.cpp:171 src/OpenSSLUtils.cpp:268 src/OpenSSLUtils.cpp:366 -#: src/OpenSSLUtils.cpp:479 src/OpenSSLUtils.cpp:613 src/OpenSSLUtils.cpp:704 +#: src/OpenSSLUtils.cpp:176 src/OpenSSLUtils.cpp:278 src/OpenSSLUtils.cpp:381 +#: src/OpenSSLUtils.cpp:499 src/OpenSSLUtils.cpp:638 src/OpenSSLUtils.cpp:734 msgid "No valid key file specified." msgstr "Akukho fayili ixeliweyo isebenzisekayo." -#: src/OpenSSLUtils.cpp:276 src/OpenSSLUtils.cpp:374 +#: src/OpenSSLUtils.cpp:286 src/OpenSSLUtils.cpp:389 msgid "No valid request file specified." msgstr "Akukho fayili yokucela ixeliweyo isebenzisekayo." -#: src/OpenSSLUtils.cpp:487 src/OpenSSLUtils.cpp:621 src/OpenSSLUtils.cpp:712 +#: src/OpenSSLUtils.cpp:507 src/OpenSSLUtils.cpp:646 src/OpenSSLUtils.cpp:742 msgid "No valid CA certificate file specified." msgstr "Akukho fayili ye-CA ixeliweyo isebenzisekayo." -#: src/OpenSSLUtils.cpp:495 src/OpenSSLUtils.cpp:785 +#: src/OpenSSLUtils.cpp:515 src/OpenSSLUtils.cpp:820 msgid "No valid certificate file specified." msgstr "Akukho fayili yesatifikethi ixeliweyo isebenzisekayo." -#: src/OpenSSLUtils.cpp:793 +#: src/OpenSSLUtils.cpp:828 msgid "No valid CA directory specified." msgstr "Akukho vimba weefayili we-CA uxeliweyo usebenzisekayo." -#: src/OpenSSLUtils.cpp:943 +#: src/OpenSSLUtils.cpp:982 msgid "Showing certificate status with serial %1 failed (%2)." msgstr "Ukuboniswa kwesimo sesatifiketi ngolandelelwano %1 kusilele (%2)." -#: src/OpenSSLUtils.cpp:979 +#: src/OpenSSLUtils.cpp:1018 msgid "The key file does not exist." msgstr "Ifayili esentloko ayikho kwayona." -#: src/OpenSSLUtils.cpp:1474 +#: src/OpenSSLUtils.cpp:1306 src/OpenSSLUtils.cpp:1677 +#: src/OpenSSLUtils.cpp:1817 +#, fuzzy +msgid "Invalid password." +msgstr "Igama lokugqithisa le-CA alisebenziseki." + +#: src/OpenSSLUtils.cpp:1595 msgid "The password for encrypting the output is required." msgstr "Igama lokugqithisa lokwenza isiphumo esintsonkothileyo liyafuneka." -#: src/OpenSSLUtils.cpp:1579 +#: src/OpenSSLUtils.cpp:1736 msgid "The PKCS12 password is required." msgstr "Igama lokugqithisa le-PKCS12 liyafuneka." -#: src/OpenSSLUtils.cpp:1665 src/OpenSSLUtils.cpp:1865 -#: src/OpenSSLUtils.cpp:2017 +#: src/OpenSSLUtils.cpp:1847 src/OpenSSLUtils.cpp:2047 +#: src/OpenSSLUtils.cpp:2199 msgid "Cannot read directory: %1 (%2) [%3]." msgstr "Uvimba weefayili akakwazi kufundeka: %1 (%2) [%3]." -#: src/OpenSSLUtils.cpp:1715 +#: src/OpenSSLUtils.cpp:1897 msgid "No serial number found in %1." msgstr "Akukho nombolo yolandelelwano ifunyenweyo apha %1." -#: src/OpenSSLUtils.cpp:1735 +#: src/OpenSSLUtils.cpp:1917 msgid "The request already exists." msgstr "Isicelo sesikhona kakade." -#: src/OpenSSLUtils.cpp:1926 +#: src/OpenSSLUtils.cpp:2108 msgid "Cannot find the request subject." msgstr "Asifumaneki isihloko sesicelo." -#: src/OpenSSLUtils.cpp:2087 +#: src/OpenSSLUtils.cpp:2269 msgid "Cannot find the certificate subject." msgstr "Asifumaneki isihloko sesatifikethi." -#: src/OpenSSLUtils.cpp:2186 +#: src/OpenSSLUtils.cpp:2368 msgid "Invalid caName: %1." msgstr "Igama le-ca elingasebenzisekiyo: %1." -#: src/OpenSSLUtils.cpp:2195 +#: src/OpenSSLUtils.cpp:2377 msgid "'%1' does not exist." msgstr "'%1ayikho kwayona." -#: src/OpenSSLUtils.cpp:2205 +#: src/OpenSSLUtils.cpp:2387 msgid "%1 still exists." msgstr "%1 isekhona." -#: src/OpenSSLUtils.cpp:2216 src/OpenSSLUtils.cpp:2264 -#: src/OpenSSLUtils.cpp:2278 src/OpenSSLUtils.cpp:2292 -#: src/OpenSSLUtils.cpp:2306 src/OpenSSLUtils.cpp:2320 +#: src/OpenSSLUtils.cpp:2398 src/OpenSSLUtils.cpp:2446 +#: src/OpenSSLUtils.cpp:2460 src/OpenSSLUtils.cpp:2474 +#: src/OpenSSLUtils.cpp:2488 src/OpenSSLUtils.cpp:2502 msgid "Cannot create directory: %1 (%2 [%3])." msgstr "Akakwazi kudaleka uvimba weefayili: %1 (%2 [%3])." -#: src/OpenSSLUtils.cpp:2251 +#: src/OpenSSLUtils.cpp:2433 msgid "Cannot copy the configuration template." msgstr "Asikwazi kukopeka isakhelo sobumbeko." -#: src/OpenSSLUtils.cpp:2338 +#: src/OpenSSLUtils.cpp:2520 msgid "Cannot create the file." msgstr "Ayikwazi kudaleka ifayili." @@ -742,28 +761,28 @@ msgid "Invalid SubjectKeyIdentifierExt object." msgstr "Into YesoluloSesichongiSeqhoshaLesihloko Ayisebenziseki." -#: src/X509v3CertificateExtensions_Priv.cpp:394 -#: src/X509v3CertificateExtensions_Priv.cpp:450 +#: src/X509v3CertificateExtensions_Priv.cpp:395 +#: src/X509v3CertificateExtensions_Priv.cpp:452 #: src/X509v3RequestExtensions_Priv.cpp:134 #: src/X509v3RequestExtensions_Priv.cpp:189 msgid "Extension occurred more than once: %1." msgstr "Isolulo senzeke ngaphezu kwesinye: %1." -#: src/X509v3CertificateExtensions_Priv.cpp:401 -#: src/X509v3CertificateExtensions_Priv.cpp:457 +#: src/X509v3CertificateExtensions_Priv.cpp:402 +#: src/X509v3CertificateExtensions_Priv.cpp:459 #: src/X509v3RequestExtensions_Priv.cpp:141 #: src/X509v3RequestExtensions_Priv.cpp:196 msgid "Unable to parse the certificate (NID: %1 Crit: %2)." msgstr "Akukwazekanga ukwahlula isatifiketi (NID: %1 Crit: %2)." -#: src/X509v3CertificateExtensions_Priv.cpp:509 -#: src/X509v3CertificateExtensions_Priv.cpp:575 -#: src/X509v3CertificateExtensions_Priv.cpp:639 -#: src/X509v3CertificateExtensions_Priv.cpp:701 -#: src/X509v3CertificateExtensions_Priv.cpp:771 -#: src/X509v3CertificateExtensions_Priv.cpp:840 -#: src/X509v3CertificateExtensions_Priv.cpp:916 -#: src/X509v3CertificateExtensions_Priv.cpp:1002 +#: src/X509v3CertificateExtensions_Priv.cpp:511 +#: src/X509v3CertificateExtensions_Priv.cpp:577 +#: src/X509v3CertificateExtensions_Priv.cpp:641 +#: src/X509v3CertificateExtensions_Priv.cpp:703 +#: src/X509v3CertificateExtensions_Priv.cpp:773 +#: src/X509v3CertificateExtensions_Priv.cpp:842 +#: src/X509v3CertificateExtensions_Priv.cpp:918 +#: src/X509v3CertificateExtensions_Priv.cpp:1004 #: src/X509v3CRLExtensions_Priv.cpp:135 #: src/X509v3RequestExtensions_Priv.cpp:249 #: src/X509v3RequestExtensions_Priv.cpp:315 @@ -772,14 +791,14 @@ msgid "Extension occurred more than once." msgstr "Isolulo senzeke ngaphezu kwesinye:" -#: src/X509v3CertificateExtensions_Priv.cpp:514 -#: src/X509v3CertificateExtensions_Priv.cpp:580 -#: src/X509v3CertificateExtensions_Priv.cpp:644 -#: src/X509v3CertificateExtensions_Priv.cpp:707 -#: src/X509v3CertificateExtensions_Priv.cpp:776 -#: src/X509v3CertificateExtensions_Priv.cpp:846 -#: src/X509v3CertificateExtensions_Priv.cpp:921 -#: src/X509v3CertificateExtensions_Priv.cpp:1007 +#: src/X509v3CertificateExtensions_Priv.cpp:516 +#: src/X509v3CertificateExtensions_Priv.cpp:582 +#: src/X509v3CertificateExtensions_Priv.cpp:646 +#: src/X509v3CertificateExtensions_Priv.cpp:709 +#: src/X509v3CertificateExtensions_Priv.cpp:778 +#: src/X509v3CertificateExtensions_Priv.cpp:848 +#: src/X509v3CertificateExtensions_Priv.cpp:923 +#: src/X509v3CertificateExtensions_Priv.cpp:1009 #: src/X509v3CRLExtensions_Priv.cpp:140 #: src/X509v3RequestExtensions_Priv.cpp:254 #: src/X509v3RequestExtensions_Priv.cpp:320 @@ -788,7 +807,7 @@ msgid "Unable to parse the certificate (Crit: %1)." msgstr "Akukwazekanga ukwahlula isatifiketi (Crit: %1)." -#: src/X509v3CertificateExtensions_Priv.cpp:941 +#: src/X509v3CertificateExtensions_Priv.cpp:943 msgid "Invalid location in authorityInfoAccess." msgstr "Indawo engasebenzisekiyoKufikelelekoLolwazilogunyaziso." @@ -967,3 +986,6 @@ msgstr "" "Ixabiso elingasebenzisekiyo LezoluloZeziceloze-X509v3::" "miselaIsichongiSeqhoshaLesihloko." + +#~ msgid "Command returned '%1' : %2" +#~ msgstr "Umyalelo '%1' ubuyiselwe: %2" Modified: limal-head/limal-ca-mgm/po/zh_CN.po URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/po/zh_CN.po?r… ============================================================================== --- limal-head/limal-ca-mgm/po/zh_CN.po (original) +++ limal-head/limal-ca-mgm/po/zh_CN.po Mon Oct 29 11:30:37 2007 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: limal-ca-mgm\n" "Report-Msgid-Bugs-To: translation(a)suse.de\n" -"POT-Creation-Date: 2007-09-28 16:31+0200\n" +"POT-Creation-Date: 2007-10-29 11:25+0100\n" "PO-Revision-Date: 2006-11-02 14:21\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" @@ -25,8 +25,8 @@ #: src/AuthorityInfoAccessExtension.cpp:259 #: src/AuthorityInfoAccessExtension.cpp:342 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:87 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:194 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:86 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:193 #: src/BasicConstraintsExtension.cpp:84 src/BasicConstraintsExtension.cpp:187 #: src/BitExtensions.cpp:134 src/BitExtensions.cpp:247 #: src/BitExtensions.cpp:374 src/BitExtensions.cpp:482 src/CA.cpp:1565 @@ -73,12 +73,12 @@ msgid "AuthorityKeyIdentifierExt is not present." msgstr "AuthorityKeyIdentifierExt ä¸åå¨ã" -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:155 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:174 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:154 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:173 msgid "AuthorityKeyIdentifierGenerateExt is not present." msgstr "AuthorityKeyIdentifierGenerateExt ä¸åå¨ã" -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:186 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:185 msgid "Invalid AuthorityKeyIdentifierGenerateExt object." msgstr "AuthorityKeyIdentifierGenerateExt å¯¹è±¡æ æã" @@ -198,7 +198,7 @@ msgid "Duplicate DN. Request already exists." msgstr "éå¤ç DNãè¯·æ±å·²åå¨ã" -#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:968 +#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:1007 msgid "Cannot parse the certificate name." msgstr "æ æ³å¯¹è¯ä¹¦åç§°è¿è¡è¯æ³åæã" @@ -531,93 +531,112 @@ msgid "Invalid command %1." msgstr "æ æå½ä»¤ %1ã" -#: src/OpenSSLUtils.cpp:138 src/OpenSSLUtils.cpp:241 src/OpenSSLUtils.cpp:334 -#: src/OpenSSLUtils.cpp:453 src/OpenSSLUtils.cpp:586 src/OpenSSLUtils.cpp:681 -#: src/OpenSSLUtils.cpp:761 -msgid "Command returned '%1' : %2" -msgstr "å½ä»¤è¿åäºâ%1âï¼%2" +#: src/OpenSSLUtils.cpp:132 src/OpenSSLUtils.cpp:240 src/OpenSSLUtils.cpp:338 +#: src/OpenSSLUtils.cpp:462 src/OpenSSLUtils.cpp:600 src/OpenSSLUtils.cpp:700 +#: src/OpenSSLUtils.cpp:782 src/OpenSSLUtils.cpp:871 src/OpenSSLUtils.cpp:952 +#: src/OpenSSLUtils.cpp:1051 src/OpenSSLUtils.cpp:1137 +#: src/OpenSSLUtils.cpp:1271 src/OpenSSLUtils.cpp:1390 +#: src/OpenSSLUtils.cpp:1493 src/OpenSSLUtils.cpp:1645 +#: src/OpenSSLUtils.cpp:1782 +msgid "Executing openssl command failed." +msgstr "" + +#: src/OpenSSLUtils.cpp:143 src/OpenSSLUtils.cpp:251 src/OpenSSLUtils.cpp:349 +#: src/OpenSSLUtils.cpp:473 src/OpenSSLUtils.cpp:611 src/OpenSSLUtils.cpp:711 +#: src/OpenSSLUtils.cpp:796 src/OpenSSLUtils.cpp:1162 +#: src/OpenSSLUtils.cpp:1311 src/OpenSSLUtils.cpp:1415 +#: src/OpenSSLUtils.cpp:1518 src/OpenSSLUtils.cpp:1682 +#: src/OpenSSLUtils.cpp:1822 +msgid "openssl command failed: %1" +msgstr "" -#: src/OpenSSLUtils.cpp:171 src/OpenSSLUtils.cpp:268 src/OpenSSLUtils.cpp:366 -#: src/OpenSSLUtils.cpp:479 src/OpenSSLUtils.cpp:613 src/OpenSSLUtils.cpp:704 +#: src/OpenSSLUtils.cpp:176 src/OpenSSLUtils.cpp:278 src/OpenSSLUtils.cpp:381 +#: src/OpenSSLUtils.cpp:499 src/OpenSSLUtils.cpp:638 src/OpenSSLUtils.cpp:734 msgid "No valid key file specified." msgstr "æªæå®ææçå¯é¥æä»¶ã" -#: src/OpenSSLUtils.cpp:276 src/OpenSSLUtils.cpp:374 +#: src/OpenSSLUtils.cpp:286 src/OpenSSLUtils.cpp:389 msgid "No valid request file specified." msgstr "æªæå®ææçè¯·æ±æä»¶ã" -#: src/OpenSSLUtils.cpp:487 src/OpenSSLUtils.cpp:621 src/OpenSSLUtils.cpp:712 +#: src/OpenSSLUtils.cpp:507 src/OpenSSLUtils.cpp:646 src/OpenSSLUtils.cpp:742 msgid "No valid CA certificate file specified." msgstr "æªæå®ææç CA è¯ä¹¦æä»¶ã" -#: src/OpenSSLUtils.cpp:495 src/OpenSSLUtils.cpp:785 +#: src/OpenSSLUtils.cpp:515 src/OpenSSLUtils.cpp:820 msgid "No valid certificate file specified." msgstr "æªæå®ææçè¯ä¹¦æä»¶ã" -#: src/OpenSSLUtils.cpp:793 +#: src/OpenSSLUtils.cpp:828 msgid "No valid CA directory specified." msgstr "æªæå®ææç CA ç®å½ã" -#: src/OpenSSLUtils.cpp:943 +#: src/OpenSSLUtils.cpp:982 msgid "Showing certificate status with serial %1 failed (%2)." msgstr "éè¿è¿ç»ç %1 æ¾ç¤ºè¯ä¹¦ç¶æå¤±è´¥ï¼%2ï¼ã" -#: src/OpenSSLUtils.cpp:979 +#: src/OpenSSLUtils.cpp:1018 msgid "The key file does not exist." msgstr "é®æä»¶ä¸åå¨ã" -#: src/OpenSSLUtils.cpp:1474 +#: src/OpenSSLUtils.cpp:1306 src/OpenSSLUtils.cpp:1677 +#: src/OpenSSLUtils.cpp:1817 +#, fuzzy +msgid "Invalid password." +msgstr "CA å£ä»¤æ æã" + +#: src/OpenSSLUtils.cpp:1595 msgid "The password for encrypting the output is required." msgstr "éè¦å å¯è¾åºçå£ä»¤ã" -#: src/OpenSSLUtils.cpp:1579 +#: src/OpenSSLUtils.cpp:1736 msgid "The PKCS12 password is required." msgstr "éè¦ PKCS12 å£ä»¤ã" -#: src/OpenSSLUtils.cpp:1665 src/OpenSSLUtils.cpp:1865 -#: src/OpenSSLUtils.cpp:2017 +#: src/OpenSSLUtils.cpp:1847 src/OpenSSLUtils.cpp:2047 +#: src/OpenSSLUtils.cpp:2199 msgid "Cannot read directory: %1 (%2) [%3]." msgstr "æ æ³è¯»åç®å½ï¼ %1 (%2) [%3]." -#: src/OpenSSLUtils.cpp:1715 +#: src/OpenSSLUtils.cpp:1897 msgid "No serial number found in %1." msgstr "å¨ %1 æ¾ä¸å°åºåå·ã" -#: src/OpenSSLUtils.cpp:1735 +#: src/OpenSSLUtils.cpp:1917 msgid "The request already exists." msgstr "æ¤è¯·æ±å·²åå¨ã" -#: src/OpenSSLUtils.cpp:1926 +#: src/OpenSSLUtils.cpp:2108 msgid "Cannot find the request subject." msgstr "æ¾ä¸å°è¯·æ±ä¸»é¢ã" -#: src/OpenSSLUtils.cpp:2087 +#: src/OpenSSLUtils.cpp:2269 msgid "Cannot find the certificate subject." msgstr "æ¾ä¸å°è¯ä¹¦ä¸»é¢ã" -#: src/OpenSSLUtils.cpp:2186 +#: src/OpenSSLUtils.cpp:2368 msgid "Invalid caName: %1." msgstr "caName æ æï¼ %1." -#: src/OpenSSLUtils.cpp:2195 +#: src/OpenSSLUtils.cpp:2377 msgid "'%1' does not exist." msgstr "'%1âä¸åå¨ã" -#: src/OpenSSLUtils.cpp:2205 +#: src/OpenSSLUtils.cpp:2387 msgid "%1 still exists." msgstr "%1 ä»ç¶åå¨ã" -#: src/OpenSSLUtils.cpp:2216 src/OpenSSLUtils.cpp:2264 -#: src/OpenSSLUtils.cpp:2278 src/OpenSSLUtils.cpp:2292 -#: src/OpenSSLUtils.cpp:2306 src/OpenSSLUtils.cpp:2320 +#: src/OpenSSLUtils.cpp:2398 src/OpenSSLUtils.cpp:2446 +#: src/OpenSSLUtils.cpp:2460 src/OpenSSLUtils.cpp:2474 +#: src/OpenSSLUtils.cpp:2488 src/OpenSSLUtils.cpp:2502 msgid "Cannot create directory: %1 (%2 [%3])." msgstr "æ æ³åå»ºç®å½ï¼ %1 (%2 [%3])." -#: src/OpenSSLUtils.cpp:2251 +#: src/OpenSSLUtils.cpp:2433 msgid "Cannot copy the configuration template." msgstr "æ æ³å¤å¶éç½®æ¨¡æ¿ã" -#: src/OpenSSLUtils.cpp:2338 +#: src/OpenSSLUtils.cpp:2520 msgid "Cannot create the file." msgstr "æ æ³åå»ºæä»¶ã" @@ -736,28 +755,28 @@ msgid "Invalid SubjectKeyIdentifierExt object." msgstr "SubjectKeyIdentifierExt å¯¹è±¡æ æã" -#: src/X509v3CertificateExtensions_Priv.cpp:394 -#: src/X509v3CertificateExtensions_Priv.cpp:450 +#: src/X509v3CertificateExtensions_Priv.cpp:395 +#: src/X509v3CertificateExtensions_Priv.cpp:452 #: src/X509v3RequestExtensions_Priv.cpp:134 #: src/X509v3RequestExtensions_Priv.cpp:189 msgid "Extension occurred more than once: %1." msgstr "æ©å±ååºç°å¤æ¬¡ï¼ %1." -#: src/X509v3CertificateExtensions_Priv.cpp:401 -#: src/X509v3CertificateExtensions_Priv.cpp:457 +#: src/X509v3CertificateExtensions_Priv.cpp:402 +#: src/X509v3CertificateExtensions_Priv.cpp:459 #: src/X509v3RequestExtensions_Priv.cpp:141 #: src/X509v3RequestExtensions_Priv.cpp:196 msgid "Unable to parse the certificate (NID: %1 Crit: %2)." msgstr "æ æ³å¯¹è¯ä¹¦è¿è¡è¯æ³åæï¼NIDï¼%1 ååï¼ %2)." -#: src/X509v3CertificateExtensions_Priv.cpp:509 -#: src/X509v3CertificateExtensions_Priv.cpp:575 -#: src/X509v3CertificateExtensions_Priv.cpp:639 -#: src/X509v3CertificateExtensions_Priv.cpp:701 -#: src/X509v3CertificateExtensions_Priv.cpp:771 -#: src/X509v3CertificateExtensions_Priv.cpp:840 -#: src/X509v3CertificateExtensions_Priv.cpp:916 -#: src/X509v3CertificateExtensions_Priv.cpp:1002 +#: src/X509v3CertificateExtensions_Priv.cpp:511 +#: src/X509v3CertificateExtensions_Priv.cpp:577 +#: src/X509v3CertificateExtensions_Priv.cpp:641 +#: src/X509v3CertificateExtensions_Priv.cpp:703 +#: src/X509v3CertificateExtensions_Priv.cpp:773 +#: src/X509v3CertificateExtensions_Priv.cpp:842 +#: src/X509v3CertificateExtensions_Priv.cpp:918 +#: src/X509v3CertificateExtensions_Priv.cpp:1004 #: src/X509v3CRLExtensions_Priv.cpp:135 #: src/X509v3RequestExtensions_Priv.cpp:249 #: src/X509v3RequestExtensions_Priv.cpp:315 @@ -766,14 +785,14 @@ msgid "Extension occurred more than once." msgstr "æ©å±ååºç°å¤æ¬¡ã" -#: src/X509v3CertificateExtensions_Priv.cpp:514 -#: src/X509v3CertificateExtensions_Priv.cpp:580 -#: src/X509v3CertificateExtensions_Priv.cpp:644 -#: src/X509v3CertificateExtensions_Priv.cpp:707 -#: src/X509v3CertificateExtensions_Priv.cpp:776 -#: src/X509v3CertificateExtensions_Priv.cpp:846 -#: src/X509v3CertificateExtensions_Priv.cpp:921 -#: src/X509v3CertificateExtensions_Priv.cpp:1007 +#: src/X509v3CertificateExtensions_Priv.cpp:516 +#: src/X509v3CertificateExtensions_Priv.cpp:582 +#: src/X509v3CertificateExtensions_Priv.cpp:646 +#: src/X509v3CertificateExtensions_Priv.cpp:709 +#: src/X509v3CertificateExtensions_Priv.cpp:778 +#: src/X509v3CertificateExtensions_Priv.cpp:848 +#: src/X509v3CertificateExtensions_Priv.cpp:923 +#: src/X509v3CertificateExtensions_Priv.cpp:1009 #: src/X509v3CRLExtensions_Priv.cpp:140 #: src/X509v3RequestExtensions_Priv.cpp:254 #: src/X509v3RequestExtensions_Priv.cpp:320 @@ -782,7 +801,7 @@ msgid "Unable to parse the certificate (Crit: %1)." msgstr "æ æ³å¯¹è¯ä¹¦è¿è¡è¯æ³åæï¼ååï¼ %1)." -#: src/X509v3CertificateExtensions_Priv.cpp:941 +#: src/X509v3CertificateExtensions_Priv.cpp:943 msgid "Invalid location in authorityInfoAccess." msgstr "authorityInfoAccess ä¸çä½ç½®æ æã" @@ -905,3 +924,6 @@ #: src/X509v3RequestExtensions.cpp:231 msgid "Invalid value for X509v3RequestExts::setSubjectAlternativeName." msgstr "X509v3RequestExts::setSubjectAlternativeName çå¼æ æã" + +#~ msgid "Command returned '%1' : %2" +#~ msgstr "å½ä»¤è¿åäºâ%1âï¼%2" Modified: limal-head/limal-ca-mgm/po/zh_TW.po URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/po/zh_TW.po?r… ============================================================================== --- limal-head/limal-ca-mgm/po/zh_TW.po (original) +++ limal-head/limal-ca-mgm/po/zh_TW.po Mon Oct 29 11:30:37 2007 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: limal-ca-mgm\n" "Report-Msgid-Bugs-To: translation(a)suse.de\n" -"POT-Creation-Date: 2007-09-28 16:31+0200\n" +"POT-Creation-Date: 2007-10-29 11:25+0100\n" "PO-Revision-Date: 2006-11-02 14:23\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" @@ -25,8 +25,8 @@ #: src/AuthorityInfoAccessExtension.cpp:259 #: src/AuthorityInfoAccessExtension.cpp:342 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:87 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:194 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:86 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:193 #: src/BasicConstraintsExtension.cpp:84 src/BasicConstraintsExtension.cpp:187 #: src/BitExtensions.cpp:134 src/BitExtensions.cpp:247 #: src/BitExtensions.cpp:374 src/BitExtensions.cpp:482 src/CA.cpp:1565 @@ -73,12 +73,12 @@ msgid "AuthorityKeyIdentifierExt is not present." msgstr "AuthorityKeyIdentifierExt ä¸åå¨ã" -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:155 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:174 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:154 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:173 msgid "AuthorityKeyIdentifierGenerateExt is not present." msgstr "AuthorityKeyIdentifierGenerateExt ä¸åå¨ã" -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:186 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:185 msgid "Invalid AuthorityKeyIdentifierGenerateExt object." msgstr "ç¡æç AuthorityKeyIdentifierGenerateExt ç©ä»¶ã" @@ -198,7 +198,7 @@ msgid "Duplicate DN. Request already exists." msgstr "éè¤ç DN. è¦æ±å·²åå¨ã" -#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:968 +#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:1007 msgid "Cannot parse the certificate name." msgstr "ç¡æ³åææèåç¨±ã" @@ -531,93 +531,112 @@ msgid "Invalid command %1." msgstr "ç¡æçå½ä»¤%1ã" -#: src/OpenSSLUtils.cpp:138 src/OpenSSLUtils.cpp:241 src/OpenSSLUtils.cpp:334 -#: src/OpenSSLUtils.cpp:453 src/OpenSSLUtils.cpp:586 src/OpenSSLUtils.cpp:681 -#: src/OpenSSLUtils.cpp:761 -msgid "Command returned '%1' : %2" -msgstr "å½ä»¤å³å '%1'ï¼%2" +#: src/OpenSSLUtils.cpp:132 src/OpenSSLUtils.cpp:240 src/OpenSSLUtils.cpp:338 +#: src/OpenSSLUtils.cpp:462 src/OpenSSLUtils.cpp:600 src/OpenSSLUtils.cpp:700 +#: src/OpenSSLUtils.cpp:782 src/OpenSSLUtils.cpp:871 src/OpenSSLUtils.cpp:952 +#: src/OpenSSLUtils.cpp:1051 src/OpenSSLUtils.cpp:1137 +#: src/OpenSSLUtils.cpp:1271 src/OpenSSLUtils.cpp:1390 +#: src/OpenSSLUtils.cpp:1493 src/OpenSSLUtils.cpp:1645 +#: src/OpenSSLUtils.cpp:1782 +msgid "Executing openssl command failed." +msgstr "" + +#: src/OpenSSLUtils.cpp:143 src/OpenSSLUtils.cpp:251 src/OpenSSLUtils.cpp:349 +#: src/OpenSSLUtils.cpp:473 src/OpenSSLUtils.cpp:611 src/OpenSSLUtils.cpp:711 +#: src/OpenSSLUtils.cpp:796 src/OpenSSLUtils.cpp:1162 +#: src/OpenSSLUtils.cpp:1311 src/OpenSSLUtils.cpp:1415 +#: src/OpenSSLUtils.cpp:1518 src/OpenSSLUtils.cpp:1682 +#: src/OpenSSLUtils.cpp:1822 +msgid "openssl command failed: %1" +msgstr "" -#: src/OpenSSLUtils.cpp:171 src/OpenSSLUtils.cpp:268 src/OpenSSLUtils.cpp:366 -#: src/OpenSSLUtils.cpp:479 src/OpenSSLUtils.cpp:613 src/OpenSSLUtils.cpp:704 +#: src/OpenSSLUtils.cpp:176 src/OpenSSLUtils.cpp:278 src/OpenSSLUtils.cpp:381 +#: src/OpenSSLUtils.cpp:499 src/OpenSSLUtils.cpp:638 src/OpenSSLUtils.cpp:734 msgid "No valid key file specified." msgstr "æ²ææå®çææéé°æªæ¡ã" -#: src/OpenSSLUtils.cpp:276 src/OpenSSLUtils.cpp:374 +#: src/OpenSSLUtils.cpp:286 src/OpenSSLUtils.cpp:389 msgid "No valid request file specified." msgstr "æ²ææå®çææè¦æ±æªæ¡ã" -#: src/OpenSSLUtils.cpp:487 src/OpenSSLUtils.cpp:621 src/OpenSSLUtils.cpp:712 +#: src/OpenSSLUtils.cpp:507 src/OpenSSLUtils.cpp:646 src/OpenSSLUtils.cpp:742 msgid "No valid CA certificate file specified." msgstr "æ²ææå®çææ CA æèã" -#: src/OpenSSLUtils.cpp:495 src/OpenSSLUtils.cpp:785 +#: src/OpenSSLUtils.cpp:515 src/OpenSSLUtils.cpp:820 msgid "No valid certificate file specified." msgstr "æ²ææå®çæææèæªæ¡ã" -#: src/OpenSSLUtils.cpp:793 +#: src/OpenSSLUtils.cpp:828 msgid "No valid CA directory specified." msgstr "æ²ææå®çææ CA ç®éã" -#: src/OpenSSLUtils.cpp:943 +#: src/OpenSSLUtils.cpp:982 msgid "Showing certificate status with serial %1 failed (%2)." msgstr "é¡¯ç¤ºåºè %1 çæèçæå¤±æ (%2)ã" -#: src/OpenSSLUtils.cpp:979 +#: src/OpenSSLUtils.cpp:1018 msgid "The key file does not exist." msgstr "éé°æªæ¡ä¸åå¨ã" -#: src/OpenSSLUtils.cpp:1474 +#: src/OpenSSLUtils.cpp:1306 src/OpenSSLUtils.cpp:1677 +#: src/OpenSSLUtils.cpp:1817 +#, fuzzy +msgid "Invalid password." +msgstr "ç¡æç CA å¯ç¢¼ã" + +#: src/OpenSSLUtils.cpp:1595 msgid "The password for encrypting the output is required." msgstr "æ¨å¿é è¦æè¼¸åºå å¯çå¯ç¢¼ã" -#: src/OpenSSLUtils.cpp:1579 +#: src/OpenSSLUtils.cpp:1736 msgid "The PKCS12 password is required." msgstr "æ¨å¿é è¦æ PKCS12 å¯ç¢¼ã" -#: src/OpenSSLUtils.cpp:1665 src/OpenSSLUtils.cpp:1865 -#: src/OpenSSLUtils.cpp:2017 +#: src/OpenSSLUtils.cpp:1847 src/OpenSSLUtils.cpp:2047 +#: src/OpenSSLUtils.cpp:2199 msgid "Cannot read directory: %1 (%2) [%3]." msgstr "ç¡æ³è®åç®éï¼%1 (%2) [%3]ã" -#: src/OpenSSLUtils.cpp:1715 +#: src/OpenSSLUtils.cpp:1897 msgid "No serial number found in %1." msgstr "%1 ä¸æ²æåºèã" -#: src/OpenSSLUtils.cpp:1735 +#: src/OpenSSLUtils.cpp:1917 msgid "The request already exists." msgstr "è©²ç³è«å·²ç¶åå¨ã" -#: src/OpenSSLUtils.cpp:1926 +#: src/OpenSSLUtils.cpp:2108 msgid "Cannot find the request subject." msgstr "æ¾ä¸å°ç³è«æ¨é¡ã" -#: src/OpenSSLUtils.cpp:2087 +#: src/OpenSSLUtils.cpp:2269 msgid "Cannot find the certificate subject." msgstr "æ¾ä¸å°èæ¸æ¨é¡ã" -#: src/OpenSSLUtils.cpp:2186 +#: src/OpenSSLUtils.cpp:2368 msgid "Invalid caName: %1." msgstr "ç¡æç caNameï¼%1ã" -#: src/OpenSSLUtils.cpp:2195 +#: src/OpenSSLUtils.cpp:2377 msgid "'%1' does not exist." msgstr "ã%1ãä¸åå¨ã" -#: src/OpenSSLUtils.cpp:2205 +#: src/OpenSSLUtils.cpp:2387 msgid "%1 still exists." msgstr "%1 ä»ç¶åå¨ã" -#: src/OpenSSLUtils.cpp:2216 src/OpenSSLUtils.cpp:2264 -#: src/OpenSSLUtils.cpp:2278 src/OpenSSLUtils.cpp:2292 -#: src/OpenSSLUtils.cpp:2306 src/OpenSSLUtils.cpp:2320 +#: src/OpenSSLUtils.cpp:2398 src/OpenSSLUtils.cpp:2446 +#: src/OpenSSLUtils.cpp:2460 src/OpenSSLUtils.cpp:2474 +#: src/OpenSSLUtils.cpp:2488 src/OpenSSLUtils.cpp:2502 msgid "Cannot create directory: %1 (%2 [%3])." msgstr "ç¡æ³å»ºç«ç®éï¼%1 (%2 [%3])ã" -#: src/OpenSSLUtils.cpp:2251 +#: src/OpenSSLUtils.cpp:2433 msgid "Cannot copy the configuration template." msgstr "ç¡æ³è¤è£½çµæç¯æ¬ã" -#: src/OpenSSLUtils.cpp:2338 +#: src/OpenSSLUtils.cpp:2520 msgid "Cannot create the file." msgstr "ç¡æ³å»ºç«æªæ¡ã" @@ -736,28 +755,28 @@ msgid "Invalid SubjectKeyIdentifierExt object." msgstr "ç¡æç SubjectKeyIdentifierExt ç©ä»¶ã" -#: src/X509v3CertificateExtensions_Priv.cpp:394 -#: src/X509v3CertificateExtensions_Priv.cpp:450 +#: src/X509v3CertificateExtensions_Priv.cpp:395 +#: src/X509v3CertificateExtensions_Priv.cpp:452 #: src/X509v3RequestExtensions_Priv.cpp:134 #: src/X509v3RequestExtensions_Priv.cpp:189 msgid "Extension occurred more than once: %1." msgstr "ç¼çå¤æ¬¡å»¶ä¼¸ï¼%1ã" -#: src/X509v3CertificateExtensions_Priv.cpp:401 -#: src/X509v3CertificateExtensions_Priv.cpp:457 +#: src/X509v3CertificateExtensions_Priv.cpp:402 +#: src/X509v3CertificateExtensions_Priv.cpp:459 #: src/X509v3RequestExtensions_Priv.cpp:141 #: src/X509v3RequestExtensions_Priv.cpp:196 msgid "Unable to parse the certificate (NID: %1 Crit: %2)." msgstr "ç¡æ³åæèæ¸ (NIDï¼ %1 Critï¼%2)ã" -#: src/X509v3CertificateExtensions_Priv.cpp:509 -#: src/X509v3CertificateExtensions_Priv.cpp:575 -#: src/X509v3CertificateExtensions_Priv.cpp:639 -#: src/X509v3CertificateExtensions_Priv.cpp:701 -#: src/X509v3CertificateExtensions_Priv.cpp:771 -#: src/X509v3CertificateExtensions_Priv.cpp:840 -#: src/X509v3CertificateExtensions_Priv.cpp:916 -#: src/X509v3CertificateExtensions_Priv.cpp:1002 +#: src/X509v3CertificateExtensions_Priv.cpp:511 +#: src/X509v3CertificateExtensions_Priv.cpp:577 +#: src/X509v3CertificateExtensions_Priv.cpp:641 +#: src/X509v3CertificateExtensions_Priv.cpp:703 +#: src/X509v3CertificateExtensions_Priv.cpp:773 +#: src/X509v3CertificateExtensions_Priv.cpp:842 +#: src/X509v3CertificateExtensions_Priv.cpp:918 +#: src/X509v3CertificateExtensions_Priv.cpp:1004 #: src/X509v3CRLExtensions_Priv.cpp:135 #: src/X509v3RequestExtensions_Priv.cpp:249 #: src/X509v3RequestExtensions_Priv.cpp:315 @@ -766,14 +785,14 @@ msgid "Extension occurred more than once." msgstr "ç¼çå¤æ¬¡å»¶ä¼¸ã" -#: src/X509v3CertificateExtensions_Priv.cpp:514 -#: src/X509v3CertificateExtensions_Priv.cpp:580 -#: src/X509v3CertificateExtensions_Priv.cpp:644 -#: src/X509v3CertificateExtensions_Priv.cpp:707 -#: src/X509v3CertificateExtensions_Priv.cpp:776 -#: src/X509v3CertificateExtensions_Priv.cpp:846 -#: src/X509v3CertificateExtensions_Priv.cpp:921 -#: src/X509v3CertificateExtensions_Priv.cpp:1007 +#: src/X509v3CertificateExtensions_Priv.cpp:516 +#: src/X509v3CertificateExtensions_Priv.cpp:582 +#: src/X509v3CertificateExtensions_Priv.cpp:646 +#: src/X509v3CertificateExtensions_Priv.cpp:709 +#: src/X509v3CertificateExtensions_Priv.cpp:778 +#: src/X509v3CertificateExtensions_Priv.cpp:848 +#: src/X509v3CertificateExtensions_Priv.cpp:923 +#: src/X509v3CertificateExtensions_Priv.cpp:1009 #: src/X509v3CRLExtensions_Priv.cpp:140 #: src/X509v3RequestExtensions_Priv.cpp:254 #: src/X509v3RequestExtensions_Priv.cpp:320 @@ -782,7 +801,7 @@ msgid "Unable to parse the certificate (Crit: %1)." msgstr "ç¡æ³åæèæ¸ (Critï¼%1)ã" -#: src/X509v3CertificateExtensions_Priv.cpp:941 +#: src/X509v3CertificateExtensions_Priv.cpp:943 msgid "Invalid location in authorityInfoAccess." msgstr "å¨ authorityInfoAccess ä¸çä½ç½®ç¡æã" @@ -905,3 +924,6 @@ #: src/X509v3RequestExtensions.cpp:231 msgid "Invalid value for X509v3RequestExts::setSubjectAlternativeName." msgstr "ç¡æç X509v3RequestExts::setSubjectAlternativeName å¼ã" + +#~ msgid "Command returned '%1' : %2" +#~ msgstr "å½ä»¤å³å '%1'ï¼%2" Modified: limal-head/limal-ca-mgm/po/zu.po URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/po/zu.po?rev=… ============================================================================== --- limal-head/limal-ca-mgm/po/zu.po (original) +++ limal-head/limal-ca-mgm/po/zu.po Mon Oct 29 11:30:37 2007 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: limal-ca-mgm\n" "Report-Msgid-Bugs-To: translation(a)suse.de\n" -"POT-Creation-Date: 2007-09-28 16:31+0200\n" +"POT-Creation-Date: 2007-10-29 11:25+0100\n" "PO-Revision-Date: 2006-11-03 12:03\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" @@ -25,8 +25,8 @@ #: src/AuthorityInfoAccessExtension.cpp:259 #: src/AuthorityInfoAccessExtension.cpp:342 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:87 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:194 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:86 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:193 #: src/BasicConstraintsExtension.cpp:84 src/BasicConstraintsExtension.cpp:187 #: src/BitExtensions.cpp:134 src/BitExtensions.cpp:247 #: src/BitExtensions.cpp:374 src/BitExtensions.cpp:482 src/CA.cpp:1565 @@ -73,12 +73,12 @@ msgid "AuthorityKeyIdentifierExt is not present." msgstr "AuthorityKeyIdentifierExt ayitholakali." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:155 -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:174 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:154 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:173 msgid "AuthorityKeyIdentifierGenerateExt is not present." msgstr "I-AuthorityKeyIdentifierGenerateExt ayitholakali." -#: src/AuthorityKeyIdentifierGenerateExtension.cpp:186 +#: src/AuthorityKeyIdentifierGenerateExtension.cpp:185 msgid "Invalid AuthorityKeyIdentifierGenerateExt object." msgstr "Into ye-AuthorityKeyIdentifierGenerateExt engekho emthethweni." @@ -198,7 +198,7 @@ msgid "Duplicate DN. Request already exists." msgstr "I-DN ephindwe kabili. Isicelo sesikhona kakade." -#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:968 +#: src/CA.cpp:833 src/CA.cpp:860 src/CA.cpp:890 src/OpenSSLUtils.cpp:1007 msgid "Cannot parse the certificate name." msgstr "Ayikwazi ukunqunta igama lesitifiketi." @@ -535,93 +535,112 @@ msgid "Invalid command %1." msgstr "Ikhomandi engekho emthethweni %1." -#: src/OpenSSLUtils.cpp:138 src/OpenSSLUtils.cpp:241 src/OpenSSLUtils.cpp:334 -#: src/OpenSSLUtils.cpp:453 src/OpenSSLUtils.cpp:586 src/OpenSSLUtils.cpp:681 -#: src/OpenSSLUtils.cpp:761 -msgid "Command returned '%1' : %2" -msgstr "Ikhomandi ibuyisiwe '%1' %2" +#: src/OpenSSLUtils.cpp:132 src/OpenSSLUtils.cpp:240 src/OpenSSLUtils.cpp:338 +#: src/OpenSSLUtils.cpp:462 src/OpenSSLUtils.cpp:600 src/OpenSSLUtils.cpp:700 +#: src/OpenSSLUtils.cpp:782 src/OpenSSLUtils.cpp:871 src/OpenSSLUtils.cpp:952 +#: src/OpenSSLUtils.cpp:1051 src/OpenSSLUtils.cpp:1137 +#: src/OpenSSLUtils.cpp:1271 src/OpenSSLUtils.cpp:1390 +#: src/OpenSSLUtils.cpp:1493 src/OpenSSLUtils.cpp:1645 +#: src/OpenSSLUtils.cpp:1782 +msgid "Executing openssl command failed." +msgstr "" + +#: src/OpenSSLUtils.cpp:143 src/OpenSSLUtils.cpp:251 src/OpenSSLUtils.cpp:349 +#: src/OpenSSLUtils.cpp:473 src/OpenSSLUtils.cpp:611 src/OpenSSLUtils.cpp:711 +#: src/OpenSSLUtils.cpp:796 src/OpenSSLUtils.cpp:1162 +#: src/OpenSSLUtils.cpp:1311 src/OpenSSLUtils.cpp:1415 +#: src/OpenSSLUtils.cpp:1518 src/OpenSSLUtils.cpp:1682 +#: src/OpenSSLUtils.cpp:1822 +msgid "openssl command failed: %1" +msgstr "" -#: src/OpenSSLUtils.cpp:171 src/OpenSSLUtils.cpp:268 src/OpenSSLUtils.cpp:366 -#: src/OpenSSLUtils.cpp:479 src/OpenSSLUtils.cpp:613 src/OpenSSLUtils.cpp:704 +#: src/OpenSSLUtils.cpp:176 src/OpenSSLUtils.cpp:278 src/OpenSSLUtils.cpp:381 +#: src/OpenSSLUtils.cpp:499 src/OpenSSLUtils.cpp:638 src/OpenSSLUtils.cpp:734 msgid "No valid key file specified." msgstr "Ayikho ifayela yesikhiye esemthethweni ebonisiwe." -#: src/OpenSSLUtils.cpp:276 src/OpenSSLUtils.cpp:374 +#: src/OpenSSLUtils.cpp:286 src/OpenSSLUtils.cpp:389 msgid "No valid request file specified." msgstr "Ayikho ifayela yesicelo esemthethweni ebonisiwe." -#: src/OpenSSLUtils.cpp:487 src/OpenSSLUtils.cpp:621 src/OpenSSLUtils.cpp:712 +#: src/OpenSSLUtils.cpp:507 src/OpenSSLUtils.cpp:646 src/OpenSSLUtils.cpp:742 msgid "No valid CA certificate file specified." msgstr "Ayikho ifayela yesitifikethi se-CA esemthethweni ebonisiwe." -#: src/OpenSSLUtils.cpp:495 src/OpenSSLUtils.cpp:785 +#: src/OpenSSLUtils.cpp:515 src/OpenSSLUtils.cpp:820 msgid "No valid certificate file specified." msgstr "Ayikho ifayela yesitifiketi esemthethweni ebonisiwe." -#: src/OpenSSLUtils.cpp:793 +#: src/OpenSSLUtils.cpp:828 msgid "No valid CA directory specified." msgstr "Ayikho i-directory ye-CA esemthethweni ebonisiwe." -#: src/OpenSSLUtils.cpp:943 +#: src/OpenSSLUtils.cpp:982 msgid "Showing certificate status with serial %1 failed (%2)." msgstr "Ukubonisa isimo sesitifiketi nge-serial %1 akuphumelelanga (%2)." -#: src/OpenSSLUtils.cpp:979 +#: src/OpenSSLUtils.cpp:1018 msgid "The key file does not exist." msgstr "Ifayela yesikhiye ayitholakali." -#: src/OpenSSLUtils.cpp:1474 +#: src/OpenSSLUtils.cpp:1306 src/OpenSSLUtils.cpp:1677 +#: src/OpenSSLUtils.cpp:1817 +#, fuzzy +msgid "Invalid password." +msgstr "Iphasiwedi ye-CA engekho emthethweni." + +#: src/OpenSSLUtils.cpp:1595 msgid "The password for encrypting the output is required." msgstr "Iphasiwedi yokufaka amakhodi ayisivikelo kokuthunyelwayo iyadigeka." -#: src/OpenSSLUtils.cpp:1579 +#: src/OpenSSLUtils.cpp:1736 msgid "The PKCS12 password is required." msgstr "Iphasiwedi ye-PKCS12 iyadingeka." -#: src/OpenSSLUtils.cpp:1665 src/OpenSSLUtils.cpp:1865 -#: src/OpenSSLUtils.cpp:2017 +#: src/OpenSSLUtils.cpp:1847 src/OpenSSLUtils.cpp:2047 +#: src/OpenSSLUtils.cpp:2199 msgid "Cannot read directory: %1 (%2) [%3]." msgstr "Ayikwazi ukufunda i-directory: %1 (%2) [%3]." -#: src/OpenSSLUtils.cpp:1715 +#: src/OpenSSLUtils.cpp:1897 msgid "No serial number found in %1." msgstr "Ayikho inombolo ye-serial etholakele ku-%1." -#: src/OpenSSLUtils.cpp:1735 +#: src/OpenSSLUtils.cpp:1917 msgid "The request already exists." msgstr "Isicelo sesikhona kakade." -#: src/OpenSSLUtils.cpp:1926 +#: src/OpenSSLUtils.cpp:2108 msgid "Cannot find the request subject." msgstr "Ayikwazi ukuthola isihloko sesicelo." -#: src/OpenSSLUtils.cpp:2087 +#: src/OpenSSLUtils.cpp:2269 msgid "Cannot find the certificate subject." msgstr "Ayikwazi ukuthola isihloko sesitifiketi." -#: src/OpenSSLUtils.cpp:2186 +#: src/OpenSSLUtils.cpp:2368 msgid "Invalid caName: %1." msgstr "I-caName engekho emthethweni: %1." -#: src/OpenSSLUtils.cpp:2195 +#: src/OpenSSLUtils.cpp:2377 msgid "'%1' does not exist." msgstr "'I-o%1' ayitholakali." -#: src/OpenSSLUtils.cpp:2205 +#: src/OpenSSLUtils.cpp:2387 msgid "%1 still exists." msgstr "I-%1 isekhona." -#: src/OpenSSLUtils.cpp:2216 src/OpenSSLUtils.cpp:2264 -#: src/OpenSSLUtils.cpp:2278 src/OpenSSLUtils.cpp:2292 -#: src/OpenSSLUtils.cpp:2306 src/OpenSSLUtils.cpp:2320 +#: src/OpenSSLUtils.cpp:2398 src/OpenSSLUtils.cpp:2446 +#: src/OpenSSLUtils.cpp:2460 src/OpenSSLUtils.cpp:2474 +#: src/OpenSSLUtils.cpp:2488 src/OpenSSLUtils.cpp:2502 msgid "Cannot create directory: %1 (%2 [%3])." msgstr "Ayikwazi ukwakha i-directory: %1 (%2 [%3])." -#: src/OpenSSLUtils.cpp:2251 +#: src/OpenSSLUtils.cpp:2433 msgid "Cannot copy the configuration template." msgstr "Ayikwazi ukukopisha i-template yokuhlela." -#: src/OpenSSLUtils.cpp:2338 +#: src/OpenSSLUtils.cpp:2520 msgid "Cannot create the file." msgstr "Ayikwazi ukwakha ifayela." @@ -740,28 +759,28 @@ msgid "Invalid SubjectKeyIdentifierExt object." msgstr "Into ye-SubjectKeyIdentifierExt engekho emthethweni." -#: src/X509v3CertificateExtensions_Priv.cpp:394 -#: src/X509v3CertificateExtensions_Priv.cpp:450 +#: src/X509v3CertificateExtensions_Priv.cpp:395 +#: src/X509v3CertificateExtensions_Priv.cpp:452 #: src/X509v3RequestExtensions_Priv.cpp:134 #: src/X509v3RequestExtensions_Priv.cpp:189 msgid "Extension occurred more than once: %1." msgstr "Isandiso segama senzeke izikhathi ezingaphezu kwesisodwa: %1." -#: src/X509v3CertificateExtensions_Priv.cpp:401 -#: src/X509v3CertificateExtensions_Priv.cpp:457 +#: src/X509v3CertificateExtensions_Priv.cpp:402 +#: src/X509v3CertificateExtensions_Priv.cpp:459 #: src/X509v3RequestExtensions_Priv.cpp:141 #: src/X509v3RequestExtensions_Priv.cpp:196 msgid "Unable to parse the certificate (NID: %1 Crit: %2)." msgstr "Ayikwazi ukunqunta isitifiketi (NID: %1 Crit: %2)." -#: src/X509v3CertificateExtensions_Priv.cpp:509 -#: src/X509v3CertificateExtensions_Priv.cpp:575 -#: src/X509v3CertificateExtensions_Priv.cpp:639 -#: src/X509v3CertificateExtensions_Priv.cpp:701 -#: src/X509v3CertificateExtensions_Priv.cpp:771 -#: src/X509v3CertificateExtensions_Priv.cpp:840 -#: src/X509v3CertificateExtensions_Priv.cpp:916 -#: src/X509v3CertificateExtensions_Priv.cpp:1002 +#: src/X509v3CertificateExtensions_Priv.cpp:511 +#: src/X509v3CertificateExtensions_Priv.cpp:577 +#: src/X509v3CertificateExtensions_Priv.cpp:641 +#: src/X509v3CertificateExtensions_Priv.cpp:703 +#: src/X509v3CertificateExtensions_Priv.cpp:773 +#: src/X509v3CertificateExtensions_Priv.cpp:842 +#: src/X509v3CertificateExtensions_Priv.cpp:918 +#: src/X509v3CertificateExtensions_Priv.cpp:1004 #: src/X509v3CRLExtensions_Priv.cpp:135 #: src/X509v3RequestExtensions_Priv.cpp:249 #: src/X509v3RequestExtensions_Priv.cpp:315 @@ -770,14 +789,14 @@ msgid "Extension occurred more than once." msgstr "Isandiso segama senzeke izikhathi ezingaphezu kwesisodwa:" -#: src/X509v3CertificateExtensions_Priv.cpp:514 -#: src/X509v3CertificateExtensions_Priv.cpp:580 -#: src/X509v3CertificateExtensions_Priv.cpp:644 -#: src/X509v3CertificateExtensions_Priv.cpp:707 -#: src/X509v3CertificateExtensions_Priv.cpp:776 -#: src/X509v3CertificateExtensions_Priv.cpp:846 -#: src/X509v3CertificateExtensions_Priv.cpp:921 -#: src/X509v3CertificateExtensions_Priv.cpp:1007 +#: src/X509v3CertificateExtensions_Priv.cpp:516 +#: src/X509v3CertificateExtensions_Priv.cpp:582 +#: src/X509v3CertificateExtensions_Priv.cpp:646 +#: src/X509v3CertificateExtensions_Priv.cpp:709 +#: src/X509v3CertificateExtensions_Priv.cpp:778 +#: src/X509v3CertificateExtensions_Priv.cpp:848 +#: src/X509v3CertificateExtensions_Priv.cpp:923 +#: src/X509v3CertificateExtensions_Priv.cpp:1009 #: src/X509v3CRLExtensions_Priv.cpp:140 #: src/X509v3RequestExtensions_Priv.cpp:254 #: src/X509v3RequestExtensions_Priv.cpp:320 @@ -786,7 +805,7 @@ msgid "Unable to parse the certificate (Crit: %1)." msgstr "Ayikwazi ukunqunta isitifiketi (Crit: %1)." -#: src/X509v3CertificateExtensions_Priv.cpp:941 +#: src/X509v3CertificateExtensions_Priv.cpp:943 msgid "Invalid location in authorityInfoAccess." msgstr "Indawo engekho emthethweni kwi-authorityInfoAccess." @@ -945,3 +964,6 @@ msgid "Invalid value for X509v3RequestExts::setSubjectAlternativeName." msgstr "" "I-value engekho emthethweni ye-X509v3RequestExts::setSubjectAlternativeName." + +#~ msgid "Command returned '%1' : %2" +#~ msgstr "Ikhomandi ibuyisiwe '%1' %2" -- To unsubscribe, e-mail: limal-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: limal-commit+help(a)opensuse.org

1 0

r2356 - in /limal-head/limal-ca-mgm: src/OpenSSLUtils.cpp testsuite/single.out/ConvertTest.err
by mcalmer＠svn.opensuse.org 29 Oct '07

29 Oct '07

Author: mcalmer Date: Mon Oct 29 11:10:12 2007 New Revision: 2356 URL: http://svn.opensuse.org/viewcvs/limal?rev=2356&view=rev Log: - test for invalid password in convert functions and throw the correct error - adapt testcase Modified: limal-head/limal-ca-mgm/src/OpenSSLUtils.cpp limal-head/limal-ca-mgm/testsuite/single.out/ConvertTest.err Modified: limal-head/limal-ca-mgm/src/OpenSSLUtils.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/OpenSSLUt… ============================================================================== --- limal-head/limal-ca-mgm/src/OpenSSLUtils.cpp (original) +++ limal-head/limal-ca-mgm/src/OpenSSLUtils.cpp Mon Oct 29 11:10:12 2007 @@ -1278,7 +1278,7 @@ if(!errOutput.empty()) { // This message is not an error - if(!PerlRegEx("^writing RSA key$").match(errOutput)) + if(!PerlRegEx("^writing RSA key$", PCRE_CASELESS).match(errOutput)) { LOGIT_ERROR("openssl stderr:" << errOutput); foundError = true; @@ -1300,8 +1300,16 @@ StringArray sa = errOutput.tokenize("\n\r"); String msg = (sa.empty()? "" : sa[0]); - BLOCXX_THROW(limal::RuntimeException, - Format(__("openssl command failed: %1"),msg).c_str()); + if(PerlRegEx("unable to load Private Key", PCRE_CASELESS).match(msg)) + { + BLOCXX_THROW_ERR(limal::ValueException, + __("Invalid password."), E_INVALID_PASSWD); + } + else + { + BLOCXX_THROW(limal::RuntimeException, + Format(__("openssl command failed: %1"),msg).c_str()); + } } ByteBuffer out = LocalManagement::readFile(outFileName); @@ -1663,8 +1671,16 @@ StringArray sa = errOutput.tokenize("\n\r"); String msg = (sa.empty()? "" : sa[0]); - BLOCXX_THROW(limal::RuntimeException, + if(PerlRegEx("unable to load Private Key", PCRE_CASELESS).match(msg)) + { + BLOCXX_THROW_ERR(limal::ValueException, + __("Invalid password."), E_INVALID_PASSWD); + } + else + { + BLOCXX_THROW(limal::RuntimeException, Format(__("openssl command failed: %1"), msg).c_str()); + } } ByteBuffer out = LocalManagement::readFile(outFileName); @@ -1773,7 +1789,7 @@ if(!errOutput.empty()) { // This message is not an error - if(!PerlRegEx("^MAC verified OK$").match(errOutput)) + if(!PerlRegEx("^MAC verified OK$", PCRE_CASELESS).match(errOutput)) { LOGIT_ERROR("openssl stderr:" << errOutput); foundError = true; @@ -1795,8 +1811,16 @@ StringArray sa = errOutput.tokenize("\n\r"); String msg = (sa.empty()? "" : sa[0]); - BLOCXX_THROW(limal::RuntimeException, + if(PerlRegEx("invalid password", PCRE_CASELESS).match(msg)) + { + BLOCXX_THROW_ERR(limal::ValueException, + __("Invalid password."), E_INVALID_PASSWD); + } + else + { + BLOCXX_THROW(limal::RuntimeException, Format(__("openssl command failed: %1"), msg).c_str()); + } } ByteBuffer out = LocalManagement::readFile(outFileName); Modified: limal-head/limal-ca-mgm/testsuite/single.out/ConvertTest.err URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/testsuite/sin… ============================================================================== --- limal-head/limal-ca-mgm/testsuite/single.out/ConvertTest.err (original) +++ limal-head/limal-ca-mgm/testsuite/single.out/ConvertTest.err Mon Oct 29 11:10:12 2007 @@ -1,12 +1,12 @@ INFO ca-mgm - openssl status:1 Exception: -OpenSSLUtils.cpp: RuntimeException: openssl command failed: unable to load Private Key +OpenSSLUtils.cpp: ValueException: Invalid password. END INFO ca-mgm - openssl status:1 Exception: -OpenSSLUtils.cpp: 1667 RuntimeException: openssl command failed: unable to load private key +OpenSSLUtils.cpp: 1677 ValueException: Invalid password. END INFO ca-mgm - openssl status:1 Exception: -OpenSSLUtils.cpp: 1799 RuntimeException: openssl command failed: Mac verify error: invalid password? +OpenSSLUtils.cpp: 1817 ValueException: Invalid password. END -- To unsubscribe, e-mail: limal-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: limal-commit+help(a)opensuse.org

1 0

r2355 - /limal-head/limal-ca-mgm/src/
by mcalmer＠svn.opensuse.org 17 Oct '07

17 Oct '07

Author: mcalmer Date: Wed Oct 17 14:18:38 2007 New Revision: 2355 URL: http://svn.opensuse.org/viewcvs/limal?rev=2355&view=rev Log: fix indenting Modified: limal-head/limal-ca-mgm/src/AuthorityInfoAccessExtension.cpp limal-head/limal-ca-mgm/src/AuthorityKeyIdentifierExtension.cpp limal-head/limal-ca-mgm/src/AuthorityKeyIdentifierExtension_Priv.cpp limal-head/limal-ca-mgm/src/AuthorityKeyIdentifierExtension_Priv.hpp limal-head/limal-ca-mgm/src/AuthorityKeyIdentifierGenerateExtension.cpp limal-head/limal-ca-mgm/src/BasicConstraintsExtension.cpp limal-head/limal-ca-mgm/src/BitExtensions.cpp limal-head/limal-ca-mgm/src/CAConfig.cpp limal-head/limal-ca-mgm/src/CRLData.cpp limal-head/limal-ca-mgm/src/CRLDataImpl.hpp limal-head/limal-ca-mgm/src/CRLData_Priv.cpp limal-head/limal-ca-mgm/src/CRLData_Priv.hpp limal-head/limal-ca-mgm/src/CRLDistributionPointsExtension.cpp limal-head/limal-ca-mgm/src/CRLGenerationData.cpp limal-head/limal-ca-mgm/src/CRLReason.cpp limal-head/limal-ca-mgm/src/CRLReason_Priv.cpp limal-head/limal-ca-mgm/src/CRLReason_Priv.hpp limal-head/limal-ca-mgm/src/CertificateData.cpp limal-head/limal-ca-mgm/src/CertificateDataImpl.hpp limal-head/limal-ca-mgm/src/CertificateData_Priv.cpp limal-head/limal-ca-mgm/src/CertificateData_Priv.hpp limal-head/limal-ca-mgm/src/CertificateIssueData.cpp limal-head/limal-ca-mgm/src/CertificatePoliciesExtension.cpp limal-head/limal-ca-mgm/src/Commands.hpp.in limal-head/limal-ca-mgm/src/DNObject.cpp limal-head/limal-ca-mgm/src/DNObjectImpl.hpp limal-head/limal-ca-mgm/src/DNObject_Priv.cpp limal-head/limal-ca-mgm/src/DNObject_Priv.hpp limal-head/limal-ca-mgm/src/ExtendedKeyUsageExt.cpp limal-head/limal-ca-mgm/src/ExtensionBase.cpp limal-head/limal-ca-mgm/src/IssuerAlternativeNameExtension.cpp limal-head/limal-ca-mgm/src/LiteralValues.cpp limal-head/limal-ca-mgm/src/LiteralValues_Priv.cpp limal-head/limal-ca-mgm/src/LiteralValues_Priv.hpp limal-head/limal-ca-mgm/src/LocalManagement.cpp limal-head/limal-ca-mgm/src/OpenSSLUtils.hpp limal-head/limal-ca-mgm/src/RequestData.cpp limal-head/limal-ca-mgm/src/RequestDataImpl.hpp limal-head/limal-ca-mgm/src/RequestData_Priv.cpp limal-head/limal-ca-mgm/src/RequestData_Priv.hpp limal-head/limal-ca-mgm/src/RequestGenerationData.cpp limal-head/limal-ca-mgm/src/StringExtensions.cpp limal-head/limal-ca-mgm/src/SubjectAlternativeNameExtension.cpp limal-head/limal-ca-mgm/src/SubjectKeyIdentifierExtension.cpp limal-head/limal-ca-mgm/src/Utils.cpp limal-head/limal-ca-mgm/src/Utils.hpp limal-head/limal-ca-mgm/src/X509v3CRLExtensions.cpp limal-head/limal-ca-mgm/src/X509v3CRLExtensionsImpl.hpp limal-head/limal-ca-mgm/src/X509v3CRLExtensions_Priv.cpp limal-head/limal-ca-mgm/src/X509v3CRLExtensions_Priv.hpp limal-head/limal-ca-mgm/src/X509v3CRLGenerationExtensions.cpp limal-head/limal-ca-mgm/src/X509v3CertificateExtensions.cpp limal-head/limal-ca-mgm/src/X509v3CertificateExtensionsImpl.hpp limal-head/limal-ca-mgm/src/X509v3CertificateExtensions_Priv.cpp limal-head/limal-ca-mgm/src/X509v3CertificateExtensions_Priv.hpp limal-head/limal-ca-mgm/src/X509v3CertificateIssueExtensions.cpp limal-head/limal-ca-mgm/src/X509v3RequestExtensions.cpp limal-head/limal-ca-mgm/src/X509v3RequestExtensionsImpl.hpp limal-head/limal-ca-mgm/src/X509v3RequestExtensions_Priv.cpp limal-head/limal-ca-mgm/src/X509v3RequestExtensions_Priv.hpp limal-head/limal-ca-mgm/src/config.cpp Modified: limal-head/limal-ca-mgm/src/AuthorityInfoAccessExtension.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/Authority… ============================================================================== --- limal-head/limal-ca-mgm/src/AuthorityInfoAccessExtension.cpp (original) +++ limal-head/limal-ca-mgm/src/AuthorityInfoAccessExtension.cpp Wed Oct 17 14:18:38 2007 @@ -40,30 +40,30 @@ class AuthorityInformationImpl : public blocxx::COWIntrusiveCountableBase { - public: +public: AuthorityInformationImpl() : accessOID(String()), location(LiteralValue()) {} - AuthorityInformationImpl(const String &accessOID_, + AuthorityInformationImpl(const String &accessOID_, const LiteralValue& location_ ) : accessOID(accessOID_), location(location_) {} - + AuthorityInformationImpl(const AuthorityInformationImpl &ai) : blocxx::COWIntrusiveCountableBase(ai), - accessOID(ai.accessOID), - location(ai.location) + accessOID(ai.accessOID), + location(ai.location) {} - + virtual ~AuthorityInformationImpl() {} - + AuthorityInformationImpl* clone() const { return new AuthorityInformationImpl(*this); } - + String accessOID; LiteralValue location; @@ -71,14 +71,14 @@ class AuthorityInfoAccessExtImpl : public blocxx::COWIntrusiveCountableBase { - public: +public: AuthorityInfoAccessExtImpl() : info(blocxx::List<AuthorityInformation>()) {} AuthorityInfoAccessExtImpl(const AuthorityInfoAccessExtImpl &aie) : blocxx::COWIntrusiveCountableBase(aie), - info(aie.info) + info(aie.info) {} virtual ~AuthorityInfoAccessExtImpl() {} @@ -87,11 +87,11 @@ { return new AuthorityInfoAccessExtImpl(*this); } - + blocxx::List<AuthorityInformation> info; }; - + AuthorityInformation::AuthorityInformation() : m_impl(new AuthorityInformationImpl()) {} @@ -100,18 +100,18 @@ : m_impl(ai.m_impl) {} -AuthorityInformation::AuthorityInformation(const String &accessOID, +AuthorityInformation::AuthorityInformation(const String &accessOID, const LiteralValue& location) : m_impl(new AuthorityInformationImpl(accessOID, location)) { if(!location.valid()) { - LOGIT_ERROR("invalid location"); + LOGIT_ERROR("invalid location"); BLOCXX_THROW(limal::ValueException, __("Invalid location.")); } if(!initAccessOIDCheck().isValid(accessOID)) { - LOGIT_ERROR("invalid accessOID"); + LOGIT_ERROR("invalid accessOID"); BLOCXX_THROW(limal::ValueException, __("Invalid accessOID.")); } } @@ -123,24 +123,24 @@ AuthorityInformation::operator=(const AuthorityInformation& ai) { if(this == &ai) return *this; - + m_impl = ai.m_impl; - + return *this; } void -AuthorityInformation::setAuthorityInformation(const String &accessOID, +AuthorityInformation::setAuthorityInformation(const String &accessOID, const LiteralValue& location) { if(!location.valid()) { - LOGIT_ERROR("invalid location"); + LOGIT_ERROR("invalid location"); BLOCXX_THROW(limal::ValueException, __("Invalid location.")); } if(!initAccessOIDCheck().isValid(accessOID)) { - LOGIT_ERROR("invalid accessOID"); + LOGIT_ERROR("invalid accessOID"); BLOCXX_THROW(limal::ValueException, __("Invalid accessOID.")); } @@ -165,17 +165,17 @@ { if(!initAccessOIDCheck().isValid(m_impl->accessOID)) { - LOGIT_DEBUG("return AuthorityInformation::valid() is false"); + LOGIT_DEBUG("return AuthorityInformation::valid() is false"); return false; } - + if(!m_impl->location.valid()) { - LOGIT_DEBUG("return AuthorityInformation::valid() is false"); + LOGIT_DEBUG("return AuthorityInformation::valid() is false"); return false; } - - LOGIT_DEBUG("return AuthorityInformation::valid() is true"); + + LOGIT_DEBUG("return AuthorityInformation::valid() is true"); return true; } @@ -183,13 +183,13 @@ AuthorityInformation::verify() const { StringArray result; - + if(!initAccessOIDCheck().isValid(m_impl->accessOID)) { result.append(Format("invalid value(%1) for accessOID", m_impl->accessOID).toString()); } result.appendArray(m_impl->location.verify()); - + LOGIT_DEBUG_STRINGARRAY("AuthorityInformation::verify()", result); return result; } @@ -245,7 +245,7 @@ {} AuthorityInfoAccessExt::AuthorityInfoAccessExt(const AuthorityInfoAccessExt& extension) - : ExtensionBase(extension), m_impl(extension.m_impl) + : ExtensionBase(extension), m_impl(extension.m_impl) {} AuthorityInfoAccessExt::AuthorityInfoAccessExt(CAConfig* caConfig, Type type) @@ -264,7 +264,7 @@ { StringArray sp = PerlRegEx("\\s*,\\s*") .split(caConfig->getValue(type2Section(type, true), "authorityInfoAccess")); - + if(sp[0].equalsIgnoreCase("critical")) setCritical(true); StringArray::const_iterator it = sp.begin(); @@ -288,11 +288,11 @@ AuthorityInfoAccessExt::~AuthorityInfoAccessExt() {} -AuthorityInfoAccessExt& +AuthorityInfoAccessExt& AuthorityInfoAccessExt::operator=(const AuthorityInfoAccessExt& extension) { if(this == &extension) return *this; - + ExtensionBase::operator=(extension); m_impl = extension.m_impl; @@ -325,7 +325,7 @@ return m_impl->info; } -void +void AuthorityInfoAccessExt::commit2Config(CA& ca, Type type) const { if(!valid()) @@ -399,7 +399,7 @@ blocxx::StringArray result; if(!isPresent()) return result; - + if(m_impl->info.empty()) { result.append(String("No access informations available")); Modified: limal-head/limal-ca-mgm/src/AuthorityKeyIdentifierExtension.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/Authority… ============================================================================== --- limal-head/limal-ca-mgm/src/AuthorityKeyIdentifierExtension.cpp (original) +++ limal-head/limal-ca-mgm/src/AuthorityKeyIdentifierExtension.cpp Wed Oct 17 14:18:38 2007 @@ -35,14 +35,14 @@ class AuthorityKeyIdentifierExtImpl : public blocxx::COWIntrusiveCountableBase { - public: +public: AuthorityKeyIdentifierExtImpl() : keyid(String()) , DirName(String()) , serial(String()) {} - + AuthorityKeyIdentifierExtImpl(const AuthorityKeyIdentifierExtImpl &impl) : COWIntrusiveCountableBase(impl) , keyid(impl.keyid) @@ -56,14 +56,14 @@ { return new AuthorityKeyIdentifierExtImpl(*this); } - + String keyid; String DirName; - String serial; + String serial; }; // ====================================================================== - + AuthorityKeyIdentifierExt::AuthorityKeyIdentifierExt() : ExtensionBase() , m_impl(new AuthorityKeyIdentifierExtImpl()) @@ -77,18 +77,18 @@ AuthorityKeyIdentifierExt::~AuthorityKeyIdentifierExt() {} -AuthorityKeyIdentifierExt& +AuthorityKeyIdentifierExt& AuthorityKeyIdentifierExt::operator=(const AuthorityKeyIdentifierExt& extension) { if(this == &extension) return *this; ExtensionBase::operator=(extension); m_impl = extension.m_impl; - + return *this; } -blocxx::String +blocxx::String AuthorityKeyIdentifierExt::getKeyID() const { if(!isPresent()) { @@ -99,7 +99,7 @@ return m_impl->keyid; } -blocxx::String +blocxx::String AuthorityKeyIdentifierExt::getDirName() const { if(!isPresent()) { @@ -110,7 +110,7 @@ return m_impl->DirName; } -blocxx::String +blocxx::String AuthorityKeyIdentifierExt::getSerial() const { if(!isPresent()) { @@ -148,7 +148,7 @@ return result; } - + // protected void @@ -170,7 +170,7 @@ } // private -void +void AuthorityKeyIdentifierExt::commit2Config(CA&, Type) const {} Modified: limal-head/limal-ca-mgm/src/AuthorityKeyIdentifierExtension_Priv.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/Authority… ============================================================================== --- limal-head/limal-ca-mgm/src/AuthorityKeyIdentifierExtension_Priv.cpp (original) +++ limal-head/limal-ca-mgm/src/AuthorityKeyIdentifierExtension_Priv.cpp Wed Oct 17 14:18:38 2007 @@ -42,17 +42,17 @@ : AuthorityKeyIdentifierExt() { } - + AuthorityKeyIdentifierExt_Priv::AuthorityKeyIdentifierExt_Priv(STACK_OF(X509_EXTENSION)* extensions) : AuthorityKeyIdentifierExt() { int crit = 0; - + AUTHORITY_KEYID *aki = NULL; aki = static_cast<AUTHORITY_KEYID *>(X509V3_get_d2i(extensions, - NID_authority_key_identifier, - &crit, NULL)); - + NID_authority_key_identifier, + &crit, NULL)); + if(aki == NULL) { if(crit == -1) @@ -64,7 +64,7 @@ } else if(crit == -2) { - // extension occurred more than once + // extension occurred more than once LOGIT_ERROR("Extension occurred more than once"); BLOCXX_THROW(limal::SyntaxException, "Extension occurred more than once"); @@ -79,7 +79,7 @@ if(aki->keyid) { String tmpKeyID; - + for(int i = 0; i < aki->keyid->length; ++i) { String d; @@ -93,24 +93,24 @@ } setKeyID(tmpKeyID); } - + if(aki->issuer) { int j; GENERAL_NAME *gen; String tmpDirName; - + for(j = 0; j < sk_GENERAL_NAME_num(aki->issuer); j++) { gen = sk_GENERAL_NAME_value(aki->issuer, j); - + if(gen->type == GEN_DIRNAME) - { + { char oline[256]; X509_NAME_oneline(gen->d.dirn, oline, 256); - + tmpDirName += oline; - + if( (j+1) < sk_GENERAL_NAME_num(aki->issuer) ) { tmpDirName += '\n'; @@ -123,7 +123,7 @@ if(aki->serial) { String tmpSerial; - + for(int i = 0; i < aki->serial->length; ++i) { String d; @@ -154,12 +154,12 @@ AuthorityKeyIdentifierExt_Priv::operator=(const AuthorityKeyIdentifierExt_Priv& extension) { if(this == &extension) return *this; - + AuthorityKeyIdentifierExt::operator=(extension); - + return *this; } - + } } Modified: limal-head/limal-ca-mgm/src/AuthorityKeyIdentifierExtension_Priv.hpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/Authority… ============================================================================== --- limal-head/limal-ca-mgm/src/AuthorityKeyIdentifierExtension_Priv.hpp (original) +++ limal-head/limal-ca-mgm/src/AuthorityKeyIdentifierExtension_Priv.hpp Wed Oct 17 14:18:38 2007 @@ -31,18 +31,18 @@ namespace CA_MGM_NAMESPACE { - class AuthorityKeyIdentifierExt_Priv : public AuthorityKeyIdentifierExt { - public: +class AuthorityKeyIdentifierExt_Priv : public AuthorityKeyIdentifierExt { +public: - AuthorityKeyIdentifierExt_Priv(); - AuthorityKeyIdentifierExt_Priv(STACK_OF(X509_EXTENSION)* extensions); - AuthorityKeyIdentifierExt_Priv(const AuthorityKeyIdentifierExt_Priv& extension); - virtual ~AuthorityKeyIdentifierExt_Priv(); - - AuthorityKeyIdentifierExt_Priv& - operator=(const AuthorityKeyIdentifierExt_Priv& extension); + AuthorityKeyIdentifierExt_Priv(); + AuthorityKeyIdentifierExt_Priv(STACK_OF(X509_EXTENSION)* extensions); + AuthorityKeyIdentifierExt_Priv(const AuthorityKeyIdentifierExt_Priv& extension); + virtual ~AuthorityKeyIdentifierExt_Priv(); - }; + AuthorityKeyIdentifierExt_Priv& + operator=(const AuthorityKeyIdentifierExt_Priv& extension); + +}; } } Modified: limal-head/limal-ca-mgm/src/AuthorityKeyIdentifierGenerateExtension.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/Authority… ============================================================================== --- limal-head/limal-ca-mgm/src/AuthorityKeyIdentifierGenerateExtension.cpp (original) +++ limal-head/limal-ca-mgm/src/AuthorityKeyIdentifierGenerateExtension.cpp Wed Oct 17 14:18:38 2007 @@ -37,7 +37,7 @@ class AuthorityKeyIdentifierGenerateExtImpl : public blocxx::COWIntrusiveCountableBase { - public: +public: AuthorityKeyIdentifierGenerateExtImpl() : keyid(AuthorityKeyIdentifierGenerateExt::KeyID_none) @@ -55,16 +55,16 @@ , keyid(impl.keyid) , issuer(impl.issuer) {} - + ~AuthorityKeyIdentifierGenerateExtImpl() {} AuthorityKeyIdentifierGenerateExtImpl* clone() const { return new AuthorityKeyIdentifierGenerateExtImpl(*this); } - + AuthorityKeyIdentifierGenerateExt::KeyID keyid; - AuthorityKeyIdentifierGenerateExt::Issuer issuer; + AuthorityKeyIdentifierGenerateExt::Issuer issuer; }; @@ -74,8 +74,7 @@ , m_impl(new AuthorityKeyIdentifierGenerateExtImpl()) {} -AuthorityKeyIdentifierGenerateExt::AuthorityKeyIdentifierGenerateExt(CAConfig* caConfig, - Type type) +AuthorityKeyIdentifierGenerateExt::AuthorityKeyIdentifierGenerateExt(CAConfig* caConfig, Type type) : ExtensionBase() , m_impl(new AuthorityKeyIdentifierGenerateExtImpl()) { @@ -111,7 +110,7 @@ } AuthorityKeyIdentifierGenerateExt::AuthorityKeyIdentifierGenerateExt(KeyID kid, - Issuer iss) + Issuer iss) : ExtensionBase() , m_impl(new AuthorityKeyIdentifierGenerateExtImpl(kid, iss)) { @@ -127,14 +126,14 @@ {} -AuthorityKeyIdentifierGenerateExt& +AuthorityKeyIdentifierGenerateExt& AuthorityKeyIdentifierGenerateExt::operator=(const AuthorityKeyIdentifierGenerateExt& extension) { if(this == &extension) return *this; ExtensionBase::operator=(extension); m_impl = extension.m_impl; - + return *this; } @@ -202,26 +201,26 @@ switch(getKeyID()) { - case AuthorityKeyIdentifierGenerateExt::KeyID_normal: - extString += "keyid,"; - break; - case AuthorityKeyIdentifierGenerateExt::KeyID_always: - extString += "keyid:always,"; - break; - default: - break; + case AuthorityKeyIdentifierGenerateExt::KeyID_normal: + extString += "keyid,"; + break; + case AuthorityKeyIdentifierGenerateExt::KeyID_always: + extString += "keyid:always,"; + break; + default: + break; } switch(getIssuer()) { - case AuthorityKeyIdentifierGenerateExt::Issuer_normal: - extString += "issuer,"; - break; - case AuthorityKeyIdentifierGenerateExt::Issuer_always: - extString += "issuer:always,"; - break; - default: - break; + case AuthorityKeyIdentifierGenerateExt::Issuer_normal: + extString += "issuer,"; + break; + case AuthorityKeyIdentifierGenerateExt::Issuer_always: + extString += "issuer:always,"; + break; + default: + break; } ca.getConfig()->setValue(type2Section(type, true), "authorityKeyIdentifier", Modified: limal-head/limal-ca-mgm/src/BasicConstraintsExtension.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/BasicCons… ============================================================================== --- limal-head/limal-ca-mgm/src/BasicConstraintsExtension.cpp (original) +++ limal-head/limal-ca-mgm/src/BasicConstraintsExtension.cpp Wed Oct 17 14:18:38 2007 @@ -38,7 +38,7 @@ class BasicConstraintsExtImpl : public blocxx::COWIntrusiveCountableBase { - public: +public: BasicConstraintsExtImpl() : ca(false) @@ -63,10 +63,10 @@ bool ca; blocxx::Int32 pathlen; - + }; - + BasicConstraintsExt::BasicConstraintsExt() : ExtensionBase() , m_impl(new BasicConstraintsExtImpl()) @@ -92,12 +92,12 @@ StringArray sp = PerlRegEx("\\s*,\\s*") .split(caConfig->getValue(type2Section(type, true), "basicConstraints")); - if(sp[0].equalsIgnoreCase("critical")) setCritical(true); + if(sp[0].equalsIgnoreCase("critical")) setCritical(true); StringArray::const_iterator it = sp.begin(); for(; it != sp.end(); ++it) { - if((*it).equalsIgnoreCase("ca:true")) isCA = true; + if((*it).equalsIgnoreCase("ca:true")) isCA = true; else if((*it).equalsIgnoreCase("ca:false")) isCA = false; else if((*it).startsWith("pathlen:", String::E_CASE_INSENSITIVE)) { @@ -242,7 +242,7 @@ blocxx::StringArray result; if(!isPresent()) return result; - + if(isCA() && getPathLength() < -1) { result.append(Format("invalid value for pathLength(%1). Has to be >= -1", Modified: limal-head/limal-ca-mgm/src/BitExtensions.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/BitExtens… ============================================================================== --- limal-head/limal-ca-mgm/src/BitExtensions.cpp (original) +++ limal-head/limal-ca-mgm/src/BitExtensions.cpp Wed Oct 17 14:18:38 2007 @@ -38,7 +38,7 @@ class BitExtensionImpl : public blocxx::COWIntrusiveCountableBase { - public: +public: BitExtensionImpl() : value(0) {} @@ -65,7 +65,7 @@ // =============================================================== - + BitExtension::BitExtension() : ExtensionBase() , m_impl(new BitExtensionImpl()) @@ -116,7 +116,7 @@ // ################################################################### - + KeyUsageExt::KeyUsageExt() : BitExtension() {} @@ -138,7 +138,7 @@ if(p) { blocxx::UInt32 keyUsage = 0; - + String ku = caConfig->getValue(type2Section(type, true), "keyUsage"); StringArray sp = PerlRegEx("\\s*,\\s*").split(ku); @@ -147,15 +147,15 @@ StringArray::const_iterator it = sp.begin(); for(; it != sp.end(); ++it) { - if((*it).equalsIgnoreCase("digitalSignature")) keyUsage |= digitalSignature; - else if((*it).equalsIgnoreCase("nonRepudiation")) keyUsage |= nonRepudiation; - else if((*it).equalsIgnoreCase("keyEncipherment")) keyUsage |= keyEncipherment; - else if((*it).equalsIgnoreCase("dataEncipherment")) keyUsage |= dataEncipherment; - else if((*it).equalsIgnoreCase("keyAgreement")) keyUsage |= keyAgreement; - else if((*it).equalsIgnoreCase("keyCertSign")) keyUsage |= keyCertSign; - else if((*it).equalsIgnoreCase("cRLSign")) keyUsage |= cRLSign; - else if((*it).equalsIgnoreCase("encipherOnly")) keyUsage |= encipherOnly; - else if((*it).equalsIgnoreCase("decipherOnly")) keyUsage |= decipherOnly; + if((*it).equalsIgnoreCase("digitalSignature")) keyUsage |= digitalSignature; + else if((*it).equalsIgnoreCase("nonRepudiation")) keyUsage |= nonRepudiation; + else if((*it).equalsIgnoreCase("keyEncipherment")) keyUsage |= keyEncipherment; + else if((*it).equalsIgnoreCase("dataEncipherment")) keyUsage |= dataEncipherment; + else if((*it).equalsIgnoreCase("keyAgreement")) keyUsage |= keyAgreement; + else if((*it).equalsIgnoreCase("keyCertSign")) keyUsage |= keyCertSign; + else if((*it).equalsIgnoreCase("cRLSign")) keyUsage |= cRLSign; + else if((*it).equalsIgnoreCase("encipherOnly")) keyUsage |= encipherOnly; + else if((*it).equalsIgnoreCase("decipherOnly")) keyUsage |= decipherOnly; else LOGIT_INFO("Unknown KeyUsage option: " << (*it)); @@ -225,7 +225,7 @@ BLOCXX_THROW(limal::RuntimeException, __("KeyUsageExt is not present.")); } - + return !!(getValue() & ku); } @@ -289,8 +289,8 @@ { keyUsageString += "decipherOnly,"; } - - ca.getConfig()->setValue(type2Section(type, true), "keyUsage", + + ca.getConfig()->setValue(type2Section(type, true), "keyUsage", keyUsageString.erase(keyUsageString.length()-1)); } else @@ -305,7 +305,7 @@ if(!isPresent()) return true; if(!validKeyUsage(getValue())) return false; - + return true; } @@ -356,7 +356,7 @@ // ################################################################### - + NsCertTypeExt::NsCertTypeExt() : BitExtension() {} @@ -378,7 +378,7 @@ if(p) { blocxx::UInt32 bits = 0; - + String ct = caConfig->getValue(type2Section(type, true), "nsCertType"); StringArray sp = PerlRegEx("\\s*,\\s*").split(ct); @@ -387,13 +387,13 @@ StringArray::const_iterator it = sp.begin(); for(; it != sp.end(); ++it) { - if((*it).equalsIgnoreCase("client")) bits |= client; - else if((*it).equalsIgnoreCase("server")) bits |= server; - else if((*it).equalsIgnoreCase("email")) bits |= email; - else if((*it).equalsIgnoreCase("objsign")) bits |= objsign; - else if((*it).equalsIgnoreCase("reserved")) bits |= reserved; - else if((*it).equalsIgnoreCase("sslCA")) bits |= sslCA; - else if((*it).equalsIgnoreCase("emailCA")) bits |= emailCA; + if((*it).equalsIgnoreCase("client")) bits |= client; + else if((*it).equalsIgnoreCase("server")) bits |= server; + else if((*it).equalsIgnoreCase("email")) bits |= email; + else if((*it).equalsIgnoreCase("objsign")) bits |= objsign; + else if((*it).equalsIgnoreCase("reserved")) bits |= reserved; + else if((*it).equalsIgnoreCase("sslCA")) bits |= sslCA; + else if((*it).equalsIgnoreCase("emailCA")) bits |= emailCA; else if((*it).equalsIgnoreCase("objCA")) bits |= objCA; else LOGIT_INFO("Unknown NsCertType option: " << (*it)); @@ -437,7 +437,7 @@ { if(nsCertTypes > 0xFF || nsCertTypes == 0) { - BLOCXX_THROW(limal::ValueException, + BLOCXX_THROW(limal::ValueException, Format(__("Invalid value for NsCertTypeExt: %1."), nsCertTypes).c_str()); } setValue(nsCertTypes); @@ -520,8 +520,8 @@ { nsCertTypeString += "objCA,"; } - - ca.getConfig()->setValue(type2Section(type, true), "nsCertType", + + ca.getConfig()->setValue(type2Section(type, true), "nsCertType", nsCertTypeString.erase(nsCertTypeString.length()-1)); } else @@ -536,7 +536,7 @@ if(!isPresent()) return true; if(getValue() > 0xFF || getValue() == 0) return false; - + return true; } Modified: limal-head/limal-ca-mgm/src/CAConfig.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/CAConfig.… ============================================================================== --- limal-head/limal-ca-mgm/src/CAConfig.cpp (original) +++ limal-head/limal-ca-mgm/src/CAConfig.cpp Wed Oct 17 14:18:38 2007 @@ -44,7 +44,7 @@ class CAConfigImpl : public blocxx::COWIntrusiveCountableBase { - public: +public: CAConfigImpl() : parser(INIParser ()) , srcFilename(String()) @@ -63,7 +63,7 @@ virtual ~CAConfigImpl() {} - + CAConfigImpl* clone() const { return new CAConfigImpl(*this); @@ -74,7 +74,7 @@ }; - + CAConfig::CAConfig(const String &file) : m_impl(new CAConfigImpl(file)) { @@ -90,10 +90,10 @@ commentsDescr.append ("^[ \t]*#.*$"); commentsDescr.append ("#.*"); commentsDescr.append ("^[ \t]*$"); - commentsDescr.append ("^[ \t]*;[^;]+.*$"); + commentsDescr.append ("^[ \t]*;[^;]+.*$"); IoPatternDescr pattern1 = { "^[ \t]*([^=;]*[^ \t;=])[ \t]*=[ \t]*(.*[^ \t]|)[ \t]*$" , " %s = %s"}; - EntryDescr eDescr1 = {pattern1, "", "" , false}; + EntryDescr eDescr1 = {pattern1, "", "" , false}; entryDescr.append (eDescr1); IoPatternDescr pattern2 = {"^[ \t]*;;[ \t]*([^=]*[^ \t=])[ \t]*=[ \t]*(.*[^ \t]|)[ \t]*$" , ";; %s = %s"}; @@ -101,12 +101,12 @@ entryDescr.append (eDescr2); IoPatternDescr patternBegin1 = {"^[ \t]*\\[[ \t]*(.*[^ \t])[ \t]*\\][ \t]*", "[%s]"}; - IoPatternDescr patternBegin2 = {"^[ \t]*;;[ \t]*\\[[ \t]*(.*[^ \t])[ \t]*\\][ \t]*", ";; [%s]"}; + IoPatternDescr patternBegin2 = {"^[ \t]*;;[ \t]*\\[[ \t]*(.*[^ \t])[ \t]*\\][ \t]*", ";; [%s]"}; IoPatternDescr patternEnd; SectionDescr sDescr1 = {patternBegin1, patternEnd , false }; sectionDescr.append (sDescr1); SectionDescr sDescr2 = {patternBegin2, patternEnd , false }; - sectionDescr.append (sDescr2); + sectionDescr.append (sDescr2); m_impl->parser.initMachine (options, commentsDescr, sectionDescr, entryDescr, rewrites); m_impl->parser.initFiles (file); @@ -183,7 +183,7 @@ // delete entry (m_impl->parser.iniFile.getSection (section)).delEntry (key); // and save - m_impl->parser.write(); + m_impl->parser.write(); } } @@ -253,15 +253,15 @@ { LOGIT_ERROR ("Cannot open filename " << file ); return NULL; - } + } // coppying out << in.rdbuf(); - + in.close(); out.close(); - - return new CAConfig (file); + + return new CAConfig (file); } String @@ -276,7 +276,7 @@ CASection cas; cas.section = &(m_impl->parser.iniFile); dumpTree(&cas); -} +} // private @@ -289,7 +289,7 @@ } CAConfig& -CAConfig::operator=(const CAConfig&) + CAConfig::operator=(const CAConfig&) { return *this; } @@ -298,7 +298,7 @@ CAConfig::validateAndFix() { bool didChanges = false; - + limal::INI::SectionMap sections = m_impl->parser.iniFile.getSections(); if(sections.find("req") != sections.end()) @@ -325,12 +325,12 @@ } m_impl->parser.iniFile.delSection("req"); didChanges = true; - + } if(sections.find("v3_req") != sections.end()) { LOGIT_INFO("Found v3_req section: converting v3_req to v3_req_ca, v3_req_client, v3_req_server"); - + if(sections.find("v3_req_ca") == sections.end()) { // convert v3_req to v3_req_ca @@ -356,7 +356,6 @@ } } - } } Modified: limal-head/limal-ca-mgm/src/CRLData.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/CRLData.c… ============================================================================== --- limal-head/limal-ca-mgm/src/CRLData.cpp (original) +++ limal-head/limal-ca-mgm/src/CRLData.cpp Wed Oct 17 14:18:38 2007 @@ -39,7 +39,7 @@ using namespace limal; using namespace blocxx; - + RevocationEntry::RevocationEntry() : m_impl(new RevocationEntryImpl()) {} @@ -51,13 +51,13 @@ RevocationEntry::~RevocationEntry() {} -RevocationEntry& +RevocationEntry& RevocationEntry::operator=(const RevocationEntry& entry) { if(this == &entry) return *this; - + m_impl = entry.m_impl; - + return *this; } @@ -94,7 +94,7 @@ RevocationEntry::verify() const { StringArray result; - + if(!initHexCheck().isValid(m_impl->serial)) { result.append(Format("invalid serial: %1", m_impl->serial).toString()); @@ -102,7 +102,7 @@ result.appendArray(m_impl->revocationReason.verify()); LOGIT_DEBUG_STRINGARRAY("RevocationEntry::verify()", result); - + return result; } @@ -123,13 +123,13 @@ // ################################################################## CRLData::CRLData(const CRLData& data) - : m_impl(data.m_impl) +: m_impl(data.m_impl) {} CRLData::~CRLData() {} -CRLData& +CRLData& CRLData::operator=(const CRLData& data) { if(this == &data) return *this; @@ -180,15 +180,15 @@ { switch(m_impl->signatureAlgorithm) { - case E_SHA1RSA: - return "SHA1RSA"; - break; - case E_MD5RSA: - return "MD5RSA"; - break; - case E_SHA1DSA: - return "SHA1DSA"; - break; + case E_SHA1RSA: + return "SHA1RSA"; + break; + case E_MD5RSA: + return "MD5RSA"; + break; + case E_SHA1DSA: + return "SHA1DSA"; + break; } return String(); } @@ -235,7 +235,7 @@ String text = String((const char*)ustringval, n); BIO_free(bio); - + return text; } @@ -245,13 +245,13 @@ unsigned char *ustringval = NULL; unsigned int n = 0; BIO *bio = BIO_new(BIO_s_mem()); - + X509V3_extensions_print(bio, NULL, m_impl->x509->crl->extensions, 0, 4); n = BIO_get_mem_data(bio, &ustringval); String extText = String((const char*)ustringval, n); BIO_free(bio); - + return extText; } @@ -290,7 +290,7 @@ CRLData::verify() const { StringArray result; - + if(m_impl->version < 1 || m_impl->version > 2) { result.append(Format("invalid version: %1", m_impl->version).toString()); @@ -309,7 +309,7 @@ result.appendArray(checkRevocationData(m_impl->revocationData)); LOGIT_DEBUG_STRINGARRAY("CRLData::verify()", result); - + return result; } Modified: limal-head/limal-ca-mgm/src/CRLDataImpl.hpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/CRLDataIm… ============================================================================== --- limal-head/limal-ca-mgm/src/CRLDataImpl.hpp (original) +++ limal-head/limal-ca-mgm/src/CRLDataImpl.hpp Wed Oct 17 14:18:38 2007 @@ -32,95 +32,95 @@ namespace CA_MGM_NAMESPACE { - class RevocationEntryImpl : public blocxx::COWIntrusiveCountableBase +class RevocationEntryImpl : public blocxx::COWIntrusiveCountableBase +{ +public: + RevocationEntryImpl() + : serial(0) + , revocationDate(0) + , revocationReason(CRLReason()) + {} + + RevocationEntryImpl(const RevocationEntryImpl& impl) + : COWIntrusiveCountableBase(impl) + , serial(impl.serial) + , revocationDate(impl.revocationDate) + , revocationReason(impl.revocationReason) + {} + + ~RevocationEntryImpl() {} + + RevocationEntryImpl* clone() const { - public: - RevocationEntryImpl() - : serial(0) - , revocationDate(0) - , revocationReason(CRLReason()) - {} - - RevocationEntryImpl(const RevocationEntryImpl& impl) - : COWIntrusiveCountableBase(impl) - , serial(impl.serial) - , revocationDate(impl.revocationDate) - , revocationReason(impl.revocationReason) - {} + return new RevocationEntryImpl(*this); + } - ~RevocationEntryImpl() {} + String serial; + time_t revocationDate; + CRLReason revocationReason; + +}; + +class CRLDataImpl : public blocxx::COWIntrusiveCountableBase +{ +public: + CRLDataImpl() + : version(0) + , fingerprint("") + , lastUpdate(0) + , nextUpdate(0) + , issuer(DNObject()) + , signatureAlgorithm(E_SHA1RSA) + , signature(ByteBuffer()) + , extensions(X509v3CRLExts_Priv()) + , revocationData(blocxx::Map<String, RevocationEntry>()) + , x509(NULL) + {} + + CRLDataImpl(const CRLDataImpl& impl) + : COWIntrusiveCountableBase(impl) + , version(impl.version) + , fingerprint(impl.fingerprint) + , lastUpdate(impl.lastUpdate) + , nextUpdate(impl.nextUpdate) + , issuer(impl.issuer) + , signatureAlgorithm(impl.signatureAlgorithm) + , signature(impl.signature) + , extensions(impl.extensions) + , revocationData(impl.revocationData) + , x509(X509_CRL_dup(impl.x509)) + {} - RevocationEntryImpl* clone() const + ~CRLDataImpl() + { + if(x509 != NULL) { - return new RevocationEntryImpl(*this); + X509_CRL_free(x509); + x509 = NULL; } + } - String serial; - time_t revocationDate; - CRLReason revocationReason; + CRLDataImpl* clone() const + { + return new CRLDataImpl(*this); + } - }; + blocxx::Int32 version; + String fingerprint; + time_t lastUpdate; + time_t nextUpdate; - class CRLDataImpl : public blocxx::COWIntrusiveCountableBase - { - public: - CRLDataImpl() - : version(0) - , fingerprint("") - , lastUpdate(0) - , nextUpdate(0) - , issuer(DNObject()) - , signatureAlgorithm(E_SHA1RSA) - , signature(ByteBuffer()) - , extensions(X509v3CRLExts_Priv()) - , revocationData(blocxx::Map<String, RevocationEntry>()) - , x509(NULL) - {} - - CRLDataImpl(const CRLDataImpl& impl) - : COWIntrusiveCountableBase(impl) - , version(impl.version) - , fingerprint(impl.fingerprint) - , lastUpdate(impl.lastUpdate) - , nextUpdate(impl.nextUpdate) - , issuer(impl.issuer) - , signatureAlgorithm(impl.signatureAlgorithm) - , signature(impl.signature) - , extensions(impl.extensions) - , revocationData(impl.revocationData) - , x509(X509_CRL_dup(impl.x509)) - {} + DNObject issuer; - ~CRLDataImpl() - { - if(x509 != NULL) - { - X509_CRL_free(x509); - x509 = NULL; - } - } + SigAlg signatureAlgorithm; + ByteBuffer signature; - CRLDataImpl* clone() const - { - return new CRLDataImpl(*this); - } + X509v3CRLExts extensions; - blocxx::Int32 version; - String fingerprint; - time_t lastUpdate; - time_t nextUpdate; - - DNObject issuer; - - SigAlg signatureAlgorithm; - ByteBuffer signature; - - X509v3CRLExts extensions; - - blocxx::Map<String, RevocationEntry> revocationData; + blocxx::Map<String, RevocationEntry> revocationData; - X509_CRL *x509; - }; + X509_CRL *x509; +}; } } Modified: limal-head/limal-ca-mgm/src/CRLData_Priv.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/CRLData_P… ============================================================================== --- limal-head/limal-ca-mgm/src/CRLData_Priv.cpp (original) +++ limal-head/limal-ca-mgm/src/CRLData_Priv.cpp Wed Oct 17 14:18:38 2007 @@ -53,7 +53,7 @@ RevocationEntry_Priv::RevocationEntry_Priv() : RevocationEntry() {} - + RevocationEntry_Priv::RevocationEntry_Priv(X509_REVOKED *rev) : RevocationEntry() { @@ -67,15 +67,15 @@ setSerial(String(reinterpret_cast<const char*>(ustringval), n)); BIO_free(bioS); - + LOGIT_DEBUG("=>=> New Entry with Serial: " << getSerial()); - + // get revocationDate char *cbuf = new char[rev->revocationDate->length + 1]; memcpy(cbuf, rev->revocationDate->data, rev->revocationDate->length); cbuf[rev->revocationDate->length] = '\0'; - + String sbuf = String(cbuf); delete [] cbuf; @@ -85,12 +85,12 @@ StringArray sa = r.capture(sbuf); if(sa.size() != 7) - { + { LOGIT_ERROR("Can not parse date: " << sbuf); BLOCXX_THROW(limal::RuntimeException, Format(__("Cannot parse date %1."), sbuf).c_str()); } - + int year = 1970; if(sa[1].toInt() >= 70 && sa[1].toInt() <= 99) { @@ -100,11 +100,11 @@ { year = sa[1].toInt() + 2000; } - + DateTime dt = DateTime(year, sa[2].toInt(), sa[3].toInt(), sa[4].toInt(), sa[5].toInt(), sa[6].toInt(), 0, DateTime::E_UTC_TIME); - + setRevocationDate(dt.get()); // get CRL Reason @@ -112,7 +112,7 @@ setReason( CRLReason_Priv(rev->extensions) ); } -RevocationEntry_Priv::RevocationEntry_Priv(const String& serial, +RevocationEntry_Priv::RevocationEntry_Priv(const String& serial, time_t revokeDate, const CRLReason& reason) : RevocationEntry() @@ -145,9 +145,9 @@ RevocationEntry_Priv::operator=(const RevocationEntry_Priv& entry) { if(this == &entry) return *this; - + RevocationEntry::operator=(entry); - + return *this; } @@ -304,10 +304,10 @@ unsigned char *ustringval = NULL; unsigned char md[EVP_MAX_MD_SIZE]; unsigned int n = 0; - + BIO *bioFP = BIO_new(BIO_s_mem()); const EVP_MD *digest = EVP_sha1(); - + if(X509_CRL_digest(x509, digest, md, &n)) { BIO_printf(bioFP, "%s:", OBJ_nid2sn(EVP_MD_type(digest))); @@ -340,7 +340,7 @@ BLOCXX_THROW(limal::RuntimeException, Format(__("Cannot parse date %1."), sbuf).c_str()); } - + int year = 1970; if(sa[1].toInt() >= 70 && sa[1].toInt() <= 99) { @@ -350,7 +350,7 @@ { year = sa[1].toInt() + 2000; } - + DateTime dt(year, sa[2].toInt(), sa[3].toInt(), sa[4].toInt(), sa[5].toInt(), sa[6].toInt(), 0, DateTime::E_UTC_TIME); @@ -374,7 +374,7 @@ BLOCXX_THROW(limal::RuntimeException, Format(__("Cannot parse date %1."), sbuf).c_str()); } - + year = 1970; if(sa[1].toInt() >= 70 && sa[1].toInt() <= 99) { @@ -384,14 +384,14 @@ { year = sa[1].toInt() + 2000; } - + dt = DateTime(year, sa[2].toInt(), sa[3].toInt(), sa[4].toInt(), sa[5].toInt(), sa[6].toInt(), 0, DateTime::E_UTC_TIME); time_t nextUpdate = dt.get(); setValidityPeriod(lastUpdate, nextUpdate); - + // get issuer setIssuerDN( DNObject_Priv(x509->crl->issuer) ); @@ -404,21 +404,21 @@ sbuf = String(cbuf, n); BIO_free(bio); - + if(sbuf.equalsIgnoreCase("sha1WithRSAEncryption") ) - { + { setSignatureAlgorithm(E_SHA1RSA); } else if(sbuf.equalsIgnoreCase("md5WithRSAEncryption") ) - { + { setSignatureAlgorithm(E_MD5RSA); } else if(sbuf.equalsIgnoreCase("dsaWithSHA1") ) - { + { setSignatureAlgorithm(E_SHA1DSA); } else - { + { LOGIT_ERROR("Unsupported signature algorithm: '" << sbuf << "'"); BLOCXX_THROW(limal::RuntimeException, Format(__("Unsupported signature algorithm %1."), sbuf).c_str()); @@ -430,11 +430,11 @@ // get extensions setExtensions( X509v3CRLExts_Priv(x509->crl->extensions)); - + // get revocationData blocxx::Map<String, RevocationEntry> revData; - + for (int i=0; i<sk_X509_REVOKED_num(x509->crl->revoked); i++) { RevocationEntry_Priv revEntry(sk_X509_REVOKED_value(x509->crl->revoked,i)); @@ -450,14 +450,14 @@ { BIO *bio; unsigned char *d = (unsigned char*)crl.data(); - + if( formatType == E_PEM ) { // load the crl into a memory bio bio = BIO_new_mem_buf(d, crl.size()); if(!bio) - { + { LOGIT_ERROR("Can not create a memory BIO"); BLOCXX_THROW(limal::MemoryException, __("Cannot create a memory BIO.")); @@ -471,14 +471,14 @@ { // => DER -#if OPENSSL_VERSION_NUMBER >= 0x0090801fL +#if OPENSSL_VERSION_NUMBER >= 0x0090801fL const unsigned char *d2 = NULL; d2 = (const unsigned char*)d; #else unsigned char *d2 = NULL; d2 = d; #endif - + m_impl->x509 = d2i_X509_CRL(NULL, &d2, crl.size()); d2 = NULL; @@ -499,14 +499,12 @@ { X509_CRL_free(m_impl->x509); m_impl->x509 = NULL; - + BLOCXX_THROW_SUBEX(limal::SyntaxException, __("Error parsing the CRL."), e); } } - - } } Modified: limal-head/limal-ca-mgm/src/CRLData_Priv.hpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/CRLData_P… ============================================================================== --- limal-head/limal-ca-mgm/src/CRLData_Priv.hpp (original) +++ limal-head/limal-ca-mgm/src/CRLData_Priv.hpp Wed Oct 17 14:18:38 2007 @@ -33,67 +33,67 @@ namespace CA_MGM_NAMESPACE { - class RevocationEntry_Priv : public RevocationEntry { - public: - RevocationEntry_Priv(); - RevocationEntry_Priv(X509_REVOKED *rev); - RevocationEntry_Priv(const String& serial, - time_t revokeDate, - const CRLReason& reason); - RevocationEntry_Priv(const RevocationEntry_Priv& entry); - virtual ~RevocationEntry_Priv(); - - RevocationEntry_Priv& operator=(const RevocationEntry_Priv& entry); - - void setSerial(const String& serial); - - void setRevocationDate(time_t date); - void setReason(const CRLReason& reason); - - }; - - class CRLData_Priv : public CRLData { - public: - CRLData_Priv(); - CRLData_Priv(const ByteBuffer &crl, - FormatType formatType = E_PEM); - CRLData_Priv(const String &crlPath, - FormatType formatType = E_PEM); - CRLData_Priv(const CRLData_Priv& data); - virtual ~CRLData_Priv(); - - void - setVersion(blocxx::Int32 version); - - void - setFingerprint(const String& fp); - - void - setValidityPeriod(time_t last, - time_t next); - - void - setIssuerDN(const DNObject& issuer); - - void - setSignatureAlgorithm(SigAlg sigAlg); - - void - setSignature(const ByteBuffer& sig); - - void - setExtensions(const X509v3CRLExts& ext); - - void - setRevocationData(const blocxx::Map<String, RevocationEntry>& data); +class RevocationEntry_Priv : public RevocationEntry { +public: + RevocationEntry_Priv(); + RevocationEntry_Priv(X509_REVOKED *rev); + RevocationEntry_Priv(const String& serial, + time_t revokeDate, + const CRLReason& reason); + RevocationEntry_Priv(const RevocationEntry_Priv& entry); + virtual ~RevocationEntry_Priv(); - private: - CRLData_Priv& operator=(const CRLData_Priv& data); + RevocationEntry_Priv& operator=(const RevocationEntry_Priv& entry); - void parseCRL(X509_CRL *x509); - void init(const ByteBuffer &crl, FormatType formatType); + void setSerial(const String& serial); - }; + void setRevocationDate(time_t date); + void setReason(const CRLReason& reason); + +}; + +class CRLData_Priv : public CRLData { +public: + CRLData_Priv(); + CRLData_Priv(const ByteBuffer &crl, + FormatType formatType = E_PEM); + CRLData_Priv(const String &crlPath, + FormatType formatType = E_PEM); + CRLData_Priv(const CRLData_Priv& data); + virtual ~CRLData_Priv(); + + void + setVersion(blocxx::Int32 version); + + void + setFingerprint(const String& fp); + + void + setValidityPeriod(time_t last, + time_t next); + + void + setIssuerDN(const DNObject& issuer); + + void + setSignatureAlgorithm(SigAlg sigAlg); + + void + setSignature(const ByteBuffer& sig); + + void + setExtensions(const X509v3CRLExts& ext); + + void + setRevocationData(const blocxx::Map<String, RevocationEntry>& data); + +private: + CRLData_Priv& operator=(const CRLData_Priv& data); + + void parseCRL(X509_CRL *x509); + void init(const ByteBuffer &crl, FormatType formatType); + +}; } } Modified: limal-head/limal-ca-mgm/src/CRLDistributionPointsExtension.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/CRLDistri… ============================================================================== --- limal-head/limal-ca-mgm/src/CRLDistributionPointsExtension.cpp (original) +++ limal-head/limal-ca-mgm/src/CRLDistributionPointsExtension.cpp Wed Oct 17 14:18:38 2007 @@ -37,7 +37,7 @@ class CRLDistributionPointsExtImpl : public blocxx::COWIntrusiveCountableBase { - public: +public: CRLDistributionPointsExtImpl() : altNameList(List<LiteralValue>()) {} @@ -57,7 +57,7 @@ blocxx::List<LiteralValue> altNameList; }; - + CRLDistributionPointsExt::CRLDistributionPointsExt() : ExtensionBase() , m_impl(new CRLDistributionPointsExtImpl()) @@ -89,7 +89,7 @@ if((*it).indexOf(":") != String::npos) { try - { + { LiteralValue lv = LiteralValue(*it); m_impl->altNameList.push_back(lv); } @@ -115,7 +115,7 @@ CRLDistributionPointsExt::operator=(const CRLDistributionPointsExt& extension) { if(this == &extension) return *this; - + ExtensionBase::operator=(extension); m_impl = extension.m_impl; @@ -182,7 +182,7 @@ extString += val+","; } } - + ca.getConfig()->setValue(type2Section(type, true), "crlDistributionPoints", extString.erase(extString.length()-1)); } @@ -216,15 +216,15 @@ CRLDistributionPointsExt::verify() const { blocxx::StringArray result; - + if(!isPresent()) return result; - + if(m_impl->altNameList.empty()) { result.append(String("No value for CRLDistributionPointsExt.")); } result.appendArray(checkLiteralValueList(m_impl->altNameList)); - + LOGIT_DEBUG_STRINGARRAY("CRLDistributionPointsExt::verify()", result); return result; } @@ -243,7 +243,7 @@ { result.appendArray((*it).dump()); } - + return result; } Modified: limal-head/limal-ca-mgm/src/CRLGenerationData.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/CRLGenera… ============================================================================== --- limal-head/limal-ca-mgm/src/CRLGenerationData.cpp (original) +++ limal-head/limal-ca-mgm/src/CRLGenerationData.cpp Wed Oct 17 14:18:38 2007 @@ -38,14 +38,14 @@ class CRLGenerationDataImpl : public blocxx::COWIntrusiveCountableBase { - public: +public: CRLGenerationDataImpl() : crlHours(0) , extensions(X509v3CRLGenerationExts()) {} - CRLGenerationDataImpl(blocxx::UInt32 hours, + CRLGenerationDataImpl(blocxx::UInt32 hours, const X509v3CRLGenerationExts& ext) : crlHours(hours) , extensions(ext) @@ -63,13 +63,13 @@ { return new CRLGenerationDataImpl(*this); } - + blocxx::UInt32 crlHours; X509v3CRLGenerationExts extensions; }; - + CRLGenerationData::CRLGenerationData() : m_impl(new CRLGenerationDataImpl()) {} @@ -81,7 +81,7 @@ m_impl->crlHours = caConfig->getValue(type2Section(type, false), "default_crl_hours").toUInt32(); } -CRLGenerationData::CRLGenerationData(blocxx::UInt32 hours, +CRLGenerationData::CRLGenerationData(blocxx::UInt32 hours, const X509v3CRLGenerationExts& ext) : m_impl(new CRLGenerationDataImpl(hours, ext)) { @@ -99,14 +99,14 @@ CRLGenerationData::~CRLGenerationData() {} - + CRLGenerationData& CRLGenerationData::operator=(const CRLGenerationData& data) { if(this == &data) return *this; - + m_impl = data.m_impl; - + return *this; } @@ -157,7 +157,7 @@ } // These types are not supported by this object if(type != E_CRL) - { + { LOGIT_ERROR("wrong type" << type); BLOCXX_THROW(limal::ValueException, Format(__("Wrong type: %1."), type).c_str()); Modified: limal-head/limal-ca-mgm/src/CRLReason.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/CRLReason… ============================================================================== --- limal-head/limal-ca-mgm/src/CRLReason.cpp (original) +++ limal-head/limal-ca-mgm/src/CRLReason.cpp Wed Oct 17 14:18:38 2007 @@ -39,7 +39,7 @@ class CRLReasonImpl : public blocxx::COWIntrusiveCountableBase { - public: +public: CRLReasonImpl() : reason("none") , compromiseDate(0) @@ -67,24 +67,24 @@ } String reason; - + // used if reason is keyCompromise or CACompromise. // 0 == no compromise Date set time_t compromiseDate; // used if reason is certificateHold - // possible values: + // possible values: // holdInstructionNone, - // holdInstructionCallIssuer, + // holdInstructionCallIssuer, // holdInstructionReject // or an OID String holdInstruction; }; - + // ---------------------------------------------------------------------------- - + CRLReason::CRLReason() : m_impl(new CRLReasonImpl()) {} @@ -118,9 +118,9 @@ CRLReason::operator=(const CRLReason& reason) { if(this == &reason) return *this; - + m_impl = reason.m_impl; - + return *this; } @@ -256,13 +256,13 @@ __("Reason is not CACompromise.")); } String time; - + if(m_impl->compromiseDate != 0) { DateTime dt(m_impl->compromiseDate); time = dt.toString("%Y%m%d%H%M%S") + "Z"; } - + return time; } @@ -307,7 +307,7 @@ } // compromiseDate == 0 is now a valid date - + LOGIT_DEBUG_STRINGARRAY("CRLReason::verify()", result); return result; } @@ -321,7 +321,7 @@ result.append("CRLReason::dump()"); result.append(Format("Revoke Reason = %1", m_impl->reason)); - + if(m_impl->reason.equalsIgnoreCase("certificateHold")) { result.append("hold Instruction =" + m_impl->holdInstruction); @@ -331,7 +331,7 @@ { result.append("compromise Date = " + String(m_impl->compromiseDate)); } - + return result; } @@ -346,9 +346,9 @@ !hi.equalsIgnoreCase("holdInstructionCallIssuer") && !hi.equalsIgnoreCase("holdInstructionReject") && !initOIDCheck().isValid(hi)) { - - return (Format("Invalid holdInstruction: %1", hi).toString()); - } + + return (Format("Invalid holdInstruction: %1", hi).toString()); + } return String(); } @@ -373,6 +373,6 @@ } // ---------------------------------------------------------------------------- - + } } Modified: limal-head/limal-ca-mgm/src/CRLReason_Priv.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/CRLReason… ============================================================================== --- limal-head/limal-ca-mgm/src/CRLReason_Priv.cpp (original) +++ limal-head/limal-ca-mgm/src/CRLReason_Priv.cpp Wed Oct 17 14:18:38 2007 @@ -44,121 +44,121 @@ CRLReason_Priv::CRLReason_Priv() - : CRLReason() + : CRLReason() {} CRLReason_Priv::CRLReason_Priv(STACK_OF(X509_EXTENSION) *stack) - : CRLReason() + : CRLReason() { - for(int x = 0; x < sk_X509_EXTENSION_num(stack); x++) - { - X509_EXTENSION *xe = sk_X509_EXTENSION_value(stack, x); - - int nid = 0; - String valueString; - char *value; - char obj_tmp[80]; - BIO *out; - - i2t_ASN1_OBJECT(obj_tmp, 80, xe->object); - nid = OBJ_txt2nid(obj_tmp); - - LOGIT_DEBUG("NID: " << obj_tmp << " " << nid); - - out = BIO_new(BIO_s_mem()); - X509V3_EXT_print(out, xe, 0, 1); - - int n = BIO_get_mem_data(out, &value); - valueString = String(value, n); - valueString.ltrim(); - valueString.rtrim(); - BIO_free(out); - - LOGIT_DEBUG("Value: " << valueString); - - if(nid == NID_crl_reason) - { - if(valueString == "Unspecified") - { - setReason("unspecified"); - } - else if(valueString == "Key Compromise") - { - setReason("keyCompromise"); - } - else if(valueString == "CA Compromise") - { - setReason("CACompromise"); - } - else if(valueString == "Affiliation Changed") - { - setReason("affiliationChanged"); - } - else if(valueString == "Superseded") - { - setReason("superseded"); - } - else if(valueString == "Cessation Of Operation") - { - setReason("cessationOfOperation"); - } - else if(valueString == "Certificate Hold") - { - setReason("certificateHold"); - } - else if(valueString == "Remove From CRL") - { - setReason("removeFromCRL"); - } - else - { - LOGIT_INFO("Unknown CRL reason:" << valueString); - } - } - else if(nid == NID_hold_instruction_code) - { - if(valueString == "Hold Instruction Call Issuer") - { - setHoldInstruction("holdInstructionCallIssuer"); - } - else if(valueString == "Hold Instruction None") - { - setHoldInstruction("holdInstructionNone"); - } - else if(valueString == "Hold Instruction Reject") - { - setHoldInstruction("holdInstructionReject"); - } - else - { - // set an OID as hold instruction - setHoldInstruction(valueString); - } - } - else if(nid == NID_invalidity_date) - { + for(int x = 0; x < sk_X509_EXTENSION_num(stack); x++) + { + X509_EXTENSION *xe = sk_X509_EXTENSION_value(stack, x); + + int nid = 0; + String valueString; + char *value; + char obj_tmp[80]; + BIO *out; + + i2t_ASN1_OBJECT(obj_tmp, 80, xe->object); + nid = OBJ_txt2nid(obj_tmp); + + LOGIT_DEBUG("NID: " << obj_tmp << " " << nid); + + out = BIO_new(BIO_s_mem()); + X509V3_EXT_print(out, xe, 0, 1); + + int n = BIO_get_mem_data(out, &value); + valueString = String(value, n); + valueString.ltrim(); + valueString.rtrim(); + BIO_free(out); + + LOGIT_DEBUG("Value: " << valueString); + + if(nid == NID_crl_reason) + { + if(valueString == "Unspecified") + { + setReason("unspecified"); + } + else if(valueString == "Key Compromise") + { + setReason("keyCompromise"); + } + else if(valueString == "CA Compromise") + { + setReason("CACompromise"); + } + else if(valueString == "Affiliation Changed") + { + setReason("affiliationChanged"); + } + else if(valueString == "Superseded") + { + setReason("superseded"); + } + else if(valueString == "Cessation Of Operation") + { + setReason("cessationOfOperation"); + } + else if(valueString == "Certificate Hold") + { + setReason("certificateHold"); + } + else if(valueString == "Remove From CRL") + { + setReason("removeFromCRL"); + } + else + { + LOGIT_INFO("Unknown CRL reason:" << valueString); + } + } + else if(nid == NID_hold_instruction_code) + { + if(valueString == "Hold Instruction Call Issuer") + { + setHoldInstruction("holdInstructionCallIssuer"); + } + else if(valueString == "Hold Instruction None") + { + setHoldInstruction("holdInstructionNone"); + } + else if(valueString == "Hold Instruction Reject") + { + setHoldInstruction("holdInstructionReject"); + } + else + { + // set an OID as hold instruction + setHoldInstruction(valueString); + } + } + else if(nid == NID_invalidity_date) + { // e.g. Aug 18 15:56:46 2005 GMT - DateTime dtime(valueString); - - if(getReason().equalsIgnoreCase("keyCompromise")) - { - setKeyCompromiseDate(dtime.get()); - } - else if(getReason().equalsIgnoreCase("CACompromise")) - { - setCACompromiseDate(dtime.get()); - } - else - { - LOGIT_INFO("Date with wrong reason"); - } - - } - else - { - LOGIT_INFO("Unsupported NID: " << nid); - } - } + DateTime dtime(valueString); + + if(getReason().equalsIgnoreCase("keyCompromise")) + { + setKeyCompromiseDate(dtime.get()); + } + else if(getReason().equalsIgnoreCase("CACompromise")) + { + setCACompromiseDate(dtime.get()); + } + else + { + LOGIT_INFO("Date with wrong reason"); + } + + } + else + { + LOGIT_INFO("Unsupported NID: " << nid); + } + } } CRLReason_Priv::~CRLReason_Priv() Modified: limal-head/limal-ca-mgm/src/CRLReason_Priv.hpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/CRLReason… ============================================================================== --- limal-head/limal-ca-mgm/src/CRLReason_Priv.hpp (original) +++ limal-head/limal-ca-mgm/src/CRLReason_Priv.hpp Wed Oct 17 14:18:38 2007 @@ -32,14 +32,14 @@ namespace CA_MGM_NAMESPACE { - class CRLReason_Priv : public CRLReason { +class CRLReason_Priv : public CRLReason { - public: - CRLReason_Priv(); - CRLReason_Priv(STACK_OF(X509_EXTENSION) *stack); - virtual ~CRLReason_Priv(); +public: + CRLReason_Priv(); + CRLReason_Priv(STACK_OF(X509_EXTENSION) *stack); + virtual ~CRLReason_Priv(); - }; +}; } } Modified: limal-head/limal-ca-mgm/src/CertificateData.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/Certifica… ============================================================================== --- limal-head/limal-ca-mgm/src/CertificateData.cpp (original) +++ limal-head/limal-ca-mgm/src/CertificateData.cpp Wed Oct 17 14:18:38 2007 @@ -38,7 +38,7 @@ using namespace limal; using namespace blocxx; - + CertificateData::CertificateData(const CertificateData& data) : m_impl(data.m_impl) {} @@ -46,17 +46,17 @@ CertificateData::~CertificateData() {} -CertificateData& -CertificateData::operator=(const CertificateData& data) +CertificateData& + CertificateData::operator=(const CertificateData& data) { if(this == &data) return *this; - + m_impl = data.m_impl; - + return *this; } -blocxx::UInt32 +blocxx::UInt32 CertificateData::getVersion() const { return m_impl->version; @@ -109,15 +109,15 @@ { switch(m_impl->pubkeyAlgorithm) { - case E_RSA: - return "RSA"; - break; - case E_DSA: - return "DSA"; - break; - case E_DH: - return "DH"; - break; + case E_RSA: + return "RSA"; + break; + case E_DSA: + return "DSA"; + break; + case E_DH: + return "DH"; + break; } return String(); } @@ -139,33 +139,33 @@ { switch(m_impl->signatureAlgorithm) { - case E_SHA1RSA: - return "SHA1RSA"; - break; - case E_MD5RSA: - return "MD5RSA"; - break; - case E_SHA1DSA: - return "SHA1DSA"; - break; + case E_SHA1RSA: + return "SHA1RSA"; + break; + case E_MD5RSA: + return "MD5RSA"; + break; + case E_SHA1DSA: + return "SHA1DSA"; + break; } return String(); } ByteBuffer -CertificateData::getSignature() const + CertificateData::getSignature() const { return m_impl->signature; } blocxx::String -CertificateData::getFingerprint() const + CertificateData::getFingerprint() const { return m_impl->fingerprint; } X509v3CertificateExts -CertificateData::getExtensions() const + CertificateData::getExtensions() const { return m_impl->extensions; } @@ -176,13 +176,13 @@ unsigned char *ustringval = NULL; unsigned int n = 0; BIO *bio = BIO_new(BIO_s_mem()); - + X509_print_ex(bio, m_impl->x509, 0, 0); n = BIO_get_mem_data(bio, &ustringval); - + String text = String((const char*)ustringval, n); BIO_free(bio); - + return text; } @@ -195,7 +195,7 @@ X509V3_extensions_print(bio, NULL, m_impl->x509->cert_info->extensions, 0, 4); n = BIO_get_mem_data(bio, &ustringval); - + String extText = String((const char*)ustringval, n); BIO_free(bio); @@ -222,13 +222,13 @@ LOGIT_DEBUG("invalid notBefore:" << m_impl->notBefore); return false; } - + if(m_impl->notAfter <= m_impl->notBefore) { LOGIT_DEBUG("invalid notAfter:" << m_impl->notAfter); return false; } - + if(!m_impl->issuer.valid()) return false; if(!m_impl->subject.valid()) return false; @@ -241,7 +241,7 @@ } if(!m_impl->extensions.valid()) return false; - + return true; } @@ -279,12 +279,12 @@ } result.appendArray(m_impl->extensions.verify()); - + LOGIT_DEBUG_STRINGARRAY("CertificateData::verify()", result); return result; } - + blocxx::StringArray CertificateData::dump() const { @@ -330,6 +330,5 @@ : m_impl(new CertificateDataImpl()) {} - } } Modified: limal-head/limal-ca-mgm/src/CertificateDataImpl.hpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/Certifica… ============================================================================== --- limal-head/limal-ca-mgm/src/CertificateDataImpl.hpp (original) +++ limal-head/limal-ca-mgm/src/CertificateDataImpl.hpp Wed Oct 17 14:18:38 2007 @@ -32,80 +32,80 @@ namespace CA_MGM_NAMESPACE { - class CertificateDataImpl : public blocxx::COWIntrusiveCountableBase +class CertificateDataImpl : public blocxx::COWIntrusiveCountableBase +{ +public: + CertificateDataImpl() + : version(0) + , serial("") + , fingerprint("") + , notBefore(0) + , notAfter(0) + , issuer(DNObject()) + , subject(DNObject()) + , keysize(2048) + , pubkeyAlgorithm(E_RSA) + , publicKey(ByteBuffer()) + , signatureAlgorithm(E_SHA1RSA) + , signature(ByteBuffer()) + , extensions(X509v3CertificateExts_Priv()) + , x509(NULL) + {} + + CertificateDataImpl(const CertificateDataImpl& impl) + : COWIntrusiveCountableBase(impl) + , version(impl.version) + , serial(impl.serial) + , fingerprint(impl.fingerprint) + , notBefore(impl.notBefore) + , notAfter(impl.notAfter) + , issuer(impl.issuer) + , subject(impl.subject) + , keysize(impl.keysize) + , pubkeyAlgorithm(impl.pubkeyAlgorithm) + , publicKey(impl.publicKey) + , signatureAlgorithm(impl.signatureAlgorithm) + , signature(impl.signature) + , extensions(impl.extensions) + , x509(X509_dup(impl.x509)) + {} + + ~CertificateDataImpl() { - public: - CertificateDataImpl() - : version(0) - , serial("") - , fingerprint("") - , notBefore(0) - , notAfter(0) - , issuer(DNObject()) - , subject(DNObject()) - , keysize(2048) - , pubkeyAlgorithm(E_RSA) - , publicKey(ByteBuffer()) - , signatureAlgorithm(E_SHA1RSA) - , signature(ByteBuffer()) - , extensions(X509v3CertificateExts_Priv()) - , x509(NULL) - {} - - CertificateDataImpl(const CertificateDataImpl& impl) - : COWIntrusiveCountableBase(impl) - , version(impl.version) - , serial(impl.serial) - , fingerprint(impl.fingerprint) - , notBefore(impl.notBefore) - , notAfter(impl.notAfter) - , issuer(impl.issuer) - , subject(impl.subject) - , keysize(impl.keysize) - , pubkeyAlgorithm(impl.pubkeyAlgorithm) - , publicKey(impl.publicKey) - , signatureAlgorithm(impl.signatureAlgorithm) - , signature(impl.signature) - , extensions(impl.extensions) - , x509(X509_dup(impl.x509)) - {} - - ~CertificateDataImpl() - { - if(x509 != NULL) - { - X509_free(x509); - x509 = NULL; - } - } - - CertificateDataImpl* clone() const + if(x509 != NULL) { - return new CertificateDataImpl(*this); + X509_free(x509); + x509 = NULL; } - - blocxx::UInt32 version; // allowed 1, 2, 3 - String serial; - String fingerprint; - time_t notBefore; - time_t notAfter; - - DNObject issuer; - DNObject subject; - blocxx::UInt32 keysize; - - KeyAlg pubkeyAlgorithm; - - ByteBuffer publicKey; - - SigAlg signatureAlgorithm; - ByteBuffer signature; - - X509v3CertificateExts extensions; - - X509 *x509; - - }; + } + + CertificateDataImpl* clone() const + { + return new CertificateDataImpl(*this); + } + + blocxx::UInt32 version; // allowed 1, 2, 3 + String serial; + String fingerprint; + time_t notBefore; + time_t notAfter; + + DNObject issuer; + DNObject subject; + blocxx::UInt32 keysize; + + KeyAlg pubkeyAlgorithm; + + ByteBuffer publicKey; + + SigAlg signatureAlgorithm; + ByteBuffer signature; + + X509v3CertificateExts extensions; + + X509 *x509; + +}; } } Modified: limal-head/limal-ca-mgm/src/CertificateData_Priv.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/Certifica… ============================================================================== --- limal-head/limal-ca-mgm/src/CertificateData_Priv.cpp (original) +++ limal-head/limal-ca-mgm/src/CertificateData_Priv.cpp Wed Oct 17 14:18:38 2007 @@ -158,7 +158,7 @@ } void -CertificateData_Priv::setExtensions(const X509v3CertificateExts& ext) + CertificateData_Priv::setExtensions(const X509v3CertificateExts& ext) { StringArray r = ext.verify(); if(!r.empty()) @@ -182,9 +182,9 @@ CertificateData_Priv::operator=(const CertificateData_Priv& data) { if(this == &data) return *this; - + CertificateData::operator=(data); - + return *this; } @@ -196,11 +196,11 @@ if( formatType == E_PEM ) { - // load the certificate into a memory bio + // load the certificate into a memory bio bio = BIO_new_mem_buf(d, certificate.size()); if(!bio) - { + { LOGIT_ERROR("Can not create a memory BIO"); BLOCXX_THROW(limal::MemoryException, __("Cannot create a memory BIO.")); @@ -214,14 +214,14 @@ else { // => DER -#if OPENSSL_VERSION_NUMBER >= 0x0090801fL +#if OPENSSL_VERSION_NUMBER >= 0x0090801fL const unsigned char *d2 = NULL; d2 = (const unsigned char*)d; #else unsigned char *d2 = NULL; d2 = d; #endif - + m_impl->x509 = d2i_X509(NULL, &d2, certificate.size()); d2 = NULL; @@ -251,14 +251,14 @@ } void -CertificateData_Priv::parseCertificate(X509 *x509) +CertificateData_Priv::parseCertificate(X509 *x509) { unsigned char *ustringval = NULL; unsigned int n = 0; - + // get version setVersion(X509_get_version(x509) + 1); - + // get serial // // convert to hexadecimal version of the serial number @@ -282,7 +282,7 @@ PerlRegEx r("^(\\d\\d)(\\d\\d)(\\d\\d)(\\d\\d)(\\d\\d)(\\d\\d)Z$"); StringArray sa = r.capture(sbuf); - + if(sa.size() != 7) { LOGIT_ERROR("Can not parse date: " << sbuf); @@ -303,7 +303,7 @@ DateTime dt(year, sa[2].toInt(), sa[3].toInt(), sa[4].toInt(), sa[5].toInt(), sa[6].toInt(), 0, DateTime::E_UTC_TIME); - + time_t notBefore = dt.get(); // get notAfter @@ -317,11 +317,11 @@ delete [] cbuf; sa = r.capture(sbuf); - + if(sa.size() != 7) { LOGIT_ERROR("Can not parse date: " << sbuf); - BLOCXX_THROW(limal::RuntimeException, + BLOCXX_THROW(limal::RuntimeException, Format(__("Cannot parse date %1."), sbuf).c_str()); } year = 1970; @@ -333,22 +333,22 @@ { year = sa[1].toInt() + 2000; } - + dt = DateTime(year, sa[2].toInt(), sa[3].toInt(), sa[4].toInt(), sa[5].toInt(), sa[6].toInt(), 0, DateTime::E_UTC_TIME); - + setCertifyPeriode(notBefore, dt.get()); - + // fingerprint - + ustringval = NULL; unsigned char md[EVP_MAX_MD_SIZE]; n = 0; - + BIO *bioFP = BIO_new(BIO_s_mem()); const EVP_MD *digest = EVP_sha1(); - + if(X509_digest(x509, digest, md, &n)) { BIO_printf(bioFP, "%s:", OBJ_nid2sn(EVP_MD_type(digest))); @@ -361,51 +361,51 @@ n = BIO_get_mem_data(bioFP, &ustringval); setFingerprint( String(reinterpret_cast<const char*>(ustringval), n)); BIO_free(bioFP); - + // get issuer - + setIssuerDN( DNObject_Priv(X509_get_issuer_name(x509))); - + // get subject - + setSubjectDN( DNObject_Priv(X509_get_subject_name(x509))); - + // get public key EVP_PKEY *pkey = X509_get_pubkey(x509); - + if(pkey == NULL) - { + { LOGIT_ERROR("Unable to get public key"); BLOCXX_THROW(limal::RuntimeException, __("Unable to get the public key.")); } - + if(pkey->type == EVP_PKEY_RSA) { rsa_st *rsa = EVP_PKEY_get1_RSA(pkey); - + if(!rsa) { LOGIT_ERROR("could not get RSA key"); BLOCXX_THROW(limal::RuntimeException, __("Could not get RSA key.")); } - + unsigned char *y = NULL; - + int len = i2d_RSA_PUBKEY(rsa, &y); setPublicKey( ByteBuffer((char*)y, len)); - + free(y); // ?? RSA_free(rsa); } else { // unsupported type - + EVP_PKEY_free(pkey); - + LOGIT_ERROR("Unsupported public key type"); BLOCXX_THROW(limal::RuntimeException, __("Unsupported public key type.")); @@ -421,13 +421,13 @@ // get pubkeyAlgorithm - if(pkey->type == EVP_PKEY_RSA || + if(pkey->type == EVP_PKEY_RSA || pkey->type == EVP_PKEY_RSA2 ) { setPublicKeyAlgorithm( E_RSA ); } - else if(pkey->type == EVP_PKEY_DSA || - pkey->type == EVP_PKEY_DSA1 || + else if(pkey->type == EVP_PKEY_DSA || + pkey->type == EVP_PKEY_DSA1 || pkey->type == EVP_PKEY_DSA2 || pkey->type == EVP_PKEY_DSA3 || pkey->type == EVP_PKEY_DSA4 ) @@ -448,7 +448,7 @@ } // get signatureAlgorithm - + n = 0; BIO *bio = BIO_new(BIO_s_mem()); i2a_ASN1_OBJECT(bio, x509->cert_info->signature->algorithm); @@ -456,7 +456,7 @@ sbuf = String(cbuf, n); BIO_free(bio); - + if(sbuf.equalsIgnoreCase("sha1WithRSAEncryption") ) { setSignatureAlgorithm( E_SHA1RSA ); @@ -472,7 +472,7 @@ else { EVP_PKEY_free(pkey); - + LOGIT_ERROR("Unsupported signature algorithm: '" << sbuf << "'"); BLOCXX_THROW(limal::RuntimeException, // %1 is the unsupported signature algorithm string @@ -487,7 +487,7 @@ // get extensions setExtensions( X509v3CertificateExts_Priv(x509->cert_info->extensions)); - + EVP_PKEY_free(pkey); } Modified: limal-head/limal-ca-mgm/src/CertificateData_Priv.hpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/Certifica… ============================================================================== --- limal-head/limal-ca-mgm/src/CertificateData_Priv.hpp (original) +++ limal-head/limal-ca-mgm/src/CertificateData_Priv.hpp Wed Oct 17 14:18:38 2007 @@ -33,72 +33,72 @@ namespace CA_MGM_NAMESPACE { - class CertificateData_Priv : public CertificateData { - public: - CertificateData_Priv(); - - CertificateData_Priv(const ByteBuffer &certificate, - FormatType formatType = E_PEM); - - /** - * Construct a CertificateData object by parsing a certificate - * file. - * - * - */ - CertificateData_Priv(const String &certificatePath, - FormatType formatType = E_PEM); - - CertificateData_Priv(const CertificateData_Priv& data); - - virtual ~CertificateData_Priv(); - - void - setVersion(blocxx::UInt32 v); - - void - setSerial(const String& serial); - - void - setCertifyPeriode(time_t start, time_t end); - - void - setIssuerDN(const DNObject& issuer); - - void - setSubjectDN(const DNObject& subject); - - void - setKeysize(blocxx::UInt32 size); - - void - setPublicKeyAlgorithm(KeyAlg pubKeyAlg); - - void - setPublicKey(const ByteBuffer derPublicKey); - - void - setSignatureAlgorithm(SigAlg sigAlg); - - void - setSignature(const ByteBuffer& sig); - - void - setExtensions(const X509v3CertificateExts& ext); - - void - setFingerprint(const String& fp); - - private: - CertificateData_Priv& operator=(const CertificateData_Priv& data); - - void - init(const ByteBuffer &certificate, FormatType formatType); - - void - parseCertificate(X509 *x509); - }; - +class CertificateData_Priv : public CertificateData { +public: + CertificateData_Priv(); + + CertificateData_Priv(const ByteBuffer &certificate, + FormatType formatType = E_PEM); + + /** + * Construct a CertificateData object by parsing a certificate + * file. + * + * + */ + CertificateData_Priv(const String &certificatePath, + FormatType formatType = E_PEM); + + CertificateData_Priv(const CertificateData_Priv& data); + + virtual ~CertificateData_Priv(); + + void + setVersion(blocxx::UInt32 v); + + void + setSerial(const String& serial); + + void + setCertifyPeriode(time_t start, time_t end); + + void + setIssuerDN(const DNObject& issuer); + + void + setSubjectDN(const DNObject& subject); + + void + setKeysize(blocxx::UInt32 size); + + void + setPublicKeyAlgorithm(KeyAlg pubKeyAlg); + + void + setPublicKey(const ByteBuffer derPublicKey); + + void + setSignatureAlgorithm(SigAlg sigAlg); + + void + setSignature(const ByteBuffer& sig); + + void + setExtensions(const X509v3CertificateExts& ext); + + void + setFingerprint(const String& fp); + +private: + CertificateData_Priv& operator=(const CertificateData_Priv& data); + + void + init(const ByteBuffer &certificate, FormatType formatType); + + void + parseCertificate(X509 *x509); +}; + } } Modified: limal-head/limal-ca-mgm/src/CertificateIssueData.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/Certifica… ============================================================================== --- limal-head/limal-ca-mgm/src/CertificateIssueData.cpp (original) +++ limal-head/limal-ca-mgm/src/CertificateIssueData.cpp Wed Oct 17 14:18:38 2007 @@ -39,14 +39,14 @@ class CertificateIssueDataImpl : public blocxx::COWIntrusiveCountableBase { - public: +public: CertificateIssueDataImpl() : notBefore(0) , notAfter(0) , messageDigest(E_SHA1) , extensions(X509v3CertificateIssueExts()) {} - + CertificateIssueDataImpl(const CertificateIssueDataImpl& impl) : COWIntrusiveCountableBase(impl) , notBefore(impl.notBefore) @@ -64,16 +64,16 @@ time_t notBefore; time_t notAfter; - + // KeyAlg pubkeyAlgorithm; // at the beginning we only support rsa - + MD messageDigest; // parameter default_md - + X509v3CertificateIssueExts extensions; }; - + CertificateIssueData::CertificateIssueData() : m_impl(new CertificateIssueDataImpl()) {} @@ -105,9 +105,9 @@ { LOGIT_INFO("unsupported message digest: " << md); LOGIT_INFO("select default sha1."); - setMessageDigest( E_SHA1 ); + setMessageDigest( E_SHA1 ); } - + setExtensions( X509v3CertificateIssueExts(caConfig, type)); } @@ -122,9 +122,9 @@ CertificateIssueData::operator=(const CertificateIssueData& data) { if(this == &data) return *this; - + m_impl = data.m_impl; - + return *this; } @@ -142,7 +142,7 @@ } time_t -CertificateIssueData::getEndDate() const + CertificateIssueData::getEndDate() const { return m_impl->notAfter; } @@ -152,7 +152,7 @@ { DateTime dt(getStartDate()); String time = dt.toString("%y%m%d%H%M%S", DateTime::E_UTC_TIME) + "Z"; - + return time; } @@ -161,7 +161,7 @@ { DateTime dt(getEndDate()); String time = dt.toString("%y%m%d%H%M%S", DateTime::E_UTC_TIME) + "Z"; - + return time; } @@ -171,7 +171,7 @@ m_impl->messageDigest = md; } -MD +MD CertificateIssueData::getMessageDigest() const { return m_impl->messageDigest; @@ -190,7 +190,7 @@ } X509v3CertificateIssueExts -CertificateIssueData::getExtensions() const + CertificateIssueData::getExtensions() const { return m_impl->extensions; } @@ -219,21 +219,21 @@ Format(__("Wrong type: %1."), type).c_str()); } UInt32 t = (UInt32)((getEndDate() - getStartDate())/(60*60*24)); - + ca.getConfig()->setValue(type2Section(type, false), "default_days", String(t)); - + String md("sha1"); switch(getMessageDigest()) { - case E_SHA1: - md = "sha1"; - break; - case E_MD5: - md = "md5"; - break; - case E_MDC2: - md = "mdc2"; - break; + case E_SHA1: + md = "sha1"; + break; + case E_MD5: + md = "md5"; + break; + case E_MDC2: + md = "mdc2"; + break; } ca.getConfig()->setValue(type2Section(type, false), "default_md", md); @@ -256,7 +256,7 @@ } if(!m_impl->extensions.valid()) return false; - + return true; } @@ -277,7 +277,7 @@ } result.appendArray(m_impl->extensions.verify()); - + LOGIT_DEBUG_STRINGARRAY("CertificateIssueData::verify()", result); return result; Modified: limal-head/limal-ca-mgm/src/CertificatePoliciesExtension.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/Certifica… ============================================================================== --- limal-head/limal-ca-mgm/src/CertificatePoliciesExtension.cpp (original) +++ limal-head/limal-ca-mgm/src/CertificatePoliciesExtension.cpp Wed Oct 17 14:18:38 2007 @@ -38,7 +38,7 @@ class UserNoticeImpl : public blocxx::COWIntrusiveCountableBase { - public: +public: UserNoticeImpl() : explicitText("") , organization("") @@ -60,22 +60,22 @@ } String explicitText; // max 200 characters - + // The organization and noticeNumbers options // (if included) must BOTH be present. - - String organization; // max 200 characters + + String organization; // max 200 characters blocxx::List<blocxx::Int32> noticeNumbers; }; class CertificatePolicyImpl : public blocxx::COWIntrusiveCountableBase { - public: +public: CertificatePolicyImpl() : policyIdentifier(String()) - , cpsURI(StringList()) + , cpsURI(StringList()) , noticeList(blocxx::List<UserNotice>()) {} @@ -98,24 +98,24 @@ { return new CertificatePolicyImpl(*this); } - + String policyIdentifier; // required StringList cpsURI; // Certification Practice Statement - + blocxx::List<UserNotice> noticeList; }; class CertificatePoliciesExtImpl : public blocxx::COWIntrusiveCountableBase { - public: +public: CertificatePoliciesExtImpl() : ia5org(false), - policies(blocxx::List<CertificatePolicy>()) + policies(blocxx::List<CertificatePolicy>()) {} CertificatePoliciesExtImpl(const blocxx::List<CertificatePolicy>& policies) : ia5org(false), - policies(policies) + policies(policies) {} CertificatePoliciesExtImpl(const CertificatePoliciesExtImpl& impl) @@ -137,11 +137,11 @@ }; UserNotice::UserNotice() - : m_impl(new UserNoticeImpl()) + : m_impl(new UserNoticeImpl()) {} UserNotice::UserNotice(const UserNotice& notice) - : m_impl(notice.m_impl) + : m_impl(notice.m_impl) {} UserNotice::~UserNotice() @@ -150,83 +150,83 @@ UserNotice& UserNotice::operator=(const UserNotice& notice) { - if(this == &notice) return *this; - - m_impl = notice.m_impl; - - return *this; + if(this == &notice) return *this; + + m_impl = notice.m_impl; + + return *this; } void UserNotice::initWithSection(CAConfig* caConfig, Type type, const String& sectionName) { // These types are not supported by this object - if(type == E_CRL || type == E_Client_Req || - type == E_Server_Req || type == E_CA_Req ) - { - LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(limal::ValueException, - Format(__("Wrong type: %1."), type).c_str()); - } - - bool p = caConfig->exists(sectionName, "explicitText"); - if(p) - { - m_impl->explicitText = caConfig->getValue(sectionName, "explicitText"); - } - else - { - LOGIT_DEBUG("no explicite Text in " << sectionName); - } - - p = caConfig->exists(sectionName, "organization"); - if(p) - { - m_impl->organization = caConfig->getValue(sectionName, "organization"); - } - else - { - LOGIT_DEBUG("no Organization in " << sectionName); - } - - p = caConfig->exists(sectionName, "noticeNumbers"); - if(p) - { - StringArray a = PerlRegEx(","). - split(caConfig->getValue(sectionName, "noticeNumbers")); - StringArray::const_iterator it = a.begin(); - for(; it != a.end(); ++it) - { - m_impl->noticeNumbers.push_back((*it).toInt32()); - } - } - else - { - LOGIT_DEBUG("no Notice Numbers in " << sectionName); - } + if(type == E_CRL || type == E_Client_Req || + type == E_Server_Req || type == E_CA_Req ) + { + LOGIT_ERROR("wrong type" << type); + BLOCXX_THROW(limal::ValueException, + Format(__("Wrong type: %1."), type).c_str()); + } + + bool p = caConfig->exists(sectionName, "explicitText"); + if(p) + { + m_impl->explicitText = caConfig->getValue(sectionName, "explicitText"); + } + else + { + LOGIT_DEBUG("no explicite Text in " << sectionName); + } + + p = caConfig->exists(sectionName, "organization"); + if(p) + { + m_impl->organization = caConfig->getValue(sectionName, "organization"); + } + else + { + LOGIT_DEBUG("no Organization in " << sectionName); + } + + p = caConfig->exists(sectionName, "noticeNumbers"); + if(p) + { + StringArray a = PerlRegEx(","). + split(caConfig->getValue(sectionName, "noticeNumbers")); + StringArray::const_iterator it = a.begin(); + for(; it != a.end(); ++it) + { + m_impl->noticeNumbers.push_back((*it).toInt32()); + } + } + else + { + LOGIT_DEBUG("no Notice Numbers in " << sectionName); + } } void UserNotice::setExplicitText(const String& text) { - if(text.length() > 200) - { - LOGIT_ERROR("The text is too long."); - BLOCXX_THROW(limal::ValueException, - __("The text is too long.")); - } - - m_impl->explicitText = text; + if(text.length() > 200) + { + LOGIT_ERROR("The text is too long."); + BLOCXX_THROW(limal::ValueException, + __("The text is too long.")); + } + + m_impl->explicitText = text; } blocxx::String UserNotice::getExplicitText() const { - return m_impl->explicitText; + return m_impl->explicitText; } void -UserNotice::setOrganizationNotice(const String& org, +UserNotice::setOrganizationNotice(const String& org, const blocxx::List<blocxx::Int32>& numbers) { m_impl->organization = org; @@ -236,145 +236,145 @@ blocxx::String UserNotice::getOrganization() const { - return m_impl->organization; + return m_impl->organization; } blocxx::List<blocxx::Int32> UserNotice::getNoticeNumbers() const { - return m_impl->noticeNumbers; + return m_impl->noticeNumbers; } blocxx::String UserNotice::commit2Config(CA& ca, Type type, blocxx::UInt32 num) const { - if(!valid()) - { - LOGIT_ERROR("invalid UserNotice object"); - BLOCXX_THROW(limal::ValueException, - __("Invalid UserNotice object.")); - } + if(!valid()) + { + LOGIT_ERROR("invalid UserNotice object"); + BLOCXX_THROW(limal::ValueException, + __("Invalid UserNotice object.")); + } // These types are not supported by this object - if(type == E_CRL || type == E_Client_Req || - type == E_Server_Req || type == E_CA_Req ) - { - LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(limal::ValueException, - Format(__("Wrong type: %1."), type).c_str()); - } + if(type == E_CRL || type == E_Client_Req || + type == E_Server_Req || type == E_CA_Req ) + { + LOGIT_ERROR("wrong type" << type); + BLOCXX_THROW(limal::ValueException, + Format(__("Wrong type: %1."), type).c_str()); + } // we need a User Notice section - String sectionName = String("notice")+type2Section(type, true)+String(num); + String sectionName = String("notice")+type2Section(type, true)+String(num); - if(!m_impl->explicitText.empty()) - { - ca.getConfig()->setValue(sectionName, "explicitText", m_impl->explicitText); - } - - if(!m_impl->organization.empty()) - { - ca.getConfig()->setValue(sectionName, "organization", m_impl->organization); - - String numbers; - blocxx::List<blocxx::Int32>::const_iterator it = m_impl->noticeNumbers.begin(); - for(;it != m_impl->noticeNumbers.end(); ++it) - { - numbers += String(*it)+","; - } - ca.getConfig()->setValue(sectionName, "noticeNumbers", - numbers.erase(numbers.length()-1)); - } - return ("@"+sectionName); + if(!m_impl->explicitText.empty()) + { + ca.getConfig()->setValue(sectionName, "explicitText", m_impl->explicitText); + } + + if(!m_impl->organization.empty()) + { + ca.getConfig()->setValue(sectionName, "organization", m_impl->organization); + + String numbers; + blocxx::List<blocxx::Int32>::const_iterator it = m_impl->noticeNumbers.begin(); + for(;it != m_impl->noticeNumbers.end(); ++it) + { + numbers += String(*it)+","; + } + ca.getConfig()->setValue(sectionName, "noticeNumbers", + numbers.erase(numbers.length()-1)); + } + return ("@"+sectionName); } bool UserNotice::valid() const { - if(m_impl->explicitText.length() > 200) - { - LOGIT_DEBUG("explicitText to long"); - return false; - } - - if((m_impl->organization.empty() && !m_impl->noticeNumbers.empty()) || - (!m_impl->organization.empty() && m_impl->noticeNumbers.empty())) - { - LOGIT_DEBUG("organization and noticeNumbers must both present or absent"); - return false; - } - return true; + if(m_impl->explicitText.length() > 200) + { + LOGIT_DEBUG("explicitText to long"); + return false; + } + + if((m_impl->organization.empty() && !m_impl->noticeNumbers.empty()) || + (!m_impl->organization.empty() && m_impl->noticeNumbers.empty())) + { + LOGIT_DEBUG("organization and noticeNumbers must both present or absent"); + return false; + } + return true; } blocxx::StringArray UserNotice::verify() const { - StringArray result; + StringArray result; + + if(m_impl->explicitText.length() > 200) + { + result.append("explicitText to long"); + } - if(m_impl->explicitText.length() > 200) - { - result.append("explicitText to long"); - } - - if((m_impl->organization.empty() && !m_impl->noticeNumbers.empty()) || - (!m_impl->organization.empty() && m_impl->noticeNumbers.empty())) - { - result.append("organization and noticeNumbers must both present or absent"); - } - LOGIT_DEBUG_STRINGARRAY("UserNotice::verify()", result); - return result; + if((m_impl->organization.empty() && !m_impl->noticeNumbers.empty()) || + (!m_impl->organization.empty() && m_impl->noticeNumbers.empty())) + { + result.append("organization and noticeNumbers must both present or absent"); + } + LOGIT_DEBUG_STRINGARRAY("UserNotice::verify()", result); + return result; } blocxx::StringArray UserNotice::dump() const { - StringArray result; - result.append("UserNotice::dump()"); + StringArray result; + result.append("UserNotice::dump()"); - result.append("explicitText = "+ m_impl->explicitText); - result.append("organization = " + m_impl->organization); + result.append("explicitText = "+ m_impl->explicitText); + result.append("organization = " + m_impl->organization); - String n; - blocxx::List< blocxx::Int32 >::const_iterator it = m_impl->noticeNumbers.begin(); - for(; it != m_impl->noticeNumbers.end(); ++it) - { - n += String(*it) + " "; - } - result.append("noticeNumbers = " + n); + String n; + blocxx::List< blocxx::Int32 >::const_iterator it = m_impl->noticeNumbers.begin(); + for(; it != m_impl->noticeNumbers.end(); ++it) + { + n += String(*it) + " "; + } + result.append("noticeNumbers = " + n); - return result; + return result; } bool operator==(const UserNotice &l, const UserNotice &r) { - if(l.getExplicitText() == r.getExplicitText() && - l.getOrganization() == r.getOrganization() && - l.getNoticeNumbers() == r.getNoticeNumbers()) - { - return true; - } - else - { - return false; - } + if(l.getExplicitText() == r.getExplicitText() && + l.getOrganization() == r.getOrganization() && + l.getNoticeNumbers() == r.getNoticeNumbers()) + { + return true; + } + else + { + return false; + } } bool operator<(const UserNotice &l, const UserNotice &r) { // this is only to make a List happy - - if(l.getExplicitText() < r.getExplicitText() || - l.getOrganization() < r.getOrganization() || - l.getNoticeNumbers() < r.getNoticeNumbers()) - { - return true; - } - else - { - return false; - } + + if(l.getExplicitText() < r.getExplicitText() || + l.getOrganization() < r.getOrganization() || + l.getNoticeNumbers() < r.getNoticeNumbers()) + { + return true; + } + else + { + return false; + } } @@ -385,7 +385,7 @@ {} CertificatePolicy::CertificatePolicy(const String& policyIdentifier) - : m_impl(new CertificatePolicyImpl(policyIdentifier)) + : m_impl(new CertificatePolicyImpl(policyIdentifier)) { if(!initOIDCheck().isValid(policyIdentifier)) { @@ -397,360 +397,360 @@ } CertificatePolicy::CertificatePolicy(const CertificatePolicy& policy) - : m_impl(policy.m_impl) + : m_impl(policy.m_impl) {} CertificatePolicy::~CertificatePolicy() {} - + CertificatePolicy& CertificatePolicy::operator=(const CertificatePolicy& policy) { - if(this == &policy) return *this; - - m_impl = policy.m_impl; - - return *this; + if(this == &policy) return *this; + + m_impl = policy.m_impl; + + return *this; } void CertificatePolicy::initWithSection(CAConfig* caConfig, Type type, const String& sectionName) { // These types are not supported by this object - if(type == E_CRL || type == E_Client_Req || - type == E_Server_Req || type == E_CA_Req ) - { - LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(limal::ValueException, - Format(__("Wrong type: %1."), type).c_str()); - } - - bool p = caConfig->exists(sectionName, "policyIdentifier"); - if(p) - { - m_impl->policyIdentifier = caConfig->getValue(sectionName, "policyIdentifier"); - } - - StringList kl = caConfig->getKeylist(sectionName); - StringList::const_iterator it = kl.begin(); - for(; it != kl.end(); ++it) - { - if((*it).startsWith("CPS", String::E_CASE_INSENSITIVE)) - { - m_impl->cpsURI.push_back(caConfig->getValue(sectionName, *it)); - } - else if((*it).startsWith("userNotice", String::E_CASE_INSENSITIVE)) - { - String uns = caConfig->getValue(sectionName, *it); - UserNotice un = UserNotice(); - un.initWithSection(caConfig, type, uns.substring(1)); - m_impl->noticeList.push_back(un); - } - } + if(type == E_CRL || type == E_Client_Req || + type == E_Server_Req || type == E_CA_Req ) + { + LOGIT_ERROR("wrong type" << type); + BLOCXX_THROW(limal::ValueException, + Format(__("Wrong type: %1."), type).c_str()); + } + + bool p = caConfig->exists(sectionName, "policyIdentifier"); + if(p) + { + m_impl->policyIdentifier = caConfig->getValue(sectionName, "policyIdentifier"); + } + + StringList kl = caConfig->getKeylist(sectionName); + StringList::const_iterator it = kl.begin(); + for(; it != kl.end(); ++it) + { + if((*it).startsWith("CPS", String::E_CASE_INSENSITIVE)) + { + m_impl->cpsURI.push_back(caConfig->getValue(sectionName, *it)); + } + else if((*it).startsWith("userNotice", String::E_CASE_INSENSITIVE)) + { + String uns = caConfig->getValue(sectionName, *it); + UserNotice un = UserNotice(); + un.initWithSection(caConfig, type, uns.substring(1)); + m_impl->noticeList.push_back(un); + } + } } void CertificatePolicy::setPolicyIdentifier(const String& policyIdentifier) { - if(!initOIDCheck().isValid(policyIdentifier)) - { - LOGIT_ERROR("invalid value for policyIdentifier" << policyIdentifier); - BLOCXX_THROW(limal::ValueException, - Format(__("Invalid value for policyIdentifier: %1."), policyIdentifier).c_str()); - } - - m_impl->policyIdentifier = policyIdentifier; + if(!initOIDCheck().isValid(policyIdentifier)) + { + LOGIT_ERROR("invalid value for policyIdentifier" << policyIdentifier); + BLOCXX_THROW(limal::ValueException, + Format(__("Invalid value for policyIdentifier: %1."), policyIdentifier).c_str()); + } + + m_impl->policyIdentifier = policyIdentifier; } blocxx::String CertificatePolicy::getPolicyIdentifier() const { - return m_impl->policyIdentifier; + return m_impl->policyIdentifier; } void CertificatePolicy::setCpsURI(const StringList& cpsURI) { - StringArray r = checkCpsURIs(cpsURI); - if(!r.empty()) - { - LOGIT_ERROR(r[0]); - BLOCXX_THROW(limal::ValueException, r[0].c_str()); - } - m_impl->cpsURI = cpsURI; + StringArray r = checkCpsURIs(cpsURI); + if(!r.empty()) + { + LOGIT_ERROR(r[0]); + BLOCXX_THROW(limal::ValueException, r[0].c_str()); + } + m_impl->cpsURI = cpsURI; } StringList CertificatePolicy::getCpsURI() const { - return m_impl->cpsURI; + return m_impl->cpsURI; } void CertificatePolicy::setUserNoticeList(const blocxx::List<UserNotice>& list) { - StringArray r = checkNoticeList(list); - if(!r.empty()) - { - LOGIT_ERROR(r[0]); - BLOCXX_THROW(limal::ValueException, r[0].c_str()); - } - m_impl->noticeList = list; + StringArray r = checkNoticeList(list); + if(!r.empty()) + { + LOGIT_ERROR(r[0]); + BLOCXX_THROW(limal::ValueException, r[0].c_str()); + } + m_impl->noticeList = list; } blocxx::List<UserNotice> CertificatePolicy::getUserNoticeList() const { - return m_impl->noticeList; + return m_impl->noticeList; } blocxx::String CertificatePolicy::commit2Config(CA& ca, Type type, blocxx::UInt32 num) const { - if(!valid()) - { - LOGIT_ERROR("invalid CertificatePolicy object"); - BLOCXX_THROW(limal::ValueException, - __("Invalid CertificatePolicy object.")); - } + if(!valid()) + { + LOGIT_ERROR("invalid CertificatePolicy object"); + BLOCXX_THROW(limal::ValueException, + __("Invalid CertificatePolicy object.")); + } // These types are not supported by this object - if(type == E_CRL || type == E_Client_Req || - type == E_Server_Req || type == E_CA_Req ) - { - LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(limal::ValueException, - Format(__("Wrong type: %1."), type).c_str()); - } + if(type == E_CRL || type == E_Client_Req || + type == E_Server_Req || type == E_CA_Req ) + { + LOGIT_ERROR("wrong type" << type); + BLOCXX_THROW(limal::ValueException, + Format(__("Wrong type: %1."), type).c_str()); + } - if(m_impl->cpsURI.empty()) { + if(m_impl->cpsURI.empty()) { // no practice statement; return directly the policyIdentifier - return m_impl->policyIdentifier; - } + return m_impl->policyIdentifier; + } // we need a policy section - String sectionName = String("polsec")+type2Section(type, true)+String(num); + String sectionName = String("polsec")+type2Section(type, true)+String(num); - ca.getConfig()->setValue(sectionName, "policyIdentifier", m_impl->policyIdentifier); + ca.getConfig()->setValue(sectionName, "policyIdentifier", m_impl->policyIdentifier); - StringList::const_iterator it = m_impl->cpsURI.begin(); - for(blocxx::UInt32 i = 1;it != m_impl->cpsURI.end(); ++it, ++i) - { - ca.getConfig()->setValue(sectionName, "CPS."+String(i),(*it)); - } - - blocxx::List<UserNotice>::const_iterator nit = m_impl->noticeList.begin(); - for(blocxx::UInt32 j = 1;nit != m_impl->noticeList.end(); ++nit, ++j) - { - String n = (*nit).commit2Config(ca, type, j); - ca.getConfig()->setValue(sectionName, "userNotice."+String(j),n); - } + StringList::const_iterator it = m_impl->cpsURI.begin(); + for(blocxx::UInt32 i = 1;it != m_impl->cpsURI.end(); ++it, ++i) + { + ca.getConfig()->setValue(sectionName, "CPS."+String(i),(*it)); + } - return ("@"+sectionName); + blocxx::List<UserNotice>::const_iterator nit = m_impl->noticeList.begin(); + for(blocxx::UInt32 j = 1;nit != m_impl->noticeList.end(); ++nit, ++j) + { + String n = (*nit).commit2Config(ca, type, j); + ca.getConfig()->setValue(sectionName, "userNotice."+String(j),n); + } + + return ("@"+sectionName); } bool CertificatePolicy::valid() const { - if(m_impl->policyIdentifier.empty() || - !initOIDCheck().isValid(m_impl->policyIdentifier)) - { - LOGIT_DEBUG("invalid value for policyIdentifier:" << m_impl->policyIdentifier); - return false; - } - - StringArray r = checkCpsURIs(m_impl->cpsURI); - if(!r.empty()) - { - LOGIT_DEBUG(r[0]); - return false; - } - - r = checkNoticeList(m_impl->noticeList); - if(!r.empty()) - { - LOGIT_DEBUG(r[0]); - return false; - } - return true; + if(m_impl->policyIdentifier.empty() || + !initOIDCheck().isValid(m_impl->policyIdentifier)) + { + LOGIT_DEBUG("invalid value for policyIdentifier:" << m_impl->policyIdentifier); + return false; + } + + StringArray r = checkCpsURIs(m_impl->cpsURI); + if(!r.empty()) + { + LOGIT_DEBUG(r[0]); + return false; + } + + r = checkNoticeList(m_impl->noticeList); + if(!r.empty()) + { + LOGIT_DEBUG(r[0]); + return false; + } + return true; } blocxx::StringArray CertificatePolicy::verify() const { - StringArray result; - - ValueCheck oidCheck = initOIDCheck(); - - if(m_impl->policyIdentifier.empty() || - !oidCheck.isValid(m_impl->policyIdentifier)) - { - result.append(Format("invalid value for policyIdentifier: %1", - m_impl->policyIdentifier).toString()); - } - - result.appendArray(checkCpsURIs(m_impl->cpsURI)); - - result.appendArray(checkNoticeList(m_impl->noticeList)); - - LOGIT_DEBUG_STRINGARRAY("CertificatePolicy::verify()", result); - return result; + StringArray result; + + ValueCheck oidCheck = initOIDCheck(); + + if(m_impl->policyIdentifier.empty() || + !oidCheck.isValid(m_impl->policyIdentifier)) + { + result.append(Format("invalid value for policyIdentifier: %1", + m_impl->policyIdentifier).toString()); + } + + result.appendArray(checkCpsURIs(m_impl->cpsURI)); + + result.appendArray(checkNoticeList(m_impl->noticeList)); + + LOGIT_DEBUG_STRINGARRAY("CertificatePolicy::verify()", result); + return result; } blocxx::StringArray CertificatePolicy::dump() const { - StringArray result; - result.append("CertificatePolicy::dump()"); + StringArray result; + result.append("CertificatePolicy::dump()"); - result.append("policy Identifier = " + m_impl->policyIdentifier); + result.append("policy Identifier = " + m_impl->policyIdentifier); - StringList::const_iterator it1 = m_impl->cpsURI.begin(); - for(; it1 != m_impl->cpsURI.end(); ++it1) - { - result.append("CPS = " + (*it1)); - } - - blocxx::List< UserNotice >::const_iterator it2 = m_impl->noticeList.begin(); - for(; it2 != m_impl->noticeList.end(); ++it2) - { - result.appendArray((*it2).dump()); - } - return result; + StringList::const_iterator it1 = m_impl->cpsURI.begin(); + for(; it1 != m_impl->cpsURI.end(); ++it1) + { + result.append("CPS = " + (*it1)); + } + + blocxx::List< UserNotice >::const_iterator it2 = m_impl->noticeList.begin(); + for(; it2 != m_impl->noticeList.end(); ++it2) + { + result.appendArray((*it2).dump()); + } + return result; } bool operator==(const CertificatePolicy &l, const CertificatePolicy &r) { - if(l.getPolicyIdentifier() == r.getPolicyIdentifier() && - l.getCpsURI() == r.getCpsURI() && - l.getUserNoticeList() == r.getUserNoticeList() ) - { - return true; - } - else - { - return false; - } + if(l.getPolicyIdentifier() == r.getPolicyIdentifier() && + l.getCpsURI() == r.getCpsURI() && + l.getUserNoticeList() == r.getUserNoticeList() ) + { + return true; + } + else + { + return false; + } } bool operator<(const CertificatePolicy &l, const CertificatePolicy &r) { // this is only to make a List happy - - if(l.getPolicyIdentifier() < r.getPolicyIdentifier() || - l.getCpsURI() < r.getCpsURI() || - l.getUserNoticeList() < r.getUserNoticeList() ) - { - return true; - } - else - { - return false; - } + + if(l.getPolicyIdentifier() < r.getPolicyIdentifier() || + l.getCpsURI() < r.getCpsURI() || + l.getUserNoticeList() < r.getUserNoticeList() ) + { + return true; + } + else + { + return false; + } } blocxx::StringArray CertificatePolicy::checkCpsURIs(const StringList& cpsURIs) const { - StringArray result; - ValueCheck uriCheck = initURICheck(); - - StringList::const_iterator it = cpsURIs.begin(); - for(;it != cpsURIs.end(); it++) - { - if(!uriCheck.isValid(*it)) - { - result.append(Format("invalid URI: %1", *it).toString()); - } - } - return result; + StringArray result; + ValueCheck uriCheck = initURICheck(); + + StringList::const_iterator it = cpsURIs.begin(); + for(;it != cpsURIs.end(); it++) + { + if(!uriCheck.isValid(*it)) + { + result.append(Format("invalid URI: %1", *it).toString()); + } + } + return result; } blocxx::StringArray CertificatePolicy::checkNoticeList(const blocxx::List<UserNotice>& list) const { - StringArray result; - blocxx::List<UserNotice>::const_iterator it = list.begin(); - for(;it != list.end(); it++) - { - result.appendArray((*it).verify()); - } - return result; + StringArray result; + blocxx::List<UserNotice>::const_iterator it = list.begin(); + for(;it != list.end(); it++) + { + result.appendArray((*it).verify()); + } + return result; } // ################################################################################### CertificatePoliciesExt::CertificatePoliciesExt() - : ExtensionBase() + : ExtensionBase() , m_impl(new CertificatePoliciesExtImpl()) {} CertificatePoliciesExt::CertificatePoliciesExt(const blocxx::List<CertificatePolicy>& policies) - : ExtensionBase() + : ExtensionBase() , m_impl(new CertificatePoliciesExtImpl(policies)) { - StringArray r = checkPolicies(policies); - if(!r.empty()) - { - LOGIT_ERROR(r[0]); - BLOCXX_THROW(limal::ValueException, r[0].c_str()); - } - setPresent(true); + StringArray r = checkPolicies(policies); + if(!r.empty()) + { + LOGIT_ERROR(r[0]); + BLOCXX_THROW(limal::ValueException, r[0].c_str()); + } + setPresent(true); } CertificatePoliciesExt::CertificatePoliciesExt(CAConfig* caConfig, Type type) - : ExtensionBase() + : ExtensionBase() , m_impl(new CertificatePoliciesExtImpl()) { // These types are not supported by this object - if(type == E_CRL || type == E_Client_Req || - type == E_Server_Req || type == E_CA_Req ) - { - LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(limal::ValueException, - Format(__("Wrong type: %1."), type).c_str()); - } - - bool p = caConfig->exists(type2Section(type, true), "certificatePolicies"); - if(p) - { - ValueCheck check = initOIDCheck(); - StringArray sp = PerlRegEx("\\s*,\\s*") - .split(caConfig->getValue(type2Section(type, true), "certificatePolicies")); - - if(sp[0].equalsIgnoreCase("critical")) - { - setCritical(true); - sp.remove(0); - } - - StringArray::const_iterator it = sp.begin(); - for(; it != sp.end(); ++it) - { - if((*it).equalsIgnoreCase("ia5org")) - { - m_impl->ia5org = true; - } - else if(check.isValid(*it)) - { - m_impl->policies.push_back(CertificatePolicy(*it)); - } - else if((*it).startsWith("@")) - { - CertificatePolicy cp = CertificatePolicy(); - cp.initWithSection(caConfig, type, (*it).substring(1)); - m_impl->policies.push_back(cp); - } - } - } - setPresent(p); + if(type == E_CRL || type == E_Client_Req || + type == E_Server_Req || type == E_CA_Req ) + { + LOGIT_ERROR("wrong type" << type); + BLOCXX_THROW(limal::ValueException, + Format(__("Wrong type: %1."), type).c_str()); + } + + bool p = caConfig->exists(type2Section(type, true), "certificatePolicies"); + if(p) + { + ValueCheck check = initOIDCheck(); + StringArray sp = PerlRegEx("\\s*,\\s*") + .split(caConfig->getValue(type2Section(type, true), "certificatePolicies")); + + if(sp[0].equalsIgnoreCase("critical")) + { + setCritical(true); + sp.remove(0); + } + + StringArray::const_iterator it = sp.begin(); + for(; it != sp.end(); ++it) + { + if((*it).equalsIgnoreCase("ia5org")) + { + m_impl->ia5org = true; + } + else if(check.isValid(*it)) + { + m_impl->policies.push_back(CertificatePolicy(*it)); + } + else if((*it).startsWith("@")) + { + CertificatePolicy cp = CertificatePolicy(); + cp.initWithSection(caConfig, type, (*it).substring(1)); + m_impl->policies.push_back(cp); + } + } + } + setPresent(p); } CertificatePoliciesExt::CertificatePoliciesExt(const CertificatePoliciesExt& extension) - : ExtensionBase(extension), - m_impl(extension.m_impl) + : ExtensionBase(extension), + m_impl(extension.m_impl) {} CertificatePoliciesExt::~CertificatePoliciesExt() @@ -759,13 +759,13 @@ CertificatePoliciesExt& CertificatePoliciesExt::operator=(const CertificatePoliciesExt& extension) { - if(this == &extension) return *this; - - ExtensionBase::operator=(extension); - - m_impl = extension.m_impl; + if(this == &extension) return *this; + + ExtensionBase::operator=(extension); + + m_impl = extension.m_impl; - return *this; + return *this; } void @@ -777,149 +777,149 @@ bool CertificatePoliciesExt::isIA5orgEnabled() const { - if(!isPresent()) - { - BLOCXX_THROW(limal::RuntimeException, - __("CertificatePoliciesExt is not present.")); - } - return m_impl->ia5org; + if(!isPresent()) + { + BLOCXX_THROW(limal::RuntimeException, + __("CertificatePoliciesExt is not present.")); + } + return m_impl->ia5org; } void CertificatePoliciesExt::setPolicies(const blocxx::List<CertificatePolicy>& policies) { - StringArray r = checkPolicies(policies); - if(!r.empty()) - { - LOGIT_ERROR(r[0]); - BLOCXX_THROW(limal::ValueException, r[0].c_str()); - } - m_impl->policies = policies; + StringArray r = checkPolicies(policies); + if(!r.empty()) + { + LOGIT_ERROR(r[0]); + BLOCXX_THROW(limal::ValueException, r[0].c_str()); + } + m_impl->policies = policies; - setPresent(true); + setPresent(true); } blocxx::List<CertificatePolicy> CertificatePoliciesExt::getPolicies() const { - if(!isPresent()) - { - BLOCXX_THROW(limal::RuntimeException, - __("CertificatePoliciesExt is not present.")); - } - return m_impl->policies; + if(!isPresent()) + { + BLOCXX_THROW(limal::RuntimeException, + __("CertificatePoliciesExt is not present.")); + } + return m_impl->policies; } void CertificatePoliciesExt::commit2Config(CA& ca, Type type) const { - if(!valid()) - { - LOGIT_ERROR("invalid CertificatePoliciesExt object"); - BLOCXX_THROW(limal::ValueException, - __("Invalid CertificatePoliciesExt object.")); - } + if(!valid()) + { + LOGIT_ERROR("invalid CertificatePoliciesExt object"); + BLOCXX_THROW(limal::ValueException, + __("Invalid CertificatePoliciesExt object.")); + } // These types are not supported by this object - if(type == E_CRL || type == E_Client_Req || - type == E_Server_Req || type == E_CA_Req ) - { - LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(limal::ValueException, - Format(__("Wrong type: %1."), type).c_str()); - } - - if(isPresent()) - { - String extString; - - if(isCritical()) extString += "critical,"; - - if(m_impl->ia5org) extString += "ia5org,"; - - blocxx::List<CertificatePolicy>::const_iterator it = m_impl->policies.begin(); - for(blocxx::UInt32 i = 0;it != m_impl->policies.end(); ++it, ++i) - { - extString += (*it).commit2Config(ca, type, i) + ","; - } - - ca.getConfig()->setValue(type2Section(type, true), "certificatePolicies", - extString.erase(extString.length()-1)); - } - else - { - ca.getConfig()->deleteValue(type2Section(type, true), "certificatePolicies"); - } + if(type == E_CRL || type == E_Client_Req || + type == E_Server_Req || type == E_CA_Req ) + { + LOGIT_ERROR("wrong type" << type); + BLOCXX_THROW(limal::ValueException, + Format(__("Wrong type: %1."), type).c_str()); + } + + if(isPresent()) + { + String extString; + + if(isCritical()) extString += "critical,"; + + if(m_impl->ia5org) extString += "ia5org,"; + + blocxx::List<CertificatePolicy>::const_iterator it = m_impl->policies.begin(); + for(blocxx::UInt32 i = 0;it != m_impl->policies.end(); ++it, ++i) + { + extString += (*it).commit2Config(ca, type, i) + ","; + } + + ca.getConfig()->setValue(type2Section(type, true), "certificatePolicies", + extString.erase(extString.length()-1)); + } + else + { + ca.getConfig()->deleteValue(type2Section(type, true), "certificatePolicies"); + } } bool CertificatePoliciesExt::valid() const { - if(!isPresent()) return true; + if(!isPresent()) return true; - if(m_impl->policies.empty()) - { - LOGIT_DEBUG("No policy set"); - return false; - } - StringArray r = checkPolicies(m_impl->policies); - if(!r.empty()) - { - LOGIT_DEBUG(r[0]); - return false; - } - return true; + if(m_impl->policies.empty()) + { + LOGIT_DEBUG("No policy set"); + return false; + } + StringArray r = checkPolicies(m_impl->policies); + if(!r.empty()) + { + LOGIT_DEBUG(r[0]); + return false; + } + return true; } blocxx::StringArray CertificatePoliciesExt::verify() const { - StringArray result; + StringArray result; + + if(!isPresent()) return result; + + if(m_impl->policies.empty()) + { + result.append("No policy set"); + } + result.appendArray(checkPolicies(m_impl->policies)); - if(!isPresent()) return result; + LOGIT_DEBUG_STRINGARRAY("CertificatePoliciesExt::verify()", result); - if(m_impl->policies.empty()) - { - result.append("No policy set"); - } - result.appendArray(checkPolicies(m_impl->policies)); - - LOGIT_DEBUG_STRINGARRAY("CertificatePoliciesExt::verify()", result); - - return result; + return result; } blocxx::StringArray CertificatePoliciesExt::dump() const { - StringArray result; - result.append("CertificatePoliciesExt::dump()"); + StringArray result; + result.append("CertificatePoliciesExt::dump()"); - result.appendArray(ExtensionBase::dump()); - if(!isPresent()) return result; + result.appendArray(ExtensionBase::dump()); + if(!isPresent()) return result; - result.append("ia5org = " + blocxx::Bool(m_impl->ia5org).toString()); - blocxx::List< CertificatePolicy >::const_iterator it = m_impl->policies.begin(); - for(; it != m_impl->policies.end(); ++it) - { - result.appendArray((*it).dump()); - } - - return result; + result.append("ia5org = " + blocxx::Bool(m_impl->ia5org).toString()); + blocxx::List< CertificatePolicy >::const_iterator it = m_impl->policies.begin(); + for(; it != m_impl->policies.end(); ++it) + { + result.appendArray((*it).dump()); + } + + return result; } blocxx::StringArray CertificatePoliciesExt::checkPolicies(const blocxx::List<CertificatePolicy>& pl) const { - StringArray result; - blocxx::List<CertificatePolicy>::const_iterator it = pl.begin(); - for(;it != pl.end(); it++) - { - result.appendArray((*it).verify()); - } - return result; + StringArray result; + blocxx::List<CertificatePolicy>::const_iterator it = pl.begin(); + for(;it != pl.end(); it++) + { + result.appendArray((*it).verify()); + } + return result; } } Modified: limal-head/limal-ca-mgm/src/Commands.hpp.in URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/Commands.… ============================================================================== --- limal-head/limal-ca-mgm/src/Commands.hpp.in (original) +++ limal-head/limal-ca-mgm/src/Commands.hpp.in Wed Oct 17 14:18:38 2007 @@ -11,17 +11,17 @@ | (C) SUSE Linux Products GmbH | \----------------------------------------------------------------------/ - File: Commands.hpp +File: Commands.hpp - Author: Michael Calmer - Maintainer: Michael Calmer +Author: Michael Calmer +Maintainer: Michael Calmer /-*/ /** - * @file Commands.hpp - * @brief This file is private for the ca-mgm library. - * It defines some commands with full path - */ +* @file Commands.hpp +* @brief This file is private for the ca-mgm library. +* It defines some commands with full path +*/ #ifndef LIMAL_CA_MGM_COMMANDS_HPP #define LIMAL_CA_MGM_COMMANDS_HPP Modified: limal-head/limal-ca-mgm/src/DNObject.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/DNObject.… ============================================================================== --- limal-head/limal-ca-mgm/src/DNObject.cpp (original) +++ limal-head/limal-ca-mgm/src/DNObject.cpp Wed Oct 17 14:18:38 2007 @@ -39,12 +39,12 @@ using namespace limal; using namespace blocxx; - - + + RDNObject::RDNObject() : m_impl(new RDNObjectImpl()) {} - + RDNObject::RDNObject(const RDNObject& rdn) : m_impl(rdn.m_impl) {} @@ -56,7 +56,7 @@ RDNObject::operator=(const RDNObject& rdn) { if(this == &rdn) return *this; - + m_impl = rdn.m_impl; return *this; @@ -100,7 +100,7 @@ Map<String, String>::const_iterator it = opensslKeys.find(m_impl->type); if( it != opensslKeys.end()) - { + { ret += (*it).second + "="; } else @@ -159,14 +159,14 @@ if(m_impl->min != 0 && m_impl->value.UTF8Length() < m_impl->min) { - result.append("Value(" + m_impl->value + + result.append("Value(" + m_impl->value + ") is too small. Value has to be a minimal length of " + String(m_impl->min)); } if(m_impl->max != 0 && m_impl->value.UTF8Length() > m_impl->max) { - result.append("Value(" + m_impl->value + + result.append("Value(" + m_impl->value + ") is too long. Value has to be a maximal length of " + String(m_impl->max)); } @@ -255,10 +255,10 @@ if(!p) { LOGIT_ERROR("missing section 'distinguished_name' in config file"); - BLOCXX_THROW(limal::SyntaxException, + BLOCXX_THROW(limal::SyntaxException, __("Missing section 'distinguished_name' in the configuration file.")); } - String dnSect = caConfig->getValue(type2Section(type, false), + String dnSect = caConfig->getValue(type2Section(type, false), "distinguished_name"); StringList dnKeys = caConfig->getKeylist(dnSect); @@ -266,7 +266,7 @@ if(dnKeys.empty()) { LOGIT_ERROR("Can not parse Section " << dnSect); - BLOCXX_THROW(limal::SyntaxException, + BLOCXX_THROW(limal::SyntaxException, Format(__("Cannot parse section %1."), dnSect).c_str()); } StringList::const_iterator it = dnKeys.begin(); @@ -282,14 +282,14 @@ if((*it).endsWith("_default", String::E_CASE_INSENSITIVE)) { if((*it).startsWith(fieldName, String::E_CASE_INSENSITIVE)) - { + { defaultValue = caConfig->getValue(dnSect, *it); } else { LOGIT_INFO("Wrong order of section '" << dnSect << "'. FieldName is '" << fieldName << - "' but parsed Key is '" << *it << + "' but parsed Key is '" << *it << "'. Ignoring value."); continue; } @@ -304,7 +304,7 @@ { LOGIT_INFO("Wrong order of section '" << dnSect << "'. FieldName is '" << fieldName << - "' but parsed Key is '" << *it << + "' but parsed Key is '" << *it << "'. Ignoring value."); continue; } @@ -319,7 +319,7 @@ { LOGIT_INFO("Wrong order of section '" << dnSect << "'. FieldName is '" << fieldName << - "' but parsed Key is '" << *it << + "' but parsed Key is '" << *it << "'. Ignoring value."); continue; } @@ -350,7 +350,7 @@ } // commit the last values if(!fieldName.empty()) - { + { m_impl->dn.push_back(RDNObject_Priv(fieldName, defaultValue, prompt, @@ -381,9 +381,9 @@ DNObject::operator=(const DNObject& dn) { if(this == &dn) return *this; - + m_impl = dn.m_impl; - + return *this; } @@ -414,11 +414,11 @@ for(; it != m_impl->dn.end(); ++it) { if(! (*it).getOpenSSLValue().empty()) - { + { ret += "/" + (*it).getOpenSSLValue(); } } - + return ret; } @@ -449,9 +449,9 @@ result.append("empty DN"); } result.appendArray(checkRDNList(m_impl->dn)); - + LOGIT_DEBUG_STRINGARRAY("DNObject::verify()", result); - + return result; } @@ -459,7 +459,7 @@ DNObject::checkRDNList(const blocxx::List<RDNObject>& list) const { StringArray result; - + blocxx::List<RDNObject>::const_iterator it = list.begin(); for(; it != list.end(); ++it) { @@ -479,7 +479,7 @@ { result.appendArray((*it).dump()); } - + return result; } Modified: limal-head/limal-ca-mgm/src/DNObjectImpl.hpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/DNObjectI… ============================================================================== --- limal-head/limal-ca-mgm/src/DNObjectImpl.hpp (original) +++ limal-head/limal-ca-mgm/src/DNObjectImpl.hpp Wed Oct 17 14:18:38 2007 @@ -31,63 +31,63 @@ namespace CA_MGM_NAMESPACE { - class RDNObjectImpl : public blocxx::COWIntrusiveCountableBase +class RDNObjectImpl : public blocxx::COWIntrusiveCountableBase +{ +public: + RDNObjectImpl() + : type(String()) + , value(String()) + , prompt(String()) + , min(0) + , max(0) + {} + + RDNObjectImpl(const RDNObjectImpl& impl) + : COWIntrusiveCountableBase(impl) + , type(impl.type) + , value(impl.value) + , prompt(impl.prompt) + , min(impl.min) + , max(impl.max) + {} + + ~RDNObjectImpl() {} + + RDNObjectImpl* clone() const { - public: - RDNObjectImpl() - : type(String()) - , value(String()) - , prompt(String()) - , min(0) - , max(0) - {} - - RDNObjectImpl(const RDNObjectImpl& impl) - : COWIntrusiveCountableBase(impl) - , type(impl.type) - , value(impl.value) - , prompt(impl.prompt) - , min(impl.min) - , max(impl.max) - {} - - ~RDNObjectImpl() {} - - RDNObjectImpl* clone() const - { - return new RDNObjectImpl(*this); - } - - blocxx::String type; - blocxx::String value; - - blocxx::String prompt; - blocxx::UInt32 min; - blocxx::UInt32 max; - }; + return new RDNObjectImpl(*this); + } + + blocxx::String type; + blocxx::String value; + + blocxx::String prompt; + blocxx::UInt32 min; + blocxx::UInt32 max; +}; + +class DNObjectImpl : public blocxx::COWIntrusiveCountableBase +{ +public: + DNObjectImpl() + : dn(blocxx::List<RDNObject>()) + {} + + DNObjectImpl(const DNObjectImpl& impl) + : COWIntrusiveCountableBase(impl) + , dn(impl.dn) + {} + + ~DNObjectImpl() {} - class DNObjectImpl : public blocxx::COWIntrusiveCountableBase + DNObjectImpl* clone() const { - public: - DNObjectImpl() - : dn(blocxx::List<RDNObject>()) - {} - - DNObjectImpl(const DNObjectImpl& impl) - : COWIntrusiveCountableBase(impl) - , dn(impl.dn) - {} - - ~DNObjectImpl() {} - - DNObjectImpl* clone() const - { - return new DNObjectImpl(*this); - } + return new DNObjectImpl(*this); + } - blocxx::List<RDNObject> dn; + blocxx::List<RDNObject> dn; - }; +}; } } Modified: limal-head/limal-ca-mgm/src/DNObject_Priv.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/DNObject_… ============================================================================== --- limal-head/limal-ca-mgm/src/DNObject_Priv.cpp (original) +++ limal-head/limal-ca-mgm/src/DNObject_Priv.cpp Wed Oct 17 14:18:38 2007 @@ -37,7 +37,7 @@ RDNObject_Priv::RDNObject_Priv() : RDNObject() {} - + RDNObject_Priv::RDNObject_Priv(const String& type, const String& value, const String& prompt, blocxx::UInt32 min, @@ -55,10 +55,10 @@ {} void -RDNObject_Priv::setRDN(const String& type, const String& value, - const String& prompt, - blocxx::UInt32 min, - blocxx::UInt32 max) + RDNObject_Priv::setRDN(const String& type, const String& value, + const String& prompt, + blocxx::UInt32 min, + blocxx::UInt32 max) { m_impl->type = type; m_impl->value = value; @@ -80,15 +80,15 @@ BLOCXX_THROW(limal::MemoryException, __("Cannot create a memory BIO.")); } - - X509_NAME_print_ex(bio, x509_name, 0, + + X509_NAME_print_ex(bio, x509_name, 0, ASN1_STRFLGS_ESC_CTRL | ASN1_STRFLGS_ESC_MSB | XN_FLAG_SEP_MULTILINE | XN_FLAG_FN_LN | XN_FLAG_SPC_EQ - ); - + ); + // XN_FLAG_SPC_EQ | // space after '=' // XN_FLAG_FN_LN | // long names (commonName) // XN_FLAG_FN_ALIGN // add spaces for a nice output @@ -101,7 +101,7 @@ PerlRegEx re("(^[\\w]+)\\s=\\s(.+)$"); StringArray lines = name.tokenize("\n"); - /* + /* * This is one option. * for(uint j = 0 ; j < lines.size(); ++j) { @@ -109,11 +109,11 @@ StringArray vals = re.capture(lines[j]); if(vals.size() != 3) { - + BIO_free(bio); LOGIT_ERROR("Can not parse DN line: " << lines[j]); - BLOCXX_THROW(limal::RuntimeException, + BLOCXX_THROW(limal::RuntimeException, Format("Can not parse DN line: %1", lines[j]).c_str()); } @@ -150,7 +150,7 @@ StringArray vals = re.capture(lines[j]); if(vals.size() != 3) - { + { BIO_free(bio); LOGIT_ERROR("Can not parse DN line: " << lines[j]); @@ -161,9 +161,9 @@ tmpDN.push_back(RDNObject_Priv(vals[1], vals[2])); } - + setDN(tmpDN); - + BIO_free(bio); } @@ -182,7 +182,7 @@ DNObject_Priv::operator=(const DNObject_Priv& obj) { if(this == &obj) return *this; - + DNObject::operator=(obj); return *this; @@ -195,25 +195,25 @@ if(!p) { LOGIT_ERROR("missing section 'distinguished_name' in config file"); - BLOCXX_THROW(limal::SyntaxException, + BLOCXX_THROW(limal::SyntaxException, __("Missing section 'distinguished_name' in the configuration file.")); } String dnSect = ca.getConfig()->getValue("req_ca", "distinguished_name"); - + StringList dnKeys = ca.getConfig()->getKeylist(dnSect); - + if(dnKeys.empty()) { LOGIT_ERROR("Can not parse Section " << dnSect); - BLOCXX_THROW(limal::SyntaxException, + BLOCXX_THROW(limal::SyntaxException, Format(__("Cannot parse section %1."), dnSect).c_str()); } StringList::const_iterator it = dnKeys.begin(); Array<Array<blocxx::String> > newDNSect; - + String lastFieldName; String defaultValue; - + for(; it != dnKeys.end(); ++it) { if((*it).endsWith("_default", String::E_CASE_INSENSITIVE)) @@ -233,7 +233,7 @@ { // do we have a default for lastFiledName? blocxx::List<RDNObject>::const_iterator rdnIT; - + for(rdnIT = m_impl->dn.begin(); rdnIT != m_impl->dn.end(); ++rdnIT) { if((*rdnIT).getType() == lastFieldName) @@ -250,7 +250,7 @@ newDNSect.push_back(line); } } - + lastFieldName = *it; defaultValue = ""; } Modified: limal-head/limal-ca-mgm/src/DNObject_Priv.hpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/DNObject_… ============================================================================== --- limal-head/limal-ca-mgm/src/DNObject_Priv.hpp (original) +++ limal-head/limal-ca-mgm/src/DNObject_Priv.hpp Wed Oct 17 14:18:38 2007 @@ -31,46 +31,46 @@ namespace CA_MGM_NAMESPACE { - class CA; - - class RDNObject_Priv : public RDNObject { - public: - RDNObject_Priv(); - RDNObject_Priv(const String& type, const String& value, - const String& prompt = String(), - blocxx::UInt32 min = 0, - blocxx::UInt32 max = 0); - - virtual ~RDNObject_Priv(); - - /** - * Set the RDN value - * - * @param type of the RDN - * @param value of the RDN - * @param prompt the prompt which is configured in the configfile - * @param min minimal string length of value; 0 == min not set - * @param max maximal string length of value; 0 == max not set - */ - void setRDN(const String& type, const String& value, - const String& prompt = String(), - blocxx::UInt32 min = 0, - blocxx::UInt32 max = 0); - - }; - - class DNObject_Priv : public DNObject { - public: - DNObject_Priv(X509_NAME *x509_name); - DNObject_Priv(const DNObject_Priv& obj); - DNObject_Priv(const DNObject& obj); - virtual ~DNObject_Priv(); - - DNObject_Priv& operator=(const DNObject_Priv& obj); - - void - setDefaults2Config(CA& ca); - }; +class CA; + +class RDNObject_Priv : public RDNObject { +public: + RDNObject_Priv(); + RDNObject_Priv(const String& type, const String& value, + const String& prompt = String(), + blocxx::UInt32 min = 0, + blocxx::UInt32 max = 0); + + virtual ~RDNObject_Priv(); + + /** + * Set the RDN value + * + * @param type of the RDN + * @param value of the RDN + * @param prompt the prompt which is configured in the configfile + * @param min minimal string length of value; 0 == min not set + * @param max maximal string length of value; 0 == max not set + */ + void setRDN(const String& type, const String& value, + const String& prompt = String(), + blocxx::UInt32 min = 0, + blocxx::UInt32 max = 0); + +}; + +class DNObject_Priv : public DNObject { +public: + DNObject_Priv(X509_NAME *x509_name); + DNObject_Priv(const DNObject_Priv& obj); + DNObject_Priv(const DNObject& obj); + virtual ~DNObject_Priv(); + + DNObject_Priv& operator=(const DNObject_Priv& obj); + + void + setDefaults2Config(CA& ca); +}; } } Modified: limal-head/limal-ca-mgm/src/ExtendedKeyUsageExt.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/ExtendedK… ============================================================================== --- limal-head/limal-ca-mgm/src/ExtendedKeyUsageExt.cpp (original) +++ limal-head/limal-ca-mgm/src/ExtendedKeyUsageExt.cpp Wed Oct 17 14:18:38 2007 @@ -38,7 +38,7 @@ class ExtendedKeyUsageExtImpl : public blocxx::COWIntrusiveCountableBase { - public: +public: ExtendedKeyUsageExtImpl() : usage(StringList()) {} @@ -57,7 +57,7 @@ StringList usage; }; - + ExtendedKeyUsageExt::ExtendedKeyUsageExt() : ExtensionBase() , m_impl(new ExtendedKeyUsageExtImpl()) @@ -83,7 +83,7 @@ String ct = caConfig->getValue(type2Section(type, true), "extendedKeyUsage"); StringArray sp = PerlRegEx("\\s*,\\s*").split(ct); - + StringArray::const_iterator it = sp.begin(); if(sp[0].equalsIgnoreCase("critical")) { @@ -123,13 +123,13 @@ *it).c_str()); } } - + if(m_impl->usage.empty()) { BLOCXX_THROW(limal::ValueException, __("Invalid ExtendedKeyUsageExt.")); } - + setPresent(true); } @@ -193,7 +193,7 @@ } return m_impl->usage; } - + bool ExtendedKeyUsageExt::isEnabledFor(const String& extKeyUsage) const { @@ -207,10 +207,10 @@ { return true; } - } + } return false; } - + void ExtendedKeyUsageExt::commit2Config(CA& ca, Type type) const { @@ -242,7 +242,7 @@ } ca.getConfig()->setValue(type2Section(type, true), - "extendedKeyUsage", + "extendedKeyUsage", extendedKeyUsageString.erase(extendedKeyUsageString.length()-1)); } else @@ -326,6 +326,6 @@ return true; } } - + } } Modified: limal-head/limal-ca-mgm/src/ExtensionBase.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/Extension… ============================================================================== --- limal-head/limal-ca-mgm/src/ExtensionBase.cpp (original) +++ limal-head/limal-ca-mgm/src/ExtensionBase.cpp Wed Oct 17 14:18:38 2007 @@ -35,16 +35,16 @@ class ExtensionBaseImpl : public COWIntrusiveCountableBase { - public: +public: ExtensionBaseImpl(bool extPresent = false, bool extCritical = false) : present(extPresent), critical(extCritical) {} ExtensionBaseImpl(const ExtensionBaseImpl &ebi) - : COWIntrusiveCountableBase(ebi), - present(ebi.present), - critical(ebi.critical) + : COWIntrusiveCountableBase(ebi) + , present(ebi.present) + , critical(ebi.critical) {} virtual ~ExtensionBaseImpl() {} @@ -56,24 +56,24 @@ void setPresent(bool extPresent) { present = extPresent; } void setCritical(bool extCritical) { critical = extCritical; } - + bool isCritical() const { return (present)?critical:false; } bool isPresent() const { return present; } - private: +private: bool present; bool critical; }; // ================================================================ - - + + ExtensionBase::ExtensionBase(bool extPresent, bool extCritical) : m_impl(new ExtensionBaseImpl(extPresent, extCritical)) { } - + ExtensionBase::ExtensionBase(const ExtensionBase& extension) : m_impl(extension.m_impl) {} @@ -91,14 +91,14 @@ return *this; } -void +void ExtensionBase::setPresent(bool extPresent) { LOGIT_DEBUG("ExtensionBase::setPresent(): " << (extPresent ? "true":"false") ); m_impl->setPresent(extPresent); } -void +void ExtensionBase::setCritical(bool extCritical) { LOGIT_DEBUG("ExtensionBase::setCritical(): " << (extCritical ? "true":"false") ); @@ -123,12 +123,12 @@ { StringArray result; result.append("ExtensionBase::dump()"); - + result.append("is Present = " + Bool(isPresent()).toString()); if(!isPresent()) return result; - + result.append("is Critical = " + Bool(isCritical()).toString()); - + return result; } Modified: limal-head/limal-ca-mgm/src/IssuerAlternativeNameExtension.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/IssuerAlt… ============================================================================== --- limal-head/limal-ca-mgm/src/IssuerAlternativeNameExtension.cpp (original) +++ limal-head/limal-ca-mgm/src/IssuerAlternativeNameExtension.cpp Wed Oct 17 14:18:38 2007 @@ -37,13 +37,13 @@ class IssuerAlternativeNameExtImpl : public blocxx::COWIntrusiveCountableBase { - public: +public: IssuerAlternativeNameExtImpl() : issuerCopy(false) , altNameList(blocxx::List<LiteralValue>()) {} - IssuerAlternativeNameExtImpl(bool copyIssuer, + IssuerAlternativeNameExtImpl(bool copyIssuer, const blocxx::List<LiteralValue> &alternativeNameList) : issuerCopy(copyIssuer) , altNameList(alternativeNameList) @@ -66,14 +66,14 @@ blocxx::List<LiteralValue> altNameList; }; - + IssuerAlternativeNameExt::IssuerAlternativeNameExt() : ExtensionBase() , m_impl(new IssuerAlternativeNameExtImpl()) {} -IssuerAlternativeNameExt::IssuerAlternativeNameExt(bool copyIssuer, - const blocxx::List<LiteralValue> &alternativeNameList) +IssuerAlternativeNameExt::IssuerAlternativeNameExt(bool copyIssuer, + const blocxx::List<LiteralValue> &alternativeNameList) : ExtensionBase() , m_impl(new IssuerAlternativeNameExtImpl(copyIssuer, alternativeNameList)) { @@ -110,12 +110,12 @@ { if((*it).indexOf(":") != String::npos) { - if((*it).equalsIgnoreCase("issuer:copy")) + if((*it).equalsIgnoreCase("issuer:copy")) m_impl->issuerCopy = true; else { try - { + { LiteralValue lv = LiteralValue(*it); m_impl->altNameList.push_back(lv); } @@ -142,7 +142,7 @@ IssuerAlternativeNameExt::operator=(const IssuerAlternativeNameExt& extension) { if(this == &extension) return *this; - + ExtensionBase::operator=(extension); m_impl = extension.m_impl; @@ -199,7 +199,7 @@ if(!altName.valid()) { LOGIT_ERROR("invalid literal value for IssuerAlternativeNameExt"); - BLOCXX_THROW(limal::ValueException, + BLOCXX_THROW(limal::ValueException, __("Invalid literal value for IssuerAlternativeNameExt.")); } m_impl->altNameList.push_back(altName); @@ -310,7 +310,7 @@ { result.appendArray((*it).dump()); } - + return result; } Modified: limal-head/limal-ca-mgm/src/LiteralValues.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/LiteralVa… ============================================================================== --- limal-head/limal-ca-mgm/src/LiteralValues.cpp (original) +++ limal-head/limal-ca-mgm/src/LiteralValues.cpp Wed Oct 17 14:18:38 2007 @@ -40,10 +40,10 @@ class LiteralValueImpl : public blocxx::COWIntrusiveCountableBase { - public: +public: String literalType; String literalValue; - + LiteralValueImpl() : literalType(String()), literalValue(String()) {} @@ -55,8 +55,8 @@ LiteralValueImpl(const LiteralValueImpl &lv) : blocxx::COWIntrusiveCountableBase(lv), - literalType(lv.literalType), - literalValue(lv.literalValue) + literalType(lv.literalType), + literalValue(lv.literalValue) {} virtual ~LiteralValueImpl() {} @@ -67,13 +67,13 @@ } }; - -LiteralValue::LiteralValue() + +LiteralValue::LiteralValue() : m_impl(new LiteralValueImpl()) {} -LiteralValue::LiteralValue(const String &type, const String &value) - : m_impl(new LiteralValueImpl(type, value)) +LiteralValue::LiteralValue(const String &type, const String &value) + : m_impl(new LiteralValueImpl(type, value)) { StringArray r = this->verify(); if(!r.empty()) @@ -87,7 +87,7 @@ : m_impl(new LiteralValueImpl()) { StringArray sp = PerlRegEx("^([\\w\\d.]+):(.*)$").capture(value); - + if(sp[1].equalsIgnoreCase("email")) { m_impl->literalType = sp[1]; @@ -139,58 +139,58 @@ LiteralValue& LiteralValue::operator=(const LiteralValue& value) { - if(this == &value) return *this; + if(this == &value) return *this; - m_impl = value.m_impl; - - return *this; + m_impl = value.m_impl; + + return *this; } LiteralValue::~LiteralValue() {} - + void LiteralValue::setLiteral(const String &type, const String &value) { String dType = m_impl->literalType; String dValue = m_impl->literalValue; - + m_impl->literalType = type; m_impl->literalValue = value; - + StringArray r = this->verify(); if(!r.empty()) { m_impl->literalType = dType; m_impl->literalValue = dValue; - + LOGIT_ERROR(r[0]); BLOCXX_THROW(limal::ValueException, r[0].c_str()); } } void -LiteralValue::setValue(const String &value) +LiteralValue::setValue(const String &value) { String dValue = m_impl->literalValue; - - m_impl->literalValue = value; + + m_impl->literalValue = value; StringArray r = this->verify(); if(!r.empty()) { m_impl->literalValue = dValue; - + LOGIT_ERROR(r[0]); BLOCXX_THROW(limal::ValueException, r[0].c_str()); } } blocxx::String -LiteralValue::getValue() const +LiteralValue::getValue() const { - return m_impl->literalValue; + return m_impl->literalValue; } blocxx::String @@ -202,7 +202,7 @@ blocxx::String LiteralValue::commit2Config(CA &ca, Type t, blocxx::UInt32 num) const { - + if(m_impl->literalType == "email" || m_impl->literalType == "URI" || m_impl->literalType == "DNS" || @@ -216,28 +216,28 @@ /* Using OpenSSL to create certificate with krb5PrincipalName ---------------------------------------------------------- - + To make OpenSSL create certificate with krb5PrincipalName use `openssl.cnf' as described below. To see an complete example of creating client and KDC certificates, see the test-data generation script `lib/hx509/data/gen-req.sh' in the source-tree. The certicates it creates are used to test the PK-INIT functionality in `tests/kdc/check-kdc.in'. - + To use this example you have to use OpenSSL 0.9.8a or later. - - + + [user_certificate] subjectAltName=otherName:1.3.6.1.5.2.2;SEQUENCE:princ_name - + [princ_name] realm = EXP:0, GeneralString:MY.REALM principal_name = EXP:1, SEQUENCE:principal_seq - + [principal_seq] name_type = EXP:0, INTEGER:1 name_string = EXP:1, SEQUENCE:principals - + [principals] princ1 = GeneralString:userid */ @@ -254,7 +254,7 @@ StringArray sa = getValue().tokenize("@/"); String sectname1 = getValue()+String(num); - + if(sa.size() == 2) // primary@REALM { primary = sa[0]; @@ -273,7 +273,7 @@ } String sectname2 = primary+instance+String(num); String sectname3 = "basic"+primary+instance+String(num); - + String ret = "otherName:1.3.6.1.5.2.2;SEQUENCE:"+sectname1; ca.getConfig()->setValue(sectname1, "realm", "EXPLICIT:0, GeneralString:"+realm); @@ -288,7 +288,7 @@ } return ret; } - + return ""; } @@ -473,9 +473,9 @@ { StringArray result; result.append("LiteralValue::dump()"); - + result.append(m_impl->literalType + ":" + m_impl->literalValue); - + return result; } Modified: limal-head/limal-ca-mgm/src/LiteralValues_Priv.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/LiteralVa… ============================================================================== --- limal-head/limal-ca-mgm/src/LiteralValues_Priv.cpp (original) +++ limal-head/limal-ca-mgm/src/LiteralValues_Priv.cpp Wed Oct 17 14:18:38 2007 @@ -37,136 +37,136 @@ namespace { - typedef struct - { - ASN1_INTEGER *nametype; - STACK_OF(ASN1_GENERALSTRING) *namelist; - } KRB5_NAME; +typedef struct +{ + ASN1_INTEGER *nametype; + STACK_OF(ASN1_GENERALSTRING) *namelist; +} KRB5_NAME; - typedef struct - { - ASN1_GENERALSTRING *realm; - KRB5_NAME *kerberosname; - } KRB5_PRINC_NAME; - - ASN1_SEQUENCE(KRB5_NAME) = { - ASN1_EXP(KRB5_NAME, nametype, ASN1_INTEGER, 0), - ASN1_EXP_SEQUENCE_OF(KRB5_NAME, namelist, ASN1_GENERALSTRING , 1) - } ASN1_SEQUENCE_END(KRB5_NAME); - - - ASN1_SEQUENCE(KRB5_PRINC_NAME) = { - ASN1_EXP(KRB5_PRINC_NAME, realm, ASN1_GENERALSTRING, 0), - ASN1_EXP(KRB5_PRINC_NAME, kerberosname , KRB5_NAME, 1) - } ASN1_SEQUENCE_END(KRB5_PRINC_NAME); +typedef struct +{ + ASN1_GENERALSTRING *realm; + KRB5_NAME *kerberosname; +} KRB5_PRINC_NAME; +ASN1_SEQUENCE(KRB5_NAME) = { + ASN1_EXP(KRB5_NAME, nametype, ASN1_INTEGER, 0), + ASN1_EXP_SEQUENCE_OF(KRB5_NAME, namelist, ASN1_GENERALSTRING , 1) +} ASN1_SEQUENCE_END(KRB5_NAME); - IMPLEMENT_ASN1_FUNCTIONS(KRB5_NAME); - IMPLEMENT_ASN1_FUNCTIONS(KRB5_PRINC_NAME); - String asn1string2string(ASN1_STRING* str) - { - char *s = new char[str->length +1]; - memcpy(s, str->data, str->length); - s[str->length] = '\0'; - - String ret(s); - delete [] s; +ASN1_SEQUENCE(KRB5_PRINC_NAME) = { + ASN1_EXP(KRB5_PRINC_NAME, realm, ASN1_GENERALSTRING, 0), + ASN1_EXP(KRB5_PRINC_NAME, kerberosname , KRB5_NAME, 1) +} ASN1_SEQUENCE_END(KRB5_PRINC_NAME); - return ret; - } + +IMPLEMENT_ASN1_FUNCTIONS(KRB5_NAME); +IMPLEMENT_ASN1_FUNCTIONS(KRB5_PRINC_NAME); + +String asn1string2string(ASN1_STRING* str) +{ + char *s = new char[str->length +1]; + memcpy(s, str->data, str->length); + s[str->length] = '\0'; + + String ret(s); + delete [] s; + + return ret; +} } - + LiteralValue_Priv::LiteralValue_Priv() - : LiteralValue() + : LiteralValue() {} LiteralValue_Priv::LiteralValue_Priv(GENERAL_NAME *gen) - : LiteralValue() + : LiteralValue() { char oline[256]; unsigned char *p = NULL; int nid = 0; - + ASN1_OBJECT *id_ms_san_upn; ASN1_OBJECT *id_pkinit_san; -#define CREATE_OBJ_IF_NEEDED(oid, vn, sn, ln) \ - nid = OBJ_txt2nid(oid); \ - if (nid == NID_undef) { \ - nid = OBJ_create(oid, sn, ln); \ - if (nid == NID_undef) { \ - LOGIT_ERROR("Error creating oid object for " << oid); \ - return; \ - } \ - } \ - vn = OBJ_nid2obj(nid); - - CREATE_OBJ_IF_NEEDED("1.3.6.1.5.2.2", id_pkinit_san, - "id-pkinit-san", "KRB5PrincipalName"); +#define CREATE_OBJ_IF_NEEDED(oid, vn, sn, ln) \ + nid = OBJ_txt2nid(oid); \ + if (nid == NID_undef) { \ + nid = OBJ_create(oid, sn, ln); \ + if (nid == NID_undef) { \ + LOGIT_ERROR("Error creating oid object for " << oid); \ + return; \ +} \ +} \ + vn = OBJ_nid2obj(nid); + + CREATE_OBJ_IF_NEEDED("1.3.6.1.5.2.2", id_pkinit_san, + "id-pkinit-san", "KRB5PrincipalName"); CREATE_OBJ_IF_NEEDED("1.3.6.1.4.1.311.20.2.3", id_ms_san_upn, - "id-ms-san-upn", "Microsoft Universal Principal Name"); + "id-ms-san-upn", "Microsoft Universal Principal Name"); switch (gen->type) - { - case GEN_EMAIL: - setLiteral("email", asn1string2string(gen->d.ia5)); - break; - - case GEN_DNS: - setLiteral("DNS", asn1string2string(gen->d.ia5)); - break; - - case GEN_URI: - setLiteral("URI", asn1string2string(gen->d.ia5)); - break; - - case GEN_DIRNAME: - X509_NAME_oneline(gen->d.dirn, oline, 256); - setLiteral("DirName", oline); - break; - - case GEN_IPADD: - p = gen->d.ip->data; + { + case GEN_EMAIL: + setLiteral("email", asn1string2string(gen->d.ia5)); + break; + + case GEN_DNS: + setLiteral("DNS", asn1string2string(gen->d.ia5)); + break; + + case GEN_URI: + setLiteral("URI", asn1string2string(gen->d.ia5)); + break; + + case GEN_DIRNAME: + X509_NAME_oneline(gen->d.dirn, oline, 256); + setLiteral("DirName", oline); + break; + + case GEN_IPADD: + p = gen->d.ip->data; /* BUG: doesn't support IPV6 */ - if(gen->d.ip->length != 4) { - LOGIT_ERROR("Invalid IP Address: maybe IPv6"); - BLOCXX_THROW(limal::SyntaxException, "Invalid IP Address: maybe IPv6"); - break; - } - BIO_snprintf(oline, sizeof oline, - "%d.%d.%d.%d", p[0], p[1], p[2], p[3]); - setLiteral("IP", oline); + if(gen->d.ip->length != 4) { + LOGIT_ERROR("Invalid IP Address: maybe IPv6"); + BLOCXX_THROW(limal::SyntaxException, "Invalid IP Address: maybe IPv6"); break; - case GEN_RID: - i2t_ASN1_OBJECT(oline, 256, gen->d.rid); - setLiteral("RID", oline); - break; - case GEN_OTHERNAME: + } + BIO_snprintf(oline, sizeof oline, + "%d.%d.%d.%d", p[0], p[1], p[2], p[3]); + setLiteral("IP", oline); + break; + case GEN_RID: + i2t_ASN1_OBJECT(oline, 256, gen->d.rid); + setLiteral("RID", oline); + break; + case GEN_OTHERNAME: // krb5PrincipalName || Microsoft Universal Principal Name - if(OBJ_cmp(id_pkinit_san, gen->d.otherName->type_id) == 0) - { - decode_krb5_principal_name(gen->d.otherName->value->value.sequence->data, - gen->d.otherName->value->value.sequence->length); - } - else if (OBJ_cmp(id_ms_san_upn, gen->d.otherName->type_id) == 0) - { - setLiteral("1.3.6.1.4.1.311.20.2.3", (char*)gen->d.otherName->value->value.sequence->data); - } - else - { - setLiteral("othername", - String("unsupported(") + String(OBJ_obj2nid(gen->d.otherName->type_id)) + ")"); - } - break; - case GEN_X400: - setLiteral("X400Name", "unsupported"); - break; - case GEN_EDIPARTY: - setLiteral("EdiPartyName", "unsupported"); - break; + if(OBJ_cmp(id_pkinit_san, gen->d.otherName->type_id) == 0) + { + decode_krb5_principal_name(gen->d.otherName->value->value.sequence->data, + gen->d.otherName->value->value.sequence->length); + } + else if (OBJ_cmp(id_ms_san_upn, gen->d.otherName->type_id) == 0) + { + setLiteral("1.3.6.1.4.1.311.20.2.3", (char*)gen->d.otherName->value->value.sequence->data); + } + else + { + setLiteral("othername", + String("unsupported(") + String(OBJ_obj2nid(gen->d.otherName->type_id)) + ")"); + } + break; + case GEN_X400: + setLiteral("X400Name", "unsupported"); + break; + case GEN_EDIPARTY: + setLiteral("EdiPartyName", "unsupported"); + break; } } @@ -181,7 +181,7 @@ KRB5_PRINC_NAME *pname = NULL; const unsigned char *p; p = data; - + pname = d2i_KRB5_PRINC_NAME(NULL, &p, len); if(pname == NULL || @@ -191,13 +191,13 @@ { //ERR_print_errors_fp(stderr); LOGIT_ERROR("Unable to decode KRB5PrincipalName"); - + setLiteral("othername", String("unsupported(1.3.6.1.5.2.2)")); return; } String principal = ""; - + for(int i = 0; i < sk_ASN1_GENERALSTRING_num(pname->kerberosname->namelist); i++) { //LOGIT_DEBUG( "NAMELIST" << i << ":" << asn1string2string(sk_ASN1_GENERALSTRING_value(pname->kerberosname->namelist, i))); @@ -216,7 +216,6 @@ setLiteral("1.3.6.1.5.2.2", principal); p = NULL; } - } } Modified: limal-head/limal-ca-mgm/src/LiteralValues_Priv.hpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/LiteralVa… ============================================================================== --- limal-head/limal-ca-mgm/src/LiteralValues_Priv.hpp (original) +++ limal-head/limal-ca-mgm/src/LiteralValues_Priv.hpp Wed Oct 17 14:18:38 2007 @@ -33,16 +33,16 @@ namespace CA_MGM_NAMESPACE { - class LiteralValue_Priv : public LiteralValue { +class LiteralValue_Priv : public LiteralValue { - public: - LiteralValue_Priv(); - LiteralValue_Priv(GENERAL_NAME *gen); - virtual ~LiteralValue_Priv(); - - private: - void decode_krb5_principal_name(unsigned char* data, int len); - }; +public: + LiteralValue_Priv(); + LiteralValue_Priv(GENERAL_NAME *gen); + virtual ~LiteralValue_Priv(); + +private: + void decode_krb5_principal_name(unsigned char* data, int len); +}; } } Modified: limal-head/limal-ca-mgm/src/LocalManagement.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/LocalMana… ============================================================================== --- limal-head/limal-ca-mgm/src/LocalManagement.cpp (original) +++ limal-head/limal-ca-mgm/src/LocalManagement.cpp Wed Oct 17 14:18:38 2007 @@ -45,15 +45,15 @@ using namespace blocxx; namespace { - inline blocxx::String errno2String(int e) { +inline blocxx::String errno2String(int e) { // FIXME: make strerror working - blocxx::String s = System::errorMsg(e); - s = "(" + blocxx::String(e) + ")"; - return s; - } +blocxx::String s = System::errorMsg(e); +s = "(" + blocxx::String(e) + ")"; +return s; +} } -void +void LocalManagement::importAsLocalCertificate(const String &pkcs12File, const String &password, const String &destinationCAsDir, @@ -61,9 +61,9 @@ const String &destinationKeyFile) { - importAsLocalCertificate(readFile(pkcs12File), - password, destinationCAsDir, - destinationCertFile, destinationKeyFile); + importAsLocalCertificate(readFile(pkcs12File), + password, destinationCAsDir, + destinationCertFile, destinationKeyFile); } @@ -76,422 +76,422 @@ { ByteBuffer out = OpenSSLUtils::pkcs12ToPEM(pkcs12Data, password, ""); - String data(out.data(), out.size()); - - Array< Map<String, String> > list; - - String info; - String cert; - String subject; - String issuer; - String keyID; - - StringArray dataList = PerlRegEx("\n").split(data); - - if(dataList.size() <= 1) { - - LOGIT_ERROR("Cannot split certificate output"); - BLOCXX_THROW(limal::RuntimeException, - __("Cannot split certificate output.")); - - } - - PerlRegEx endRegex("^[-]{5}END[ ]([A-Z0-9 ]+)+[-]{5}$"); - PerlRegEx beginRegex("^[-]{5}BEGIN[ ]([A-Z0-9 ]+)+[-]{5}$"); - PerlRegEx keyIDRegex("^\\s+localKeyID:\\s*([0-9a-fA-F\\s]+)\\s*$"); - PerlRegEx subjectRegex("^subject=(.*)\\s*$"); - PerlRegEx issuerRegex("^issuer=(.*)\\s*$"); - - StringArray::const_iterator lineIT = dataList.begin() + 1; - - for(; lineIT != dataList.end(); ++lineIT) { - - if(!info.empty()) { - - cert += (*lineIT)+"\n"; - - if(endRegex.match(*lineIT)) { - - StringArray ia = endRegex.capture(*lineIT); - if(ia.size() == 2 && ia[1] == info) { - - Map<String, String> v; - v["info"] = info; - v["data"] = cert; - v["keyID"] = keyID; - v["subject"] = subject; - v["issuer"] = issuer; - - list.push_back(v); - - LOGIT_DEBUG(">>>> SAVE MAP: \ninfo = " << info << - "\ndata = " << cert << - "\nkeyID = " << keyID << - "\nsubject = " << subject << - "\nissuer = " << issuer); - - } - - info.erase(); - cert.erase(); - keyID.erase(); - subject.erase(); - issuer.erase(); - } - } else { - - if(beginRegex.match(*lineIT)) { - - StringArray ia = beginRegex.capture(*lineIT); - if(ia.size() == 2 ) { - - info = ia[1]; - cert += (*lineIT)+"\n"; - - } else { - LOGIT_DEBUG("Problem with beginRegex size:" << ia.size()); + String data(out.data(), out.size()); + + Array< Map<String, String> > list; + + String info; + String cert; + String subject; + String issuer; + String keyID; + + StringArray dataList = PerlRegEx("\n").split(data); + + if(dataList.size() <= 1) { + + LOGIT_ERROR("Cannot split certificate output"); + BLOCXX_THROW(limal::RuntimeException, + __("Cannot split certificate output.")); + + } + + PerlRegEx endRegex("^[-]{5}END[ ]([A-Z0-9 ]+)+[-]{5}$"); + PerlRegEx beginRegex("^[-]{5}BEGIN[ ]([A-Z0-9 ]+)+[-]{5}$"); + PerlRegEx keyIDRegex("^\\s+localKeyID:\\s*([0-9a-fA-F\\s]+)\\s*$"); + PerlRegEx subjectRegex("^subject=(.*)\\s*$"); + PerlRegEx issuerRegex("^issuer=(.*)\\s*$"); + + StringArray::const_iterator lineIT = dataList.begin() + 1; + + for(; lineIT != dataList.end(); ++lineIT) { + + if(!info.empty()) { + + cert += (*lineIT)+"\n"; + + if(endRegex.match(*lineIT)) { + + StringArray ia = endRegex.capture(*lineIT); + if(ia.size() == 2 && ia[1] == info) { + + Map<String, String> v; + v["info"] = info; + v["data"] = cert; + v["keyID"] = keyID; + v["subject"] = subject; + v["issuer"] = issuer; + + list.push_back(v); + + LOGIT_DEBUG(">>>> SAVE MAP: \ninfo = " << info << + "\ndata = " << cert << + "\nkeyID = " << keyID << + "\nsubject = " << subject << + "\nissuer = " << issuer); + + } + + info.erase(); + cert.erase(); + keyID.erase(); + subject.erase(); + issuer.erase(); + } + } else { + + if(beginRegex.match(*lineIT)) { + + StringArray ia = beginRegex.capture(*lineIT); + if(ia.size() == 2 ) { + + info = ia[1]; + cert += (*lineIT)+"\n"; + + } else { + LOGIT_DEBUG("Problem with beginRegex size:" << ia.size()); // FIXME: do something here ? - } - } else { - - if(keyIDRegex.match(*lineIT)) { - - StringArray ia = keyIDRegex.capture(*lineIT); - if(ia.size() == 2 ) { - - keyID = ia[1]; - - } else { - LOGIT_DEBUG("Problem with keyIDRegex size:" << ia.size()); + } + } else { + + if(keyIDRegex.match(*lineIT)) { + + StringArray ia = keyIDRegex.capture(*lineIT); + if(ia.size() == 2 ) { + + keyID = ia[1]; + + } else { + LOGIT_DEBUG("Problem with keyIDRegex size:" << ia.size()); // FIXME: do something here ? - } - } else if(subjectRegex.match(*lineIT)) { - - StringArray ia = subjectRegex.capture(*lineIT); - if(ia.size() == 2 ) { - - subject = ia[1]; - - } else { - LOGIT_DEBUG("Problem with subjectRegex size:" << ia.size()); + } + } else if(subjectRegex.match(*lineIT)) { + + StringArray ia = subjectRegex.capture(*lineIT); + if(ia.size() == 2 ) { + + subject = ia[1]; + + } else { + LOGIT_DEBUG("Problem with subjectRegex size:" << ia.size()); // FIXME: do something here ? - } - } else if(issuerRegex.match(*lineIT)) { - - StringArray ia = issuerRegex.capture(*lineIT); - if(ia.size() == 2 ) { - - issuer = ia[1]; - - } else { - LOGIT_DEBUG("Problem with issuerRegex size:" << ia.size()); + } + } else if(issuerRegex.match(*lineIT)) { + + StringArray ia = issuerRegex.capture(*lineIT); + if(ia.size() == 2 ) { + + issuer = ia[1]; + + } else { + LOGIT_DEBUG("Problem with issuerRegex size:" << ia.size()); // FIXME: do something here ? - } - } else { - LOGIT_DEBUG("Unknown line:" << *lineIT); - } - } - } - } - - keyID.erase(); - - String serverCertIssuer; - - String serverCert; - String serverKey; - String srvIssuerCert; - Array<String> restCA; + } + } else { + LOGIT_DEBUG("Unknown line:" << *lineIT); + } + } + } + } + + keyID.erase(); + + String serverCertIssuer; + + String serverCert; + String serverKey; + String srvIssuerCert; + Array<String> restCA; // search for the server certificate - - Array< Map<String, String> >::iterator certMap = list.begin(); - for(; certMap != list.end(); ++certMap) { + Array< Map<String, String> >::iterator certMap = list.begin(); + + for(; certMap != list.end(); ++certMap) { - Map<String, String>::iterator keyIT = (*certMap).find("keyID"); - Map<String, String>::iterator subjectIT = (*certMap).find("subject"); + Map<String, String>::iterator keyIT = (*certMap).find("keyID"); + Map<String, String>::iterator subjectIT = (*certMap).find("subject"); - if( keyIT != (*certMap).end() && - !((*keyIT).second.empty()) && - subjectIT != (*certMap).end() && - !((*subjectIT).second.empty()) ) { - - keyID = (*keyIT).second; - serverCertIssuer = (*(*certMap).find("issuer")).second; - serverCert = (*(*certMap).find("data")).second; - (*(*certMap).find("data")).second.erase(); - (*(*certMap).find("keyID")).second.erase(); - break; - } - } + if( keyIT != (*certMap).end() && + !((*keyIT).second.empty()) && + subjectIT != (*certMap).end() && + !((*subjectIT).second.empty()) ) { + + keyID = (*keyIT).second; + serverCertIssuer = (*(*certMap).find("issuer")).second; + serverCert = (*(*certMap).find("data")).second; + (*(*certMap).find("data")).second.erase(); + (*(*certMap).find("keyID")).second.erase(); + break; + } + } // search for the private key - certMap = list.begin(); + certMap = list.begin(); + + for(; certMap != list.end(); ++certMap) { - for(; certMap != list.end(); ++certMap) { - - Map<String, String>::iterator keyIT = (*certMap).find("keyID"); - - if( keyIT != (*certMap).end() && - (*keyIT).second == keyID ) { - - serverKey = (*(*certMap).find("data")).second; - (*(*certMap).find("data")).second.erase(); - break; - } - } + Map<String, String>::iterator keyIT = (*certMap).find("keyID"); + + if( keyIT != (*certMap).end() && + (*keyIT).second == keyID ) { + + serverKey = (*(*certMap).find("data")).second; + (*(*certMap).find("data")).second.erase(); + break; + } + } // search for the ca which issuered the server certificate - certMap = list.begin(); - - for(; certMap != list.end(); ++certMap) { - - Map<String, String>::iterator subjectIT = (*certMap).find("subject"); - - if( subjectIT != (*certMap).end() && - (*subjectIT).second == serverCertIssuer ) { - - srvIssuerCert = (*(*certMap).find("data")).second; - (*(*certMap).find("data")).second.erase(); - break; - } - } + certMap = list.begin(); + + for(; certMap != list.end(); ++certMap) { + + Map<String, String>::iterator subjectIT = (*certMap).find("subject"); + + if( subjectIT != (*certMap).end() && + (*subjectIT).second == serverCertIssuer ) { + + srvIssuerCert = (*(*certMap).find("data")).second; + (*(*certMap).find("data")).second.erase(); + break; + } + } // collect the rest CAs - certMap = list.begin(); - - for(; certMap != list.end(); ++certMap) { - - Map<String, String>::iterator dataIT = (*certMap).find("data"); - - if( dataIT != (*certMap).end() && - !(*dataIT).second.empty() ) { - - restCA.push_back( (*dataIT).second ); - - } - } - - if(!serverCert.empty() && !serverKey.empty()) { - - path::PathName pn(destinationCertFile); - path::PathInfo pi(pn.dirName()); - - if(!pi.exists()) { - - int r = createDirRecursive(pi.path()); - - if(r != 0) { - - LOGIT_ERROR("Cannot create directory '" << pi.toString() << "' :" << errno2String(r)); - BLOCXX_THROW(limal::SystemException, - Format(__("Cannot create directory %1: %2."), - pi.toString(), errno2String(r)).c_str()); - - } - } - - writeFile(ByteBuffer(serverCert.c_str(), serverCert.length()), - destinationCertFile); - - - pn = path::PathName(destinationKeyFile); - pi.stat(pn.dirName()); - - if(!pi.exists()) { - - int r = createDirRecursive(pi.path()); - - if(r != 0) { - - LOGIT_ERROR("Cannot create directory '" << pi.toString() << "' :" << errno2String(r)); - BLOCXX_THROW(limal::SystemException, - Format(__("Cannot create directory %1: %2."), - pi.toString(), errno2String(r)).c_str()); - - } - } - - writeFile(ByteBuffer(serverKey.c_str(), serverKey.length()), - destinationKeyFile, true, 0600); - - - pi.stat(destinationCAsDir); - if(!pi.exists() ) { - - int r = createDirRecursive(pi.path()); - - if(r != 0) { - - LOGIT_ERROR("Cannot create directory '" << pi.toString() << "' :" << errno2String(r)); - BLOCXX_THROW(limal::SystemException, - Format(__("Cannot create directory %1: %2."), - pi.toString(), errno2String(r)).c_str()); - - } - } - - if(!srvIssuerCert.empty()) { - - pi.stat(destinationCAsDir); - - if(!pi.isDir()) { - - LOGIT_ERROR( "'" << pi.toString() <<"' is not a directory"); - BLOCXX_THROW(limal::ValueException, - Format(__("%1 is not a directory."), pi.toString()).c_str()); - - } - - writeFile(ByteBuffer(srvIssuerCert.c_str(), srvIssuerCert.length()), - pi.toString() + "/YaST-CA.pem"); - - for(uint i = 0; i < restCA.size(); ++i) { - - writeFile(ByteBuffer(restCA[i].c_str(), restCA[i].length()), - pi.toString() + "/YaST-CA-" + String(i) + ".pem"); - } - - rehashCAs(pi.toString()); - - } - - } else { - - LOGIT_ERROR("Invalid certificate file."); - BLOCXX_THROW(limal::SyntaxException, - __("Invalid certificate file.")); - } + certMap = list.begin(); + + for(; certMap != list.end(); ++certMap) { + + Map<String, String>::iterator dataIT = (*certMap).find("data"); + + if( dataIT != (*certMap).end() && + !(*dataIT).second.empty() ) { + + restCA.push_back( (*dataIT).second ); + + } + } + + if(!serverCert.empty() && !serverKey.empty()) { + + path::PathName pn(destinationCertFile); + path::PathInfo pi(pn.dirName()); + + if(!pi.exists()) { + + int r = createDirRecursive(pi.path()); + + if(r != 0) { + + LOGIT_ERROR("Cannot create directory '" << pi.toString() << "' :" << errno2String(r)); + BLOCXX_THROW(limal::SystemException, + Format(__("Cannot create directory %1: %2."), + pi.toString(), errno2String(r)).c_str()); + + } + } + + writeFile(ByteBuffer(serverCert.c_str(), serverCert.length()), + destinationCertFile); + + + pn = path::PathName(destinationKeyFile); + pi.stat(pn.dirName()); + + if(!pi.exists()) { + + int r = createDirRecursive(pi.path()); + + if(r != 0) { + + LOGIT_ERROR("Cannot create directory '" << pi.toString() << "' :" << errno2String(r)); + BLOCXX_THROW(limal::SystemException, + Format(__("Cannot create directory %1: %2."), + pi.toString(), errno2String(r)).c_str()); + + } + } + + writeFile(ByteBuffer(serverKey.c_str(), serverKey.length()), + destinationKeyFile, true, 0600); + + + pi.stat(destinationCAsDir); + if(!pi.exists() ) { + + int r = createDirRecursive(pi.path()); + + if(r != 0) { + + LOGIT_ERROR("Cannot create directory '" << pi.toString() << "' :" << errno2String(r)); + BLOCXX_THROW(limal::SystemException, + Format(__("Cannot create directory %1: %2."), + pi.toString(), errno2String(r)).c_str()); + + } + } + + if(!srvIssuerCert.empty()) { + + pi.stat(destinationCAsDir); + + if(!pi.isDir()) { + + LOGIT_ERROR( "'" << pi.toString() <<"' is not a directory"); + BLOCXX_THROW(limal::ValueException, + Format(__("%1 is not a directory."), pi.toString()).c_str()); + + } + + writeFile(ByteBuffer(srvIssuerCert.c_str(), srvIssuerCert.length()), + pi.toString() + "/YaST-CA.pem"); + + for(uint i = 0; i < restCA.size(); ++i) { + + writeFile(ByteBuffer(restCA[i].c_str(), restCA[i].length()), + pi.toString() + "/YaST-CA-" + String(i) + ".pem"); + } + + rehashCAs(pi.toString()); + + } + + } else { + + LOGIT_ERROR("Invalid certificate file."); + BLOCXX_THROW(limal::SyntaxException, + __("Invalid certificate file.")); + } } -void +void LocalManagement::importCommonServerCertificate(const String &pkcs12File, const String &password) { - importAsLocalCertificate(readFile(pkcs12File), - password, - "/etc/ssl/certs/", - "/etc/ssl/servercerts/servercert.pem", - "/etc/ssl/servercerts/serverkey.pem"); +importAsLocalCertificate(readFile(pkcs12File), + password, + "/etc/ssl/certs/", + "/etc/ssl/servercerts/servercert.pem", + "/etc/ssl/servercerts/serverkey.pem"); } void LocalManagement::importCommonServerCertificate(const ByteBuffer &pkcs12Data, const String &password) { - importAsLocalCertificate(pkcs12Data, - password, - "/etc/ssl/certs/", - "/etc/ssl/servercerts/servercert.pem", - "/etc/ssl/servercerts/serverkey.pem"); + importAsLocalCertificate(pkcs12Data, + password, + "/etc/ssl/certs/", + "/etc/ssl/servercerts/servercert.pem", + "/etc/ssl/servercerts/serverkey.pem"); } CertificateData LocalManagement::getCertificate(const String &file, FormatType type) { - return CertificateData_Priv(file, type); + return CertificateData_Priv(file, type); } RequestData LocalManagement::getRequest(const String &file, FormatType type) { - return RequestData_Priv(file, type); + return RequestData_Priv(file, type); } CRLData LocalManagement::getCRL(const String &file, FormatType type) { - return CRLData_Priv(file, type); + return CRLData_Priv(file, type); } CertificateData LocalManagement::getCertificate(const ByteBuffer &data, FormatType type) { - return CertificateData_Priv(data, type); + return CertificateData_Priv(data, type); } - + RequestData LocalManagement::getRequest(const ByteBuffer &data, FormatType type) { - return RequestData_Priv(data, type); + return RequestData_Priv(data, type); } - + CRLData LocalManagement::getCRL(const ByteBuffer &data, FormatType type) { - return CRLData_Priv(data, type); + return CRLData_Priv(data, type); } ByteBuffer LocalManagement::readFile(const String& file) { - path::PathInfo filePi(file); - if(!filePi.exists()) { + path::PathInfo filePi(file); + if(!filePi.exists()) { + + LOGIT_ERROR("File not found: " << filePi.toString()); + BLOCXX_THROW_ERR(limal::RuntimeException, + Format(__("File not found: %1."), filePi.toString()).c_str(), + E_FILE_NOT_FOUND); + + } - LOGIT_ERROR("File not found: " << filePi.toString()); - BLOCXX_THROW_ERR(limal::RuntimeException, - Format(__("File not found: %1."), filePi.toString()).c_str(), - E_FILE_NOT_FOUND); - - } - - if(filePi.size() > (1024*1024)) { - - LOGIT_ERROR("File too big: " << filePi.toString()); - BLOCXX_THROW(limal::RuntimeException, - Format(__("File too big: %1."), filePi.toString()).c_str()); - - } - - int fd = ::open(file.c_str(), O_RDONLY); - if(fd == -1) { - - LOGIT_ERROR("Cannot open file: " << file << "(" << errno << ")"); - BLOCXX_THROW_ERRNO_MSG1(limal::SystemException, - Format(__("Cannot open file %1."), file).c_str(), - errno); - - } - - File fileObject(fd); - ByteBuffer ret; - size_t i = 1; - - while( i != 0 ) { - char *buf = new char[1025]; - i = fileObject.read(buf, 1024); - - if(i == size_t(-1)) { - - delete(buf); - fileObject.close(); - - LOGIT_ERROR("Cannot read from file: " << file << "(" << errno << ")"); - BLOCXX_THROW_ERRNO_MSG1(limal::SystemException, - Format(__("Cannot read from file %1."), file).c_str(), - errno); - } - - ret.append(buf, i); - - delete [] buf; - } + if(filePi.size() > (1024*1024)) { - fileObject.close(); + LOGIT_ERROR("File too big: " << filePi.toString()); + BLOCXX_THROW(limal::RuntimeException, + Format(__("File too big: %1."), filePi.toString()).c_str()); - return ret; + } + + int fd = ::open(file.c_str(), O_RDONLY); + if(fd == -1) { + + LOGIT_ERROR("Cannot open file: " << file << "(" << errno << ")"); + BLOCXX_THROW_ERRNO_MSG1(limal::SystemException, + Format(__("Cannot open file %1."), file).c_str(), + errno); + + } + + File fileObject(fd); + ByteBuffer ret; + size_t i = 1; + + while( i != 0 ) { + char *buf = new char[1025]; + i = fileObject.read(buf, 1024); + + if(i == size_t(-1)) { + + delete(buf); + fileObject.close(); + + LOGIT_ERROR("Cannot read from file: " << file << "(" << errno << ")"); + BLOCXX_THROW_ERRNO_MSG1(limal::SystemException, + Format(__("Cannot read from file %1."), file).c_str(), + errno); + } + + ret.append(buf, i); + + delete [] buf; + } + + fileObject.close(); + + return ret; } void @@ -500,61 +500,61 @@ bool overwrite, mode_t mode) { - path::PathInfo pi(file); - if(pi.exists() && !overwrite) { - - LOGIT_ERROR ("File already exists: " << file ); - BLOCXX_THROW_ERR(limal::SystemException, - Format(__("File already exists: %1."), file).c_str(), - E_FILE_EXISTS); - - } - - int fd = ::open(file.c_str(), O_CREAT|O_TRUNC|O_WRONLY, mode); - if(fd == -1) { - - LOGIT_ERROR("Cannot open file: " << file << "(" << errno << ")"); - BLOCXX_THROW_ERRNO_MSG1(limal::SystemException, - Format(__("Cannot open file %1."), file).c_str(), - errno); - - } - - File fileObject(fd); - - int r = fileObject.getLock(); - if(r != 0) { - - LOGIT_ERROR("Cannot get lock on file: " << file << "(" << errno << ")"); - BLOCXX_THROW_ERRNO_MSG1(limal::SystemException, - Format(__("Cannot get lock on file %1."), file).c_str(), - errno); - - } - - size_t st = fileObject.write(data.data(), data.size()); - - if(st == size_t(-1)) { - - fileObject.unlock(); - fileObject.close(); - - LOGIT_ERROR("Cannot write to file: " << file << "(" << errno << ")"); - BLOCXX_THROW_ERRNO_MSG1(limal::SystemException, - Format(__("Cannot write to file %1."), file).c_str(), - errno); - } - - fileObject.flush(); - fileObject.unlock(); - fileObject.close(); + path::PathInfo pi(file); + if(pi.exists() && !overwrite) { + + LOGIT_ERROR ("File already exists: " << file ); + BLOCXX_THROW_ERR(limal::SystemException, + Format(__("File already exists: %1."), file).c_str(), + E_FILE_EXISTS); + + } + + int fd = ::open(file.c_str(), O_CREAT|O_TRUNC|O_WRONLY, mode); + if(fd == -1) { + + LOGIT_ERROR("Cannot open file: " << file << "(" << errno << ")"); + BLOCXX_THROW_ERRNO_MSG1(limal::SystemException, + Format(__("Cannot open file %1."), file).c_str(), + errno); + + } + + File fileObject(fd); + + int r = fileObject.getLock(); + if(r != 0) { + + LOGIT_ERROR("Cannot get lock on file: " << file << "(" << errno << ")"); + BLOCXX_THROW_ERRNO_MSG1(limal::SystemException, + Format(__("Cannot get lock on file %1."), file).c_str(), + errno); + + } + + size_t st = fileObject.write(data.data(), data.size()); + + if(st == size_t(-1)) { + + fileObject.unlock(); + fileObject.close(); + + LOGIT_ERROR("Cannot write to file: " << file << "(" << errno << ")"); + BLOCXX_THROW_ERRNO_MSG1(limal::SystemException, + Format(__("Cannot write to file %1."), file).c_str(), + errno); + } + + fileObject.flush(); + fileObject.unlock(); + fileObject.close(); } ByteBuffer LocalManagement::x509Convert(const ByteBuffer &certificate, FormatType inform, FormatType outform) { - return OpenSSLUtils::x509Convert(certificate, inform, outform); + return OpenSSLUtils::x509Convert(certificate, inform, outform); } ByteBuffer @@ -584,7 +584,7 @@ { return OpenSSLUtils::reqConvert(req, inform, outform); } - + ByteBuffer LocalManagement::createPKCS12(const ByteBuffer &certificate, const ByteBuffer &key, @@ -608,6 +608,5 @@ outPassword, algorithm); } - } } Modified: limal-head/limal-ca-mgm/src/OpenSSLUtils.hpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/OpenSSLUt… ============================================================================== --- limal-head/limal-ca-mgm/src/OpenSSLUtils.hpp (original) +++ limal-head/limal-ca-mgm/src/OpenSSLUtils.hpp Wed Oct 17 14:18:38 2007 @@ -19,7 +19,7 @@ /** * @file OpenSSLUtils.hpp * @brief This file is private for the ca-mgm library. - * It defines functions from openssl + * It defines functions from openssl */ #ifndef LIMAL_CA_MGM_OPENSSL_UTILS_HPP #define LIMAL_CA_MGM_OPENSSL_UTILS_HPP @@ -36,179 +36,179 @@ namespace CA_MGM_NAMESPACE { - class OpenSSLUtils { +class OpenSSLUtils { - public: +public: + + OpenSSLUtils(const blocxx::String &onfigFile, + const blocxx::String &command = OPENSSL_COMMAND, + const blocxx::String &tmpDir = "/tmp/"); + + void createRSAKey(const blocxx::String &outFile, + const blocxx::String &password, + blocxx::UInt32 bits = 2048, + const blocxx::String &cryptAlgorithm = "des3"); + + void createRequest(const DNObject &dn, + const blocxx::String &outFile, + const blocxx::String &keyFile, + const blocxx::String &password, + const blocxx::String &extension, + FormatType outForm = E_PEM, + const blocxx::String &challengePassword = "", + const blocxx::String &unstructuredName = ""); + + void createSelfSignedCertificate(const blocxx::String &outFile, + const blocxx::String &keyFile, + const blocxx::String &requestFile, + const blocxx::String &password, + const blocxx::String &extension, + const blocxx::UInt32 days, + bool noEmailDN = false); + + void signRequest(const blocxx::String &requestFile, + const blocxx::String &outFile, + const blocxx::String &caKeyFile, + const blocxx::String &caPassword, + const blocxx::String &extension, + const blocxx::String &startDate, + const blocxx::String &endDate, + const blocxx::String &caSection, + const blocxx::String &outDir = "", + bool noEmailDN = false, + bool noUniqueDN = false, + bool noText = true); + + void revokeCertificate(const blocxx::String &caCertFile, + const blocxx::String &caKeyFile, + const blocxx::String &caPassword, + const blocxx::String &certFile, + const CRLReason &reason = CRLReason(), + bool noUniqueDN = false); + + void issueCRL(const blocxx::String &caCertFile, + const blocxx::String &caKeyFile, + const blocxx::String &caPassword, + blocxx::UInt32 hours, + const blocxx::String &outfile, + const blocxx::String &extension, + bool noUniqueDN = false); + + void updateDB(const blocxx::String &caCertFile, + const blocxx::String &caKeyFile, + const blocxx::String &caPassword); + + blocxx::String verify(const blocxx::String &certFile, + const blocxx::String &caPath, + bool crlCheck = false, + const blocxx::String &purpose = ""); + + blocxx::String status(const blocxx::String &serial); + + bool checkKey(const blocxx::String &caName, + const blocxx::String &password, + const blocxx::String &certificateName = "cacert", + const blocxx::String &repository = REPOSITORY); - OpenSSLUtils(const blocxx::String &onfigFile, - const blocxx::String &command = OPENSSL_COMMAND, - const blocxx::String &tmpDir = "/tmp/"); - - void createRSAKey(const blocxx::String &outFile, - const blocxx::String &password, - blocxx::UInt32 bits = 2048, - const blocxx::String &cryptAlgorithm = "des3"); - - void createRequest(const DNObject &dn, - const blocxx::String &outFile, - const blocxx::String &keyFile, - const blocxx::String &password, - const blocxx::String &extension, - FormatType outForm = E_PEM, - const blocxx::String &challengePassword = "", - const blocxx::String &unstructuredName = ""); - - void createSelfSignedCertificate(const blocxx::String &outFile, - const blocxx::String &keyFile, - const blocxx::String &requestFile, - const blocxx::String &password, - const blocxx::String &extension, - const blocxx::UInt32 days, - bool noEmailDN = false); - - void signRequest(const blocxx::String &requestFile, - const blocxx::String &outFile, - const blocxx::String &caKeyFile, - const blocxx::String &caPassword, - const blocxx::String &extension, - const blocxx::String &startDate, - const blocxx::String &endDate, - const blocxx::String &caSection, - const blocxx::String &outDir = "", - bool noEmailDN = false, - bool noUniqueDN = false, - bool noText = true); - - void revokeCertificate(const blocxx::String &caCertFile, - const blocxx::String &caKeyFile, - const blocxx::String &caPassword, - const blocxx::String &certFile, - const CRLReason &reason = CRLReason(), - bool noUniqueDN = false); - - void issueCRL(const blocxx::String &caCertFile, - const blocxx::String &caKeyFile, - const blocxx::String &caPassword, - blocxx::UInt32 hours, - const blocxx::String &outfile, - const blocxx::String &extension, - bool noUniqueDN = false); - - void updateDB(const blocxx::String &caCertFile, - const blocxx::String &caKeyFile, - const blocxx::String &caPassword); - - blocxx::String verify(const blocxx::String &certFile, - const blocxx::String &caPath, - bool crlCheck = false, - const blocxx::String &purpose = ""); - - blocxx::String status(const blocxx::String &serial); - - bool checkKey(const blocxx::String &caName, - const blocxx::String &password, - const blocxx::String &certificateName = "cacert", - const blocxx::String &repository = REPOSITORY); - // ################################################### // ### static functions // ################################################### - static ByteBuffer - x509Convert(const ByteBuffer &certificate, - FormatType inform, - FormatType outform ); - - static ByteBuffer - rsaConvert(const ByteBuffer &key, - FormatType inform, - FormatType outform, - const String &inPassword, - const String &outPassword, - const String &algorithm = "des3" ); - - static ByteBuffer - crlConvert(const ByteBuffer &crl, - FormatType inform, - FormatType outform ); - - static ByteBuffer - reqConvert(const ByteBuffer &req, - FormatType inform, - FormatType outform ); + static ByteBuffer + x509Convert(const ByteBuffer &certificate, + FormatType inform, + FormatType outform ); + + static ByteBuffer + rsaConvert(const ByteBuffer &key, + FormatType inform, + FormatType outform, + const String &inPassword, + const String &outPassword, + const String &algorithm = "des3" ); + + static ByteBuffer + crlConvert(const ByteBuffer &crl, + FormatType inform, + FormatType outform ); + + static ByteBuffer + reqConvert(const ByteBuffer &req, + FormatType inform, + FormatType outform ); /** * certificate and key has to be in PEM format */ - static ByteBuffer - createPKCS12(const ByteBuffer &certificate, - const ByteBuffer &key, - const String &inPassword, - const String &outPassword, - const ByteBuffer &caCert, - const String &caPath, - bool withChain ); + static ByteBuffer + createPKCS12(const ByteBuffer &certificate, + const ByteBuffer &key, + const String &inPassword, + const String &outPassword, + const ByteBuffer &caCert, + const String &caPath, + bool withChain ); /** * PKCS12 => PEM format */ - static ByteBuffer - pkcs12ToPEM(const ByteBuffer &pkcs12, - const String &inPassword, - const String &outPassword, - const String &algorithm = "des3"); - - static blocxx::Array<blocxx::String> - listCA(const String &repository = REPOSITORY); - - static blocxx::String - nextSerial(const String &serialFile); - - static void - addCAM(const String &caName, - const String &md5, - const String &dnString, - const String &repository = REPOSITORY); - - static void - delCAM(const String &caName, - const String &md5, - const String &repository = REPOSITORY); - - static blocxx::Array<blocxx::Array<blocxx::String> > - parseCAMDB(const String &caName, - const String &repository = REPOSITORY); - - static blocxx::Array<blocxx::Array<blocxx::String> > - parseIndexTXT(const String &caName, - const String &repository = REPOSITORY); - - static blocxx::Array<blocxx::Map<blocxx::String, blocxx::String> > - listRequests(const String &caName, - const String &repository = REPOSITORY); - - static blocxx::Array<blocxx::Map<blocxx::String, blocxx::String> > - listCertificates(const String &caName, - const String &repository = REPOSITORY); - - static void - createCaInfrastructure(const String &caName, - const String &repository = REPOSITORY); - - private: - - blocxx::String m_cmd; - blocxx::String m_tmp; - blocxx::String m_conf; - blocxx::String m_rand; - - OpenSSLUtils(); - OpenSSLUtils(const OpenSSLUtils&); - - OpenSSLUtils& operator=(const OpenSSLUtils&); + static ByteBuffer + pkcs12ToPEM(const ByteBuffer &pkcs12, + const String &inPassword, + const String &outPassword, + const String &algorithm = "des3"); + + static blocxx::Array<blocxx::String> + listCA(const String &repository = REPOSITORY); + + static blocxx::String + nextSerial(const String &serialFile); + + static void + addCAM(const String &caName, + const String &md5, + const String &dnString, + const String &repository = REPOSITORY); + + static void + delCAM(const String &caName, + const String &md5, + const String &repository = REPOSITORY); + + static blocxx::Array<blocxx::Array<blocxx::String> > + parseCAMDB(const String &caName, + const String &repository = REPOSITORY); + + static blocxx::Array<blocxx::Array<blocxx::String> > + parseIndexTXT(const String &caName, + const String &repository = REPOSITORY); + + static blocxx::Array<blocxx::Map<blocxx::String, blocxx::String> > + listRequests(const String &caName, + const String &repository = REPOSITORY); + + static blocxx::Array<blocxx::Map<blocxx::String, blocxx::String> > + listCertificates(const String &caName, + const String &repository = REPOSITORY); + + static void + createCaInfrastructure(const String &caName, + const String &repository = REPOSITORY); + +private: + + blocxx::String m_cmd; + blocxx::String m_tmp; + blocxx::String m_conf; + blocxx::String m_rand; + + OpenSSLUtils(); + OpenSSLUtils(const OpenSSLUtils&); + + OpenSSLUtils& operator=(const OpenSSLUtils&); - }; +}; } } Modified: limal-head/limal-ca-mgm/src/RequestData.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/RequestDa… ============================================================================== --- limal-head/limal-ca-mgm/src/RequestData.cpp (original) +++ limal-head/limal-ca-mgm/src/RequestData.cpp Wed Oct 17 14:18:38 2007 @@ -41,7 +41,7 @@ RequestData::RequestData(const RequestData& data) : m_impl(data.m_impl) {} - + RequestData::~RequestData() {} @@ -143,7 +143,7 @@ String extText = String((const char*)ustringval, n); BIO_free(bio); - + return extText; } @@ -202,12 +202,12 @@ { StringArray result; result.append("RequestData::dump()"); - + result.append("Version = " + String(m_impl->version)); result.appendArray(m_impl->subject.dump()); result.append("Keysize = " + String(m_impl->keysize)); result.append("pubkeyAlgorithm = " + String(m_impl->pubkeyAlgorithm)); - + String pk; for(size_t i = 0; i < m_impl->publicKey.size(); ++i) { @@ -216,7 +216,7 @@ pk += s + ":"; } result.append("public Key = " + pk); - + result.append("signatureAlgorithm = "+ String(m_impl->signatureAlgorithm)); String s; @@ -232,7 +232,7 @@ result.appendArray(m_impl->extensions.dump()); result.append("Challenge Password = " + m_impl->challengePassword); result.append("Unstructured Name = " + m_impl->unstructuredName); - + return result; } Modified: limal-head/limal-ca-mgm/src/RequestDataImpl.hpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/RequestDa… ============================================================================== --- limal-head/limal-ca-mgm/src/RequestDataImpl.hpp (original) +++ limal-head/limal-ca-mgm/src/RequestDataImpl.hpp Wed Oct 17 14:18:38 2007 @@ -32,78 +32,78 @@ namespace CA_MGM_NAMESPACE { - class RequestDataImpl : public blocxx::COWIntrusiveCountableBase - { - public: - - RequestDataImpl() - : version(0) - , subject(DNObject()) - , keysize(0) - , pubkeyAlgorithm(E_RSA) - , publicKey(ByteBuffer()) - , signatureAlgorithm(E_SHA1RSA) - , signature(ByteBuffer()) - , extensions(X509v3RequestExts_Priv()) - , challengePassword("") - , unstructuredName("") - , x509(NULL) - {} - - RequestDataImpl(const RequestDataImpl& impl) - : COWIntrusiveCountableBase(impl) - , version(impl.version) - , subject(impl.subject) - , keysize(impl.keysize) - , pubkeyAlgorithm(impl.pubkeyAlgorithm) - , publicKey(impl.publicKey) - , signatureAlgorithm(impl.signatureAlgorithm) - , signature(impl.signature) - , extensions(impl.extensions) - , challengePassword(impl.challengePassword) - , unstructuredName(impl.unstructuredName) - , x509(X509_REQ_dup(impl.x509)) - {} +class RequestDataImpl : public blocxx::COWIntrusiveCountableBase +{ +public: + + RequestDataImpl() + : version(0) + , subject(DNObject()) + , keysize(0) + , pubkeyAlgorithm(E_RSA) + , publicKey(ByteBuffer()) + , signatureAlgorithm(E_SHA1RSA) + , signature(ByteBuffer()) + , extensions(X509v3RequestExts_Priv()) + , challengePassword("") + , unstructuredName("") + , x509(NULL) + {} + + RequestDataImpl(const RequestDataImpl& impl) + : COWIntrusiveCountableBase(impl) + , version(impl.version) + , subject(impl.subject) + , keysize(impl.keysize) + , pubkeyAlgorithm(impl.pubkeyAlgorithm) + , publicKey(impl.publicKey) + , signatureAlgorithm(impl.signatureAlgorithm) + , signature(impl.signature) + , extensions(impl.extensions) + , challengePassword(impl.challengePassword) + , unstructuredName(impl.unstructuredName) + , x509(X509_REQ_dup(impl.x509)) + {} - ~RequestDataImpl() + ~RequestDataImpl() + { + if(x509 != NULL) { - if(x509 != NULL) - { - X509_REQ_free(x509); - x509 = NULL; - } + X509_REQ_free(x509); + x509 = NULL; } + } - RequestDataImpl* clone() const - { - return new RequestDataImpl(*this); - } + RequestDataImpl* clone() const + { + return new RequestDataImpl(*this); + } - blocxx::UInt32 version; + blocxx::UInt32 version; - DNObject subject; - blocxx::UInt32 keysize; + DNObject subject; + blocxx::UInt32 keysize; - KeyAlg pubkeyAlgorithm; + KeyAlg pubkeyAlgorithm; // DER des public key // man EVP_PKEY_set1_RSA // man EVP_PKEY_get1_RSA // man i2d_RSAPublicKey => i2d == internal to DER // man d2i_RSAPublicKey => d2i == DER to internal - ByteBuffer publicKey; + ByteBuffer publicKey; - SigAlg signatureAlgorithm; - ByteBuffer signature; + SigAlg signatureAlgorithm; + ByteBuffer signature; - X509v3RequestExts extensions; + X509v3RequestExts extensions; - // attributes - String challengePassword; - String unstructuredName; + // attributes + String challengePassword; + String unstructuredName; - X509_REQ *x509; - }; + X509_REQ *x509; +}; } } Modified: limal-head/limal-ca-mgm/src/RequestData_Priv.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/RequestDa… ============================================================================== --- limal-head/limal-ca-mgm/src/RequestData_Priv.cpp (original) +++ limal-head/limal-ca-mgm/src/RequestData_Priv.cpp Wed Oct 17 14:18:38 2007 @@ -52,21 +52,21 @@ RequestData_Priv::RequestData_Priv() : RequestData() {} - -RequestData_Priv::RequestData_Priv(const ByteBuffer& request, + +RequestData_Priv::RequestData_Priv(const ByteBuffer& request, FormatType formatType) : RequestData() { init(request, formatType); } -RequestData_Priv::RequestData_Priv(const String& requestPath, +RequestData_Priv::RequestData_Priv(const String& requestPath, FormatType formatType) : RequestData() { - + ByteBuffer ba = LocalManagement::readFile(requestPath); - + init(ba, formatType); } @@ -105,7 +105,7 @@ void RequestData_Priv::setKeyAlgorithm(KeyAlg alg) { - m_impl->pubkeyAlgorithm = alg; + m_impl->pubkeyAlgorithm = alg; } void @@ -158,7 +158,7 @@ RequestData_Priv::operator=(const RequestData_Priv& data) { if(this == &data) return *this; - + RequestData::operator=(data); return *this; @@ -168,7 +168,7 @@ RequestData_Priv::parseRequest(X509_REQ *x509) { // get version - m_impl->version = X509_REQ_get_version(x509) + 1; + m_impl->version = X509_REQ_get_version(x509) + 1; // get subject m_impl->subject = DNObject_Priv(x509->req_info->subject); @@ -222,7 +222,7 @@ // get pubkeyAlgorithm if(pkey->type == EVP_PKEY_RSA || pkey->type == EVP_PKEY_RSA2 ) - { + { m_impl->pubkeyAlgorithm = E_RSA; } else if(pkey->type == EVP_PKEY_DSA || @@ -234,13 +234,13 @@ m_impl->pubkeyAlgorithm = E_DSA; } else if(pkey->type == EVP_PKEY_DH ) - { + { m_impl->pubkeyAlgorithm = E_DH; } else - { + { EVP_PKEY_free(pkey); - + LOGIT_ERROR("Unsupported public key algorithm"); BLOCXX_THROW(limal::RuntimeException, __("Unsupported public key algorithm.")); @@ -297,7 +297,7 @@ char obj_tmp[80]; i2t_ASN1_OBJECT(obj_tmp, sizeof(obj_tmp), a->object); int nid = OBJ_txt2nid(obj_tmp); - if(nid != NID_pkcs9_challengePassword && + if(nid != NID_pkcs9_challengePassword && nid != NID_pkcs9_unstructuredName ) { LOGIT_INFO("Unsupported attribute found: " << obj_tmp); @@ -305,41 +305,41 @@ } if (a->single) - { + { t=a->value.single; type=t->type; bs=t->value.bit_string; } else - { + { ii=0; count=sk_ASN1_TYPE_num(a->value.set); - + get_next: - + at=sk_ASN1_TYPE_value(a->value.set,ii); type=at->type; bs=at->value.asn1_string; } if ( (type == V_ASN1_PRINTABLESTRING) || - (type == V_ASN1_T61STRING) || - (type == V_ASN1_IA5STRING)) - { + (type == V_ASN1_T61STRING) || + (type == V_ASN1_IA5STRING)) + { char *d = new char[bs->length+1]; memcpy(d, bs->data, bs->length); d[bs->length] = '\0'; String s(d, bs->length); delete [] d; - + if(nid == NID_pkcs9_challengePassword) - { + { m_impl->challengePassword += s; } else if (nid == NID_pkcs9_unstructuredName) - { - m_impl->unstructuredName += s; + { + m_impl->unstructuredName += s; } } @@ -352,7 +352,7 @@ } void -RequestData_Priv::init(const ByteBuffer& request, +RequestData_Priv::init(const ByteBuffer& request, FormatType formatType) { BIO *bio; @@ -361,9 +361,9 @@ if( formatType == E_PEM ) { bio = BIO_new_mem_buf(d, request.size()); - + if(!bio) - { + { LOGIT_ERROR("Can not create a memory BIO"); BLOCXX_THROW(limal::MemoryException, __("Cannot create a memory BIO.")); @@ -376,14 +376,14 @@ else { // => DER -#if OPENSSL_VERSION_NUMBER >= 0x0090801fL +#if OPENSSL_VERSION_NUMBER >= 0x0090801fL const unsigned char *d2 = NULL; d2 = (const unsigned char*)d; #else unsigned char *d2 = NULL; d2 = d; #endif - + m_impl->x509 = d2i_X509_REQ(NULL, &d2, request.size()); d2 = NULL; @@ -401,10 +401,10 @@ parseRequest(m_impl->x509); } catch(Exception &e) - { + { X509_REQ_free(m_impl->x509); m_impl->x509 = NULL; - + BLOCXX_THROW_SUBEX(limal::SyntaxException, __("Error while parsing the request."), e); Modified: limal-head/limal-ca-mgm/src/RequestData_Priv.hpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/RequestDa… ============================================================================== --- limal-head/limal-ca-mgm/src/RequestData_Priv.hpp (original) +++ limal-head/limal-ca-mgm/src/RequestData_Priv.hpp Wed Oct 17 14:18:38 2007 @@ -33,35 +33,35 @@ namespace CA_MGM_NAMESPACE { - class RequestData_Priv : public RequestData { - public: - RequestData_Priv(); - RequestData_Priv(const String& requestPath, - FormatType formatType = E_PEM); - RequestData_Priv(const ByteBuffer& request, - FormatType formatType = E_PEM); - RequestData_Priv(const RequestData_Priv& data); - virtual ~RequestData_Priv(); - - void setVersion(blocxx::UInt32 v); - void setKeysize(blocxx::UInt32 size); - void setSubjectDN(const DNObject dn); - void setKeyAlgorithm(KeyAlg alg); - void setPublicKey(const ByteBuffer key); - void setSignatureAlgorithm(SigAlg alg); - void setSignature(const ByteBuffer &sig); - void setExtensions(const X509v3RequestExts &ext); - void setChallengePassword(const String &passwd); - void setUnstructuredName(const String &name); - - private: - - RequestData_Priv& operator=(const RequestData_Priv& data); - - void parseRequest(X509_REQ *x509); - void init(const ByteBuffer& request, - FormatType formatType); - }; +class RequestData_Priv : public RequestData { +public: + RequestData_Priv(); + RequestData_Priv(const String& requestPath, + FormatType formatType = E_PEM); + RequestData_Priv(const ByteBuffer& request, + FormatType formatType = E_PEM); + RequestData_Priv(const RequestData_Priv& data); + virtual ~RequestData_Priv(); + + void setVersion(blocxx::UInt32 v); + void setKeysize(blocxx::UInt32 size); + void setSubjectDN(const DNObject dn); + void setKeyAlgorithm(KeyAlg alg); + void setPublicKey(const ByteBuffer key); + void setSignatureAlgorithm(SigAlg alg); + void setSignature(const ByteBuffer &sig); + void setExtensions(const X509v3RequestExts &ext); + void setChallengePassword(const String &passwd); + void setUnstructuredName(const String &name); + +private: + + RequestData_Priv& operator=(const RequestData_Priv& data); + + void parseRequest(X509_REQ *x509); + void init(const ByteBuffer& request, + FormatType formatType); +}; } } Modified: limal-head/limal-ca-mgm/src/RequestGenerationData.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/RequestGe… ============================================================================== --- limal-head/limal-ca-mgm/src/RequestGenerationData.cpp (original) +++ limal-head/limal-ca-mgm/src/RequestGenerationData.cpp Wed Oct 17 14:18:38 2007 @@ -39,7 +39,7 @@ class RequestGenerationDataImpl : public blocxx::COWIntrusiveCountableBase { - public: +public: RequestGenerationDataImpl() : subject(DNObject()) , keysize(0) @@ -68,21 +68,21 @@ DNObject subject; blocxx::UInt32 keysize; - + // KeyAlg pubkeyAlgorithm; // at the beginning we only support rsa - - + + MD messageDigest; // parameter default_md - + // attributes String challengePassword; String unstructuredName; - + X509v3RequestExts extensions; }; - + RequestGenerationData::RequestGenerationData() : m_impl(new RequestGenerationDataImpl()) {} @@ -174,7 +174,7 @@ m_impl->messageDigest = md; } -MD +MD RequestGenerationData::getMessageDigest() const { return m_impl->messageDigest; @@ -233,7 +233,7 @@ { // do not use this->valid(); it checks for subject too // subject.valid() is not needed here - if(!m_impl->extensions.valid()) + if(!m_impl->extensions.valid()) { LOGIT_ERROR("invalid RequestGenerationData object"); BLOCXX_THROW(limal::ValueException, @@ -253,15 +253,15 @@ String md("sha1"); switch(m_impl->messageDigest) { - case E_SHA1: - md = "sha1"; - break; - case E_MD5: - md = "md5"; - break; - case E_MDC2: - md = "mdc2"; - break; + case E_SHA1: + md = "sha1"; + break; + case E_MD5: + md = "md5"; + break; + case E_MDC2: + md = "mdc2"; + break; } ca.getConfig()->setValue(type2Section(type, false), "default_md", md); Modified: limal-head/limal-ca-mgm/src/StringExtensions.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/StringExt… ============================================================================== --- limal-head/limal-ca-mgm/src/StringExtensions.cpp (original) +++ limal-head/limal-ca-mgm/src/StringExtensions.cpp Wed Oct 17 14:18:38 2007 @@ -39,7 +39,7 @@ class StringExtensionImpl : public blocxx::COWIntrusiveCountableBase { - public: +public: StringExtensionImpl() : value(String()) {} @@ -61,9 +61,9 @@ } String value; - + }; - + StringExtension::StringExtension() : ExtensionBase() , m_impl(new StringExtensionImpl()) @@ -72,19 +72,19 @@ StringExtension::~StringExtension() {} - + // protected: -StringExtension::StringExtension(const String &v ) +StringExtension::StringExtension(const String &v ) : ExtensionBase() , m_impl(new StringExtensionImpl(v)) {} StringExtension::StringExtension(const StringExtension& extension) : ExtensionBase(extension) - , m_impl(extension.m_impl) + , m_impl(extension.m_impl) {} - + StringExtension& StringExtension::operator=(const StringExtension& extension) { @@ -95,7 +95,7 @@ return *this; } - + // ################################################################# @@ -129,7 +129,7 @@ .split(caConfig->getValue(type2Section(type, true), "nsBaseUrl")); if(sp[0].equalsIgnoreCase("critical")) { - setCritical(true); + setCritical(true); m_impl->value = sp[1]; } else @@ -223,7 +223,7 @@ { LOGIT_DEBUG("Wrong value for NsBaseUrlExt:" << m_impl->value); return false; - } + } return true; } @@ -286,13 +286,13 @@ BLOCXX_THROW(limal::ValueException, Format(__("Wrong type: %1."), type).c_str()); } - + bool p = caConfig->exists(type2Section(type, true), "nsRevocationUrl"); if(p) { StringArray sp = PerlRegEx("\\s*,\\s*") .split(caConfig->getValue(type2Section(type, true), "nsRevocationUrl")); if(sp[0].equalsIgnoreCase("critical")) { - setCritical(true); + setCritical(true); m_impl->value = sp[1]; } else { m_impl->value = sp[0]; @@ -392,7 +392,7 @@ if(!initURICheck().isValid(m_impl->value)) { LOGIT_DEBUG("Wrong value for NsRevocationUrlExt:" << m_impl->value); return false; - } + } return true; } @@ -446,7 +446,7 @@ StringArray sp = PerlRegEx("\\s*,\\s*") .split(caConfig->getValue(type2Section(type, true), "nsCaRevocationUrl")); if(sp[0].equalsIgnoreCase("critical")) { - setCritical(true); + setCritical(true); m_impl->value = sp[1]; } else { m_impl->value = sp[0]; @@ -546,7 +546,7 @@ if(!initURICheck().isValid(m_impl->value)) { LOGIT_DEBUG("Wrong value for NsCaRevocationUrlExt:" << m_impl->value); return false; - } + } return true; } @@ -599,7 +599,7 @@ StringArray sp = PerlRegEx("\\s*,\\s*") .split(caConfig->getValue(type2Section(type, true), "nsRenewalUrl")); if(sp[0].equalsIgnoreCase("critical")) { - setCritical(true); + setCritical(true); m_impl->value = sp[1]; } else { m_impl->value = sp[0]; @@ -699,7 +699,7 @@ if(!initURICheck().isValid(m_impl->value)) { LOGIT_DEBUG("Wrong value for NsRenewalUrlExt:" << m_impl->value); return false; - } + } return true; } @@ -751,7 +751,7 @@ StringArray sp = PerlRegEx("\\s*,\\s*") .split(caConfig->getValue(type2Section(type, true), "nsCaPolicyUrl")); if(sp[0].equalsIgnoreCase("critical")) { - setCritical(true); + setCritical(true); m_impl->value = sp[1]; } else { m_impl->value = sp[0]; @@ -851,7 +851,7 @@ if(!initURICheck().isValid(m_impl->value)) { LOGIT_DEBUG("Wrong value for NsCaPolicyUrlExt:" << m_impl->value); return false; - } + } return true; } @@ -899,7 +899,7 @@ StringArray sp = PerlRegEx("\\s*,\\s*") .split(caConfig->getValue(type2Section(type, true), "nsSslServerName")); if(sp[0].equalsIgnoreCase("critical")) { - setCritical(true); + setCritical(true); m_impl->value = sp[1]; } else { m_impl->value = sp[0]; @@ -1025,7 +1025,7 @@ StringArray sp = PerlRegEx("\\s*,\\s*") .split(caConfig->getValue(type2Section(type, true), "nsComment")); if(sp[0].equalsIgnoreCase("critical")) { - setCritical(true); + setCritical(true); m_impl->value = sp[1]; } else { m_impl->value = sp[0]; @@ -1103,7 +1103,7 @@ } bool -NsCommentExt::valid() const + NsCommentExt::valid() const { return true; } Modified: limal-head/limal-ca-mgm/src/SubjectAlternativeNameExtension.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/SubjectAl… ============================================================================== --- limal-head/limal-ca-mgm/src/SubjectAlternativeNameExtension.cpp (original) +++ limal-head/limal-ca-mgm/src/SubjectAlternativeNameExtension.cpp Wed Oct 17 14:18:38 2007 @@ -37,7 +37,7 @@ class SubjectAlternativeNameExtImpl : public blocxx::COWIntrusiveCountableBase { - public: +public: SubjectAlternativeNameExtImpl() : emailCopy(false) , altNameList(blocxx::List<LiteralValue>()) @@ -66,11 +66,11 @@ blocxx::List<LiteralValue> altNameList; }; - + SubjectAlternativeNameExt::SubjectAlternativeNameExt() : ExtensionBase() , m_impl(new SubjectAlternativeNameExtImpl()) - + {} SubjectAlternativeNameExt::SubjectAlternativeNameExt(CAConfig* caConfig, Type type) @@ -98,7 +98,7 @@ { if((*it).indexOf(":") != String::npos) { - if((*it).equalsIgnoreCase("email:copy")) + if((*it).equalsIgnoreCase("email:copy")) m_impl->emailCopy = true; else { @@ -119,7 +119,7 @@ } SubjectAlternativeNameExt::SubjectAlternativeNameExt(bool copyEmail, - const blocxx::List<LiteralValue> &alternativeNameList) + const blocxx::List<LiteralValue> &alternativeNameList) : ExtensionBase() , m_impl(new SubjectAlternativeNameExtImpl(copyEmail, alternativeNameList)) { @@ -134,7 +134,7 @@ SubjectAlternativeNameExt::SubjectAlternativeNameExt(const SubjectAlternativeNameExt& extension) : ExtensionBase(extension), - m_impl(extension.m_impl) + m_impl(extension.m_impl) {} @@ -146,9 +146,9 @@ SubjectAlternativeNameExt::operator=(const SubjectAlternativeNameExt& extension) { if(this == &extension) return *this; - + ExtensionBase::operator=(extension); - + m_impl = extension.m_impl; return *this; @@ -233,7 +233,7 @@ } } - ca.getConfig()->setValue(type2Section(type, true), "subjectAltName", + ca.getConfig()->setValue(type2Section(type, true), "subjectAltName", extString.erase(extString.length()-1)); } else @@ -275,7 +275,7 @@ result.appendArray(checkLiteralValueList(m_impl->altNameList)); LOGIT_DEBUG_STRINGARRAY("SubjectAlternativeNameExt::verify()", result); - + return result; } Modified: limal-head/limal-ca-mgm/src/SubjectKeyIdentifierExtension.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/SubjectKe… ============================================================================== --- limal-head/limal-ca-mgm/src/SubjectKeyIdentifierExtension.cpp (original) +++ limal-head/limal-ca-mgm/src/SubjectKeyIdentifierExtension.cpp Wed Oct 17 14:18:38 2007 @@ -39,7 +39,7 @@ class SubjectKeyIdentifierExtImpl : public blocxx::COWIntrusiveCountableBase { - public: +public: SubjectKeyIdentifierExtImpl() : autodetect(false) , keyid(String()) @@ -67,7 +67,7 @@ String keyid; }; - + SubjectKeyIdentifierExt::SubjectKeyIdentifierExt() : ExtensionBase() , m_impl(new SubjectKeyIdentifierExtImpl()) @@ -144,17 +144,17 @@ SubjectKeyIdentifierExt::operator=(const SubjectKeyIdentifierExt& extension) { if(this == &extension) return *this; - + ExtensionBase::operator=(extension); - + m_impl = extension.m_impl; - + return *this; } void SubjectKeyIdentifierExt::setSubjectKeyIdentifier(bool autoDetect, - const String& keyId) + const String& keyId) { if(!keyId.empty() && !initHexCheck().isValid(keyId)) { @@ -215,7 +215,7 @@ if(isCritical()) extString += "critical,"; if(m_impl->autodetect) extString += "hash"; else extString += m_impl->keyid; - + ca.getConfig()->setValue(type2Section(type, true), "subjectKeyIdentifier", extString); } @@ -268,7 +268,7 @@ if(!m_impl->autodetect && m_impl->keyid.empty()) { result.append(String("Wrong value for SubjectKeyIdentifierExt: ") + - Format("autodetect(%1), keyId(%2)", + Format("autodetect(%1), keyId(%2)", m_impl->autodetect?"true":"false", m_impl->keyid.c_str()).toString()); } @@ -276,7 +276,7 @@ if(m_impl->autodetect && !m_impl->keyid.empty()) { result.append(String("Wrong value for SubjectKeyIdentifierExt: ") + - Format("autodetect(%1), keyId(%2)", + Format("autodetect(%1), keyId(%2)", m_impl->autodetect?"true":"false", m_impl->keyid.c_str()).toString()); } Modified: limal-head/limal-ca-mgm/src/Utils.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/Utils.cpp… ============================================================================== --- limal-head/limal-ca-mgm/src/Utils.cpp (original) +++ limal-head/limal-ca-mgm/src/Utils.cpp Wed Oct 17 14:18:38 2007 @@ -38,15 +38,15 @@ namespace { // ----------------------------------------------------------- - blocxx::OnceFlag g_i18n_init_guard = BLOCXX_ONCE_INIT; +blocxx::OnceFlag g_i18n_init_guard = BLOCXX_ONCE_INIT; // ----------------------------------------------------------- - void init_i18n_domain() - { - bindtextdomain( i18n_domain, LOCALEDIR); - bind_textdomain_codeset( i18n_domain, "utf8"); - } +void init_i18n_domain() +{ + bindtextdomain( i18n_domain, LOCALEDIR); + bind_textdomain_codeset( i18n_domain, "utf8"); +} } @@ -70,14 +70,14 @@ // ------------------------------------------------------------------- int wrapExecuteProcessAndGatherOutput( - const blocxx::Array<blocxx::String> &cmd, - blocxx::String &out, - blocxx::String &err, - const blocxx::EnvVars &env, - int tmax, - int omax, - const blocxx::String &in -) + const blocxx::Array<blocxx::String> &cmd, + blocxx::String &out, + blocxx::String &err, + const blocxx::EnvVars &env, + int tmax, + int omax, + const blocxx::String &in + ) { int exitStatus = -1; @@ -90,19 +90,19 @@ blocxx::Timeout::relative(float(tmax)) ), omax, in - ); + ); if( status.exitTerminated()) { exitStatus = status.exitStatus(); } else - if( status.signalTerminated()) - { - LOGIT_ERROR("Command '" << cmd[0] - << "' terminated by signal: " - << status.termSignal()); - } + if( status.signalTerminated()) + { + LOGIT_ERROR("Command '" << cmd[0] + << "' terminated by signal: " + << status.termSignal()); + } else { LOGIT_ERROR("Command '" << cmd[0] @@ -112,11 +112,11 @@ int status = -1; blocxx::Exec::executeProcessAndGatherOutput( - cmd, out, err, status, env, - ( tmax < 0 ? blocxx::Exec::INFINITE_TIMEOUT : tmax - ), - omax, in - ); + cmd, out, err, status, env, + ( tmax < 0 ? blocxx::Exec::INFINITE_TIMEOUT : tmax + ), + omax, in + ); if( status != -1) { @@ -125,24 +125,24 @@ exitStatus = WEXITSTATUS(status); } else - if(WIFSIGNALED(status)) - { - LOGIT_ERROR("Command '" << cmd[0] - << "' terminated by signal: " - << WTERMSIG(status)); - } + if(WIFSIGNALED(status)) + { + LOGIT_ERROR("Command '" << cmd[0] + << "' terminated by signal: " + << WTERMSIG(status)); + } else { LOGIT_ERROR("Command '" << cmd[0] - << "' execution status: " - << status); + << "' execution status: " + << status); } } else { LOGIT_ERROR("Command '" << cmd[0] << "' execution failure: " - << status); + << status); } #endif Modified: limal-head/limal-ca-mgm/src/Utils.hpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/Utils.hpp… ============================================================================== --- limal-head/limal-ca-mgm/src/Utils.hpp (original) +++ limal-head/limal-ca-mgm/src/Utils.hpp Wed Oct 17 14:18:38 2007 @@ -45,10 +45,10 @@ { namespace CA_MGM_NAMESPACE { - + // ------------------------------------------------------------------- #define LOGIT(level,message) \ - LIMAL_SLOG(limal::Logger("ca-mgm"), level, message) +LIMAL_SLOG(limal::Logger("ca-mgm"), level, message) #define LOGIT_DEBUG(message) \ LIMAL_SLOG(limal::Logger("ca-mgm"), blocxx::E_DEBUG_LEVEL, message) @@ -60,16 +60,16 @@ LIMAL_SLOG(limal::Logger("ca-mgm"), blocxx::E_ERROR_LEVEL, message) #define LOGIT_DEBUG_STRINGARRAY(text, stringarray) \ - limal::Logger d("ca-mgm"); \ - if(d.isEnabledFor("DEBUG")) { \ - uint s = stringarray.size(); \ - for(uint i = 0; i < s; i++) { \ - LIMAL_SLOG(d, blocxx::E_DEBUG_LEVEL, \ - text << \ - "(" << (i+1) << "/" << s << "):" \ - << stringarray[i]); \ - } \ - } + limal::Logger d("ca-mgm"); \ + if(d.isEnabledFor("DEBUG")) { \ + uint s = stringarray.size(); \ + for(uint i = 0; i < s; i++) { \ + LIMAL_SLOG(d, blocxx::E_DEBUG_LEVEL, \ + text << \ + "(" << (i+1) << "/" << s << "):" \ + << stringarray[i]); \ + } \ + } // ------------------------------------------------------------------- @@ -85,10 +85,10 @@ * @param n The number of the plural message. * @return The translated message or msgid. */ - const char * gettext (const char *msgid); - const char * gettext (const char *msgid, - const char *plural, - unsigned long int n); +const char * gettext (const char *msgid); +const char * gettext (const char *msgid, + const char *plural, + unsigned long int n); /* @} */ // ------------------------------------------------------------------- @@ -107,48 +107,48 @@ // ------------------------------------------------------------------- - + // FIXME: what is the format of a hex number?? 0a:0f or 0a0f // currently allowed is both inline limal::ValueCheck initHexCheck() { limal::ValueCheck checkHex = limal::ValueCheck(new limal::ValuePosixRECheck("^[0-9a-fA-F:]*[0-9a-fA-F]{2}$" )); - + return checkHex; } inline limal::ValueCheck initOIDCheck() { limal::ValueCheck checkOID = limal::ValueCheck(new limal::ValuePosixRECheck("^([0-9]+\\.)+[0-9]+$")); - + return checkOID; } inline limal::ValueCheck initURICheck() { limal::ValueCheck checkURI = limal::ValueCheck(new limal::ValuePosixRECheck("^(([^:/?#]+)://)?([^/?#]*)?([^?#]*)?(\\\\?([^#]*))?(#(.*))?" )); - + return checkURI; } inline limal::ValueCheck initEmailCheck() { limal::ValueCheck checkEmail = limal::ValueCheck(new limal::ValuePosixRECheck("^[^@]+@[^@]+$")); - + return checkEmail; } inline limal::ValueCheck initDNSCheck() { limal::ValueCheck checkDNS = limal::ValueCheck(new limal::ValuePosixRECheck("^[a-z]+[a-z0-9.-]*$")); - + return checkDNS; } inline limal::ValueCheck initIPCheck() { limal::ValueCheck checkIP = limal::ValueCheck(new limal::ValuePosixRECheck("^([0-9]{1,3}\\.){3}[0-9]{1,3}$")); - + return checkIP; } @@ -156,12 +156,12 @@ limal::ValueCheck checkAccessOID = limal::ValueCheck(new limal::ValuePosixRECheck("^(OCSP|caIssuers)$")) .Or(new limal::ValuePosixRECheck("^([0-9]+\\.)+[0-9]+$")); - + return checkAccessOID; } -inline blocxx::StringArray -checkLiteralValueList(const blocxx::List<LiteralValue>& list) +inline blocxx::StringArray + checkLiteralValueList(const blocxx::List<LiteralValue>& list) { blocxx::StringArray result; blocxx::List<limal::ca_mgm::LiteralValue>::const_iterator it = list.begin(); @@ -177,51 +177,51 @@ switch(type) { - case E_CA_Req: - if(!v3section) - result = "req_ca"; - else - result = "v3_req_ca"; - break; - case E_Client_Req: - if(!v3section) - result = "req_client"; - else - result = "v3_req_client"; - break; - case E_Server_Req: - if(!v3section) - result = "req_server"; - else - result = "v3_req_server"; - break; - case E_CA_Cert: - if(!v3section) - result = "ca"; - else - result = "v3_ca"; - break; - case E_Client_Cert: - if(!v3section) - result = "client_cert"; - else - result = "v3_client"; - break; - case E_Server_Cert: - if(!v3section) - result = "server_cert"; - else - result = "v3_server"; - break; - case E_CRL: - if(!v3section) - result = "ca"; - else - result = "v3_crl"; - break; - default: - LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(limal::ValueException, blocxx::Format("wrong type: %1", type).c_str()); + case E_CA_Req: + if(!v3section) + result = "req_ca"; + else + result = "v3_req_ca"; + break; + case E_Client_Req: + if(!v3section) + result = "req_client"; + else + result = "v3_req_client"; + break; + case E_Server_Req: + if(!v3section) + result = "req_server"; + else + result = "v3_req_server"; + break; + case E_CA_Cert: + if(!v3section) + result = "ca"; + else + result = "v3_ca"; + break; + case E_Client_Cert: + if(!v3section) + result = "client_cert"; + else + result = "v3_client"; + break; + case E_Server_Cert: + if(!v3section) + result = "server_cert"; + else + result = "v3_server"; + break; + case E_CRL: + if(!v3section) + result = "ca"; + else + result = "v3_crl"; + break; + default: + LOGIT_ERROR("wrong type" << type); + BLOCXX_THROW(limal::ValueException, blocxx::Format("wrong type: %1", type).c_str()); } LOGIT_DEBUG("type2Section: type=" << type << " result=" << result); return result; @@ -229,29 +229,29 @@ // throws or returns the process exit code or -1 (term by signal). int wrapExecuteProcessAndGatherOutput( - const blocxx::Array<blocxx::String> &cmd, - blocxx::String &out, - blocxx::String &err, - const blocxx::EnvVars &env, - int tmax=-1, - int omax=-1, - const blocxx::String &in=blocxx::String() -); + const blocxx::Array<blocxx::String> &cmd, + blocxx::String &out, + blocxx::String &err, + const blocxx::EnvVars &env, + int tmax=-1, + int omax=-1, + const blocxx::String &in=blocxx::String() + ); -inline int rehashCAs(const blocxx::String &repositoryDir) +inline int rehashCAs(const blocxx::String &repositoryDir) { blocxx::Array<blocxx::String> cmd; cmd.push_back(limal::ca_mgm::C_REHASH_COMMAND); cmd.push_back(repositoryDir); - + blocxx::EnvVars env; env.addVar("PATH", "/usr/bin/"); - + blocxx::String stdOutput; blocxx::String errOutput; int status = -1; try - { + { status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, errOutput, env); } Modified: limal-head/limal-ca-mgm/src/X509v3CRLExtensions.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/X509v3CRL… ============================================================================== --- limal-head/limal-ca-mgm/src/X509v3CRLExtensions.cpp (original) +++ limal-head/limal-ca-mgm/src/X509v3CRLExtensions.cpp Wed Oct 17 14:18:38 2007 @@ -37,7 +37,7 @@ X509v3CRLExts::X509v3CRLExts(const X509v3CRLExts& extensions) : m_impl(extensions.m_impl) {} - + X509v3CRLExts::~X509v3CRLExts() {} @@ -45,10 +45,10 @@ X509v3CRLExts::operator=(const X509v3CRLExts& extensions) { if(this == &extensions) return *this; - - m_impl = extensions.m_impl; - - return *this; + + m_impl = extensions.m_impl; + + return *this; } AuthorityKeyIdentifierExt @@ -78,7 +78,7 @@ result.appendArray(m_impl->authorityKeyIdentifier.verify()); result.appendArray(m_impl->issuerAlternativeName.verify()); - + LOGIT_DEBUG_STRINGARRAY("X509v3CRLExts::verify()", result); return result;; } Modified: limal-head/limal-ca-mgm/src/X509v3CRLExtensionsImpl.hpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/X509v3CRL… ============================================================================== --- limal-head/limal-ca-mgm/src/X509v3CRLExtensionsImpl.hpp (original) +++ limal-head/limal-ca-mgm/src/X509v3CRLExtensionsImpl.hpp Wed Oct 17 14:18:38 2007 @@ -30,30 +30,30 @@ namespace CA_MGM_NAMESPACE { - class X509v3CRLExtsImpl : public blocxx::COWIntrusiveCountableBase +class X509v3CRLExtsImpl : public blocxx::COWIntrusiveCountableBase +{ +public: + X509v3CRLExtsImpl() + : authorityKeyIdentifier(AuthorityKeyIdentifierExt()), + issuerAlternativeName(IssuerAlternativeNameExt()) + {} + + X509v3CRLExtsImpl(const X509v3CRLExtsImpl& impl) + : COWIntrusiveCountableBase(impl), + authorityKeyIdentifier(impl.authorityKeyIdentifier), + issuerAlternativeName(impl.issuerAlternativeName) + {} + + ~X509v3CRLExtsImpl() {} + + X509v3CRLExtsImpl* clone() const { - public: - X509v3CRLExtsImpl() - : authorityKeyIdentifier(AuthorityKeyIdentifierExt()), - issuerAlternativeName(IssuerAlternativeNameExt()) - {} - - X509v3CRLExtsImpl(const X509v3CRLExtsImpl& impl) - : COWIntrusiveCountableBase(impl), - authorityKeyIdentifier(impl.authorityKeyIdentifier), - issuerAlternativeName(impl.issuerAlternativeName) - {} - - ~X509v3CRLExtsImpl() {} - - X509v3CRLExtsImpl* clone() const - { - return new X509v3CRLExtsImpl(*this); - } - - AuthorityKeyIdentifierExt authorityKeyIdentifier; - IssuerAlternativeNameExt issuerAlternativeName; - }; + return new X509v3CRLExtsImpl(*this); + } + + AuthorityKeyIdentifierExt authorityKeyIdentifier; + IssuerAlternativeNameExt issuerAlternativeName; +}; } } #endif /* LIMAL_CA_MGM_X509V3_CRL_EXTS_IMPL_HPP */ Modified: limal-head/limal-ca-mgm/src/X509v3CRLExtensions_Priv.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/X509v3CRL… ============================================================================== --- limal-head/limal-ca-mgm/src/X509v3CRLExtensions_Priv.cpp (original) +++ limal-head/limal-ca-mgm/src/X509v3CRLExtensions_Priv.cpp Wed Oct 17 14:18:38 2007 @@ -43,16 +43,16 @@ using namespace limal; using namespace blocxx; - + X509v3CRLExts_Priv::X509v3CRLExts_Priv() : X509v3CRLExts() {} - + X509v3CRLExts_Priv::X509v3CRLExts_Priv(STACK_OF(X509_EXTENSION) *extensions) : X509v3CRLExts() { // AuthorityKeyIdentifierExt authorityKeyIdentifier; - + m_impl->authorityKeyIdentifier = AuthorityKeyIdentifierExt_Priv(extensions); // IssuerAlternativeNameExt issuerAlternativeName; @@ -100,26 +100,26 @@ X509v3CRLExts_Priv::operator=(const X509v3CRLExts_Priv& extensions) { if(this == &extensions) return *this; - + X509v3CRLExts::operator=(extensions); return *this; } -void +void X509v3CRLExts_Priv::parseIssuerAlternativeNameExt(STACK_OF(X509_EXTENSION) *cert, IssuerAlternativeNameExt &ext) { int crit = 0; - + GENERAL_NAMES *gns = NULL; gns = static_cast<GENERAL_NAMES *>(X509V3_get_d2i(cert, - NID_issuer_alt_name, - &crit, - NULL)); - + NID_issuer_alt_name, + &crit, + NULL)); + if(gns == NULL) - { + { if(crit == -1) { // extension not found @@ -129,7 +129,7 @@ } else if(crit == -2) { - // extension occurred more than once + // extension occurred more than once LOGIT_ERROR("Extension occurred more than once"); BLOCXX_THROW(limal::SyntaxException, __("Extension occurred more than once.")); @@ -140,7 +140,7 @@ Format(__("Unable to parse the certificate (Crit: %1)."), crit).c_str()); } - + int j; GENERAL_NAME *gen; blocxx::List<LiteralValue> lvList; Modified: limal-head/limal-ca-mgm/src/X509v3CRLExtensions_Priv.hpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/X509v3CRL… ============================================================================== --- limal-head/limal-ca-mgm/src/X509v3CRLExtensions_Priv.hpp (original) +++ limal-head/limal-ca-mgm/src/X509v3CRLExtensions_Priv.hpp Wed Oct 17 14:18:38 2007 @@ -31,24 +31,25 @@ namespace CA_MGM_NAMESPACE { - class X509v3CRLExts_Priv : public X509v3CRLExts { - public: - X509v3CRLExts_Priv(); - X509v3CRLExts_Priv(STACK_OF(X509_EXTENSION) *extensions); - X509v3CRLExts_Priv(const X509v3CRLExts_Priv& extensions); - virtual ~X509v3CRLExts_Priv(); +class X509v3CRLExts_Priv : public X509v3CRLExts +{ +public: + X509v3CRLExts_Priv(); + X509v3CRLExts_Priv(STACK_OF(X509_EXTENSION) *extensions); + X509v3CRLExts_Priv(const X509v3CRLExts_Priv& extensions); + virtual ~X509v3CRLExts_Priv(); - void setAuthorityKeyIdentifier(const AuthorityKeyIdentifierExt &ext); - void setIssuerAlternativeName(const IssuerAlternativeNameExt &ext); + void setAuthorityKeyIdentifier(const AuthorityKeyIdentifierExt &ext); + void setIssuerAlternativeName(const IssuerAlternativeNameExt &ext); - private: +private: - X509v3CRLExts_Priv& operator=(const X509v3CRLExts_Priv& extensions); + X509v3CRLExts_Priv& operator=(const X509v3CRLExts_Priv& extensions); - void parseIssuerAlternativeNameExt(STACK_OF(X509_EXTENSION) *cert, - IssuerAlternativeNameExt &ext); + void parseIssuerAlternativeNameExt(STACK_OF(X509_EXTENSION) *cert, + IssuerAlternativeNameExt &ext); - }; +}; } } Modified: limal-head/limal-ca-mgm/src/X509v3CRLGenerationExtensions.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/X509v3CRL… ============================================================================== --- limal-head/limal-ca-mgm/src/X509v3CRLGenerationExtensions.cpp (original) +++ limal-head/limal-ca-mgm/src/X509v3CRLGenerationExtensions.cpp Wed Oct 17 14:18:38 2007 @@ -38,22 +38,22 @@ class X509v3CRLGenerationExtsImpl : public blocxx::COWIntrusiveCountableBase { - public: +public: X509v3CRLGenerationExtsImpl() : authorityKeyIdentifier(AuthorityKeyIdentifierGenerateExt()), - issuerAlternativeName(IssuerAlternativeNameExt()) - + issuerAlternativeName(IssuerAlternativeNameExt()) + {} X509v3CRLGenerationExtsImpl(CAConfig* caConfig, Type type) : authorityKeyIdentifier(caConfig, type), - issuerAlternativeName(caConfig, type) + issuerAlternativeName(caConfig, type) {} X509v3CRLGenerationExtsImpl(const X509v3CRLGenerationExtsImpl& impl) : COWIntrusiveCountableBase(impl), - authorityKeyIdentifier(impl.authorityKeyIdentifier), - issuerAlternativeName(impl.issuerAlternativeName) + authorityKeyIdentifier(impl.authorityKeyIdentifier), + issuerAlternativeName(impl.issuerAlternativeName) {} ~X509v3CRLGenerationExtsImpl() {} @@ -67,7 +67,7 @@ IssuerAlternativeNameExt issuerAlternativeName; }; - + X509v3CRLGenerationExts::X509v3CRLGenerationExts() : m_impl(new X509v3CRLGenerationExtsImpl()) {} @@ -87,9 +87,9 @@ X509v3CRLGenerationExts::operator=(const X509v3CRLGenerationExts& extension) { if(this == &extension) return *this; - + m_impl = extension.m_impl; - + return *this; } @@ -98,7 +98,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(limal::ValueException, + BLOCXX_THROW(limal::ValueException, __("Invalid value for X509v3CRLGenerationExts::setAuthorityKeyIdentifier.")); } m_impl->authorityKeyIdentifier = ext; @@ -121,7 +121,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(limal::ValueException, + BLOCXX_THROW(limal::ValueException, __("Invalid value for X509v3CRLGenerationExts::setIssuerAlternativeName.")); } m_impl->issuerAlternativeName = ext; @@ -148,7 +148,7 @@ BLOCXX_THROW(limal::ValueException, __("Invalid X509v3RequestExts object.")); } - + m_impl->authorityKeyIdentifier.commit2Config(ca, type); m_impl->issuerAlternativeName.commit2Config(ca, type); } @@ -168,7 +168,7 @@ result.appendArray(m_impl->authorityKeyIdentifier.verify()); result.appendArray(m_impl->issuerAlternativeName.verify()); - + LOGIT_DEBUG_STRINGARRAY("X509v3CRLGenerationExts::verify()", result); return result;; } Modified: limal-head/limal-ca-mgm/src/X509v3CertificateExtensions.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/X509v3Cer… ============================================================================== --- limal-head/limal-ca-mgm/src/X509v3CertificateExtensions.cpp (original) +++ limal-head/limal-ca-mgm/src/X509v3CertificateExtensions.cpp Wed Oct 17 14:18:38 2007 @@ -37,7 +37,7 @@ X509v3CertificateExts::X509v3CertificateExts(const X509v3CertificateExts& extensions) : m_impl(extensions.m_impl) {} - + X509v3CertificateExts::~X509v3CertificateExts() {} @@ -195,9 +195,9 @@ result.appendArray(m_impl->nsCaPolicyUrl.verify()); result.appendArray(m_impl->nsSslServerName.verify()); result.appendArray(m_impl->nsComment.verify()); - result.appendArray(m_impl->keyUsage.verify()); - result.appendArray(m_impl->nsCertType.verify()); - result.appendArray(m_impl->basicConstraints.verify()); + result.appendArray(m_impl->keyUsage.verify()); + result.appendArray(m_impl->nsCertType.verify()); + result.appendArray(m_impl->basicConstraints.verify()); result.appendArray(m_impl->extendedKeyUsage.verify()); result.appendArray(m_impl->subjectKeyIdentifier.verify()); result.appendArray(m_impl->authorityKeyIdentifier.verify()); @@ -224,9 +224,9 @@ result.appendArray(m_impl->nsCaPolicyUrl.dump()); result.appendArray(m_impl->nsSslServerName.dump()); result.appendArray(m_impl->nsComment.dump()); - result.appendArray(m_impl->keyUsage.dump()); - result.appendArray(m_impl->nsCertType.dump()); - result.appendArray(m_impl->basicConstraints.dump()); + result.appendArray(m_impl->keyUsage.dump()); + result.appendArray(m_impl->nsCertType.dump()); + result.appendArray(m_impl->basicConstraints.dump()); result.appendArray(m_impl->extendedKeyUsage.dump()); result.appendArray(m_impl->subjectKeyIdentifier.dump()); result.appendArray(m_impl->authorityKeyIdentifier.dump()); @@ -238,7 +238,7 @@ return result; } - + // protected: X509v3CertificateExts::X509v3CertificateExts() : m_impl(new X509v3CertificateExtsImpl()) Modified: limal-head/limal-ca-mgm/src/X509v3CertificateExtensionsImpl.hpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/X509v3Cer… ============================================================================== --- limal-head/limal-ca-mgm/src/X509v3CertificateExtensionsImpl.hpp (original) +++ limal-head/limal-ca-mgm/src/X509v3CertificateExtensionsImpl.hpp Wed Oct 17 14:18:38 2007 @@ -42,84 +42,84 @@ namespace CA_MGM_NAMESPACE { - class X509v3CertificateExtsImpl : public blocxx::COWIntrusiveCountableBase +class X509v3CertificateExtsImpl : public blocxx::COWIntrusiveCountableBase +{ +public: + X509v3CertificateExtsImpl() + : nsBaseUrl(NsBaseUrlExt()), + nsRevocationUrl(NsRevocationUrlExt()), + nsCaRevocationUrl(NsCaRevocationUrlExt()), + nsRenewalUrl(NsRenewalUrlExt()), + nsCaPolicyUrl(NsCaPolicyUrlExt()), + nsSslServerName(NsSslServerNameExt()), + nsComment(NsCommentExt()), + keyUsage(KeyUsageExt()), + nsCertType(NsCertTypeExt()), + basicConstraints(BasicConstraintsExt()), + extendedKeyUsage(ExtendedKeyUsageExt()), + subjectKeyIdentifier(SubjectKeyIdentifierExt()), + authorityKeyIdentifier(AuthorityKeyIdentifierExt()), + subjectAlternativeName(SubjectAlternativeNameExt()), + issuerAlternativeName(IssuerAlternativeNameExt()), + authorityInfoAccess(AuthorityInfoAccessExt()), + crlDistributionPoints(CRLDistributionPointsExt()), + certificatePolicies(CertificatePoliciesExt()) + {} + + X509v3CertificateExtsImpl(const X509v3CertificateExtsImpl& impl) + : COWIntrusiveCountableBase(impl), + nsBaseUrl(impl.nsBaseUrl), + nsRevocationUrl(impl.nsRevocationUrl), + nsCaRevocationUrl(impl.nsCaRevocationUrl), + nsRenewalUrl(impl.nsRenewalUrl), + nsCaPolicyUrl(impl.nsCaPolicyUrl), + nsSslServerName(impl.nsSslServerName), + nsComment(impl.nsComment), + keyUsage(impl.keyUsage), + nsCertType(impl.nsCertType), + basicConstraints(impl.basicConstraints), + extendedKeyUsage(impl.extendedKeyUsage), + subjectKeyIdentifier(impl.subjectKeyIdentifier), + authorityKeyIdentifier(impl.authorityKeyIdentifier), + subjectAlternativeName(impl.subjectAlternativeName), + issuerAlternativeName(impl.issuerAlternativeName), + authorityInfoAccess(impl.authorityInfoAccess), + crlDistributionPoints(impl.crlDistributionPoints), + certificatePolicies(impl.certificatePolicies) + {} + + ~X509v3CertificateExtsImpl() {} + + X509v3CertificateExtsImpl* clone() const { - public: - X509v3CertificateExtsImpl() - : nsBaseUrl(NsBaseUrlExt()), - nsRevocationUrl(NsRevocationUrlExt()), - nsCaRevocationUrl(NsCaRevocationUrlExt()), - nsRenewalUrl(NsRenewalUrlExt()), - nsCaPolicyUrl(NsCaPolicyUrlExt()), - nsSslServerName(NsSslServerNameExt()), - nsComment(NsCommentExt()), - keyUsage(KeyUsageExt()), - nsCertType(NsCertTypeExt()), - basicConstraints(BasicConstraintsExt()), - extendedKeyUsage(ExtendedKeyUsageExt()), - subjectKeyIdentifier(SubjectKeyIdentifierExt()), - authorityKeyIdentifier(AuthorityKeyIdentifierExt()), - subjectAlternativeName(SubjectAlternativeNameExt()), - issuerAlternativeName(IssuerAlternativeNameExt()), - authorityInfoAccess(AuthorityInfoAccessExt()), - crlDistributionPoints(CRLDistributionPointsExt()), - certificatePolicies(CertificatePoliciesExt()) - {} - - X509v3CertificateExtsImpl(const X509v3CertificateExtsImpl& impl) - : COWIntrusiveCountableBase(impl), - nsBaseUrl(impl.nsBaseUrl), - nsRevocationUrl(impl.nsRevocationUrl), - nsCaRevocationUrl(impl.nsCaRevocationUrl), - nsRenewalUrl(impl.nsRenewalUrl), - nsCaPolicyUrl(impl.nsCaPolicyUrl), - nsSslServerName(impl.nsSslServerName), - nsComment(impl.nsComment), - keyUsage(impl.keyUsage), - nsCertType(impl.nsCertType), - basicConstraints(impl.basicConstraints), - extendedKeyUsage(impl.extendedKeyUsage), - subjectKeyIdentifier(impl.subjectKeyIdentifier), - authorityKeyIdentifier(impl.authorityKeyIdentifier), - subjectAlternativeName(impl.subjectAlternativeName), - issuerAlternativeName(impl.issuerAlternativeName), - authorityInfoAccess(impl.authorityInfoAccess), - crlDistributionPoints(impl.crlDistributionPoints), - certificatePolicies(impl.certificatePolicies) - {} - - ~X509v3CertificateExtsImpl() {} - - X509v3CertificateExtsImpl* clone() const - { - return new X509v3CertificateExtsImpl(*this); - } - + return new X509v3CertificateExtsImpl(*this); + } + /* String extensions */ - NsBaseUrlExt nsBaseUrl; - NsRevocationUrlExt nsRevocationUrl; - NsCaRevocationUrlExt nsCaRevocationUrl; - NsRenewalUrlExt nsRenewalUrl; - NsCaPolicyUrlExt nsCaPolicyUrl; - NsSslServerNameExt nsSslServerName; - NsCommentExt nsComment; - + NsBaseUrlExt nsBaseUrl; + NsRevocationUrlExt nsRevocationUrl; + NsCaRevocationUrlExt nsCaRevocationUrl; + NsRenewalUrlExt nsRenewalUrl; + NsCaPolicyUrlExt nsCaPolicyUrl; + NsSslServerNameExt nsSslServerName; + NsCommentExt nsComment; + /* Bit Strings */ - KeyUsageExt keyUsage; - NsCertTypeExt nsCertType; - - BasicConstraintsExt basicConstraints; - ExtendedKeyUsageExt extendedKeyUsage; - SubjectKeyIdentifierExt subjectKeyIdentifier; - AuthorityKeyIdentifierExt authorityKeyIdentifier; - SubjectAlternativeNameExt subjectAlternativeName; - IssuerAlternativeNameExt issuerAlternativeName; - - AuthorityInfoAccessExt authorityInfoAccess; - CRLDistributionPointsExt crlDistributionPoints; - CertificatePoliciesExt certificatePolicies; - }; + KeyUsageExt keyUsage; + NsCertTypeExt nsCertType; + + BasicConstraintsExt basicConstraints; + ExtendedKeyUsageExt extendedKeyUsage; + SubjectKeyIdentifierExt subjectKeyIdentifier; + AuthorityKeyIdentifierExt authorityKeyIdentifier; + SubjectAlternativeNameExt subjectAlternativeName; + IssuerAlternativeNameExt issuerAlternativeName; + + AuthorityInfoAccessExt authorityInfoAccess; + CRLDistributionPointsExt crlDistributionPoints; + CertificatePoliciesExt certificatePolicies; +}; } } Modified: limal-head/limal-ca-mgm/src/X509v3CertificateExtensions_Priv.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/X509v3Cer… ============================================================================== --- limal-head/limal-ca-mgm/src/X509v3CertificateExtensions_Priv.cpp (original) +++ limal-head/limal-ca-mgm/src/X509v3CertificateExtensions_Priv.cpp Wed Oct 17 14:18:38 2007 @@ -52,24 +52,24 @@ : X509v3CertificateExts() { // NsBaseUrlExt nsBaseUrl; - + parseStringExt(extensions, NID_netscape_base_url, m_impl->nsBaseUrl); // NsRevocationUrlExt nsRevocationUrl; - + parseStringExt(extensions, NID_netscape_revocation_url, m_impl->nsRevocationUrl); // NsCaRevocationUrlExt nsCaRevocationUrl; - + parseStringExt(extensions, NID_netscape_ca_revocation_url, m_impl->nsCaRevocationUrl); - + // NsRenewalUrlExt nsRenewalUrl; - + parseStringExt(extensions, NID_netscape_renewal_url, m_impl->nsRenewalUrl); - + // NsCaPolicyUrlExt nsCaPolicyUrl; parseStringExt(extensions, NID_netscape_ca_policy_url, @@ -123,7 +123,7 @@ parseAuthorityInfoAccessExt(extensions, m_impl->authorityInfoAccess); // CRLDistributionPointsExt crlDistributionPoints; - + parseCRLDistributionPointsExt(extensions, m_impl->crlDistributionPoints); // CertificatePoliciesExt certificatePolicies; @@ -362,21 +362,22 @@ X509v3CertificateExts_Priv::operator=(const X509v3CertificateExts_Priv& extensions) { if(this == &extensions) return *this; - + X509v3CertificateExts::operator=(extensions); return *this; } -void X509v3CertificateExts_Priv::parseStringExt(STACK_OF(X509_EXTENSION) * cert, - int nid, - StringExtension &ext) +void +X509v3CertificateExts_Priv::parseStringExt(STACK_OF(X509_EXTENSION) * cert, + int nid, + StringExtension &ext) { int crit = 0; - + ASN1_STRING *str = NULL; str = static_cast<ASN1_STRING *>(X509V3_get_d2i(cert, nid, &crit, NULL)); - + if(str == NULL) { if(crit == -1) @@ -388,7 +389,7 @@ } else if(crit == -2) { - // extension occurred more than once + // extension occurred more than once LOGIT_ERROR("Extension occurred more than once: " << nid); BLOCXX_THROW(limal::SyntaxException, Format(__("Extension occurred more than once: %1."), @@ -400,8 +401,8 @@ BLOCXX_THROW(limal::SyntaxException, Format(__("Unable to parse the certificate (NID: %1 Crit: %2)."), nid, crit).c_str()); - } - + } + char *s = new char[str->length +1]; memcpy(s, str->data, str->length); s[str->length] = '\0'; @@ -422,17 +423,18 @@ ASN1_STRING_free(str); } -void X509v3CertificateExts_Priv::parseBitExt(STACK_OF(X509_EXTENSION)* cert, - int nid, - BitExtension &ext) +void +X509v3CertificateExts_Priv::parseBitExt(STACK_OF(X509_EXTENSION)* cert, + int nid, + BitExtension &ext) { int crit = 0; - + ASN1_BIT_STRING *bit = NULL; bit = static_cast<ASN1_BIT_STRING *>(X509V3_get_d2i(cert, - nid, - &crit, - NULL)); + nid, + &crit, + NULL)); if(bit == NULL) { if(crit == -1) @@ -444,7 +446,7 @@ } else if(crit == -2) { - // extension occurred more than once + // extension occurred more than once LOGIT_ERROR("Extension occurred more than once: " << nid); BLOCXX_THROW(limal::SyntaxException, Format(__("Extension occurred more than once: %1."), @@ -456,18 +458,18 @@ BLOCXX_THROW(limal::SyntaxException, Format(__("Unable to parse the certificate (NID: %1 Crit: %2)."), nid, crit).c_str()); - } - + } + int len = bit->length -1; UInt32 ret = 0; - + for(; len >= 0; --len) { int bits = bit->data[len]; int shift = bits<<(len*8); ret |= shift; } - + ext.setValue(ret); if(crit == 1) @@ -482,16 +484,16 @@ ASN1_STRING_free(bit); } -void +void X509v3CertificateExts_Priv::parseExtendedKeyUsageExt(STACK_OF(X509_EXTENSION)* cert, ExtendedKeyUsageExt &ext) { int crit = 0; - + EXTENDED_KEY_USAGE *eku = NULL; eku = static_cast<EXTENDED_KEY_USAGE *>(X509V3_get_d2i(cert, - NID_ext_key_usage, - &crit, NULL)); + NID_ext_key_usage, + &crit, NULL)); if(eku == NULL) { if(crit == -1) @@ -503,7 +505,7 @@ } else if(crit == -2) { - // extension occurred more than once + // extension occurred more than once LOGIT_ERROR("Extension occurred more than once"); BLOCXX_THROW(limal::SyntaxException, __("Extension occurred more than once.")); @@ -547,17 +549,17 @@ EXTENDED_KEY_USAGE_free(eku); } -void +void X509v3CertificateExts_Priv::parseBasicConstraintsExt(STACK_OF(X509_EXTENSION)* cert, BasicConstraintsExt &ext) { int crit = 0; - + BASIC_CONSTRAINTS *bs = NULL; bs = static_cast<BASIC_CONSTRAINTS *>(X509V3_get_d2i(cert, - NID_basic_constraints, - &crit, NULL)); - + NID_basic_constraints, + &crit, NULL)); + if(bs == NULL) { if(crit == -1) @@ -569,7 +571,7 @@ } else if(crit == -2) { - // extension occurred more than once + // extension occurred more than once LOGIT_ERROR("Extension occurred more than once"); BLOCXX_THROW(limal::SyntaxException, __("Extension occurred more than once.")); @@ -611,17 +613,17 @@ BASIC_CONSTRAINTS_free(bs); } -void -X509v3CertificateExts_Priv::parseSubjectKeyIdentifierExt(STACK_OF(X509_EXTENSION) *cert, +void +X509v3CertificateExts_Priv::parseSubjectKeyIdentifierExt(STACK_OF(X509_EXTENSION) *cert, SubjectKeyIdentifierExt &ext) { int crit = 0; - + ASN1_OCTET_STRING *ski = NULL; ski = static_cast<ASN1_OCTET_STRING *>(X509V3_get_d2i(cert, - NID_subject_key_identifier, - &crit, NULL)); - + NID_subject_key_identifier, + &crit, NULL)); + if(ski == NULL) { if(crit == -1) @@ -633,7 +635,7 @@ } else if(crit == -2) { - // extension occurred more than once + // extension occurred more than once LOGIT_ERROR("Extension occurred more than once"); BLOCXX_THROW(limal::SyntaxException, __("Extension occurred more than once.")); @@ -673,17 +675,17 @@ ASN1_OCTET_STRING_free(ski); } -void +void X509v3CertificateExts_Priv::parseSubjectAlternativeNameExt(STACK_OF(X509_EXTENSION) *cert, SubjectAlternativeNameExt &ext) { int crit = 0; - + GENERAL_NAMES *gns = NULL; gns = static_cast<GENERAL_NAMES *>(X509V3_get_d2i(cert, - NID_subject_alt_name, - &crit, NULL)); - + NID_subject_alt_name, + &crit, NULL)); + if(gns == NULL) { if(crit == -1) @@ -695,7 +697,7 @@ } else if(crit == -2) { - // extension occurred more than once + // extension occurred more than once LOGIT_ERROR("Extension occurred more than once"); BLOCXX_THROW(limal::SyntaxException, __("Extension occurred more than once.")); @@ -707,7 +709,7 @@ Format(__("Unable to parse the certificate (Crit: %1)."), crit).c_str()); } - + int j; GENERAL_NAME *gen; blocxx::List<LiteralValue> lvList; @@ -743,17 +745,17 @@ GENERAL_NAMES_free(gns); } -void +void X509v3CertificateExts_Priv::parseIssuerAlternativeNameExt(STACK_OF(X509_EXTENSION) *cert, IssuerAlternativeNameExt &ext) { int crit = 0; - + GENERAL_NAMES *gns = NULL; gns = static_cast<GENERAL_NAMES *>(X509V3_get_d2i(cert, - NID_issuer_alt_name, - &crit, NULL)); - + NID_issuer_alt_name, + &crit, NULL)); + if(gns == NULL) { if(crit == -1) @@ -765,7 +767,7 @@ } else if(crit == -2) { - // extension occurred more than once + // extension occurred more than once LOGIT_ERROR("Extension occurred more than once"); BLOCXX_THROW(limal::SyntaxException, __("Extension occurred more than once.")); @@ -776,7 +778,7 @@ Format(__("Unable to parse the certificate (Crit: %1)."), crit).c_str()); } - + int j; GENERAL_NAME *gen; blocxx::List<LiteralValue> lvList; @@ -812,17 +814,17 @@ GENERAL_NAMES_free(gns); } -void +void X509v3CertificateExts_Priv::parseCRLDistributionPointsExt(STACK_OF(X509_EXTENSION) *cert, CRLDistributionPointsExt &ext) { int crit = 0; - + CRL_DIST_POINTS *cdps = NULL; cdps = static_cast<CRL_DIST_POINTS *>(X509V3_get_d2i(cert, - NID_crl_distribution_points, - &crit, NULL)); - + NID_crl_distribution_points, + &crit, NULL)); + if(cdps == NULL) { if(crit == -1) @@ -834,7 +836,7 @@ } else if(crit == -2) { - // extension occurred more than once + // extension occurred more than once LOGIT_ERROR("Extension occurred more than once"); BLOCXX_THROW(limal::SyntaxException, __("Extension occurred more than once.")); @@ -858,19 +860,19 @@ if(point->distpoint) { if(point->distpoint->type == 0) - { + { for(j = 0; j < sk_GENERAL_NAME_num(point->distpoint->name.fullname); j++) { gen = sk_GENERAL_NAME_value(point->distpoint->name.fullname, j); - + LiteralValue_Priv lv(gen); - + lvList.push_back(lv); } - } + } } } @@ -888,17 +890,17 @@ CRL_DIST_POINTS_free(cdps); } -void +void X509v3CertificateExts_Priv::parseAuthorityInfoAccessExt(STACK_OF(X509_EXTENSION) *cert, AuthorityInfoAccessExt &ext) { int crit = 0; - + AUTHORITY_INFO_ACCESS *ainf = NULL; ainf = static_cast<AUTHORITY_INFO_ACCESS *>(X509V3_get_d2i(cert, - NID_info_access, - &crit, NULL)); - + NID_info_access, + &crit, NULL)); + if(ainf == NULL) { if(crit == -1) @@ -910,7 +912,7 @@ } else if(crit == -2) { - // extension occurred more than once + // extension occurred more than once LOGIT_ERROR("Extension occurred more than once"); BLOCXX_THROW(limal::SyntaxException, __("Extension occurred more than once.")); @@ -933,7 +935,7 @@ desc = sk_ACCESS_DESCRIPTION_value(ainf, i); LiteralValue_Priv lv(desc->location); - + if(!lv.valid()) { LOGIT_ERROR("Invalid location in authorityInfoAccess"); @@ -942,7 +944,7 @@ } String method; - + i2t_ASN1_OBJECT(objtmp, sizeof objtmp, desc->method); int nid = OBJ_txt2nid(objtmp); @@ -962,7 +964,7 @@ } ext.setAuthorityInformation(infolist); - + if(crit == 1) { ext.setCritical(true); @@ -975,19 +977,19 @@ AUTHORITY_INFO_ACCESS_free(ainf); } -void +void X509v3CertificateExts_Priv::parseCertificatePoliciesExt(STACK_OF(X509_EXTENSION) *cert, CertificatePoliciesExt &ext) { int crit = 0; - + CERTIFICATEPOLICIES *cps = NULL; cps = static_cast<CERTIFICATEPOLICIES *>(X509V3_get_d2i(cert, - NID_certificate_policies, - &crit, NULL)); - + NID_certificate_policies, + &crit, NULL)); + if(cps == NULL) - { + { if(crit == -1) { // extension not found ext.setPresent(false); @@ -996,7 +998,7 @@ } else if(crit == -2) { - // extension occurred more than once + // extension occurred more than once LOGIT_ERROR("Extension occurred more than once"); BLOCXX_THROW(limal::SyntaxException, __("Extension occurred more than once.")); @@ -1037,70 +1039,70 @@ switch(OBJ_obj2nid(qualinfo->pqualid)) { - case NID_id_qt_cps: - s = new char[qualinfo->d.cpsuri->length +1]; - memcpy(s, qualinfo->d.cpsuri->data, qualinfo->d.cpsuri->length); - s[qualinfo->d.cpsuri->length] = '\0'; + case NID_id_qt_cps: + s = new char[qualinfo->d.cpsuri->length +1]; + memcpy(s, qualinfo->d.cpsuri->data, qualinfo->d.cpsuri->length); + s[qualinfo->d.cpsuri->length] = '\0'; + + cpsURI.push_back(String(s)); + delete [] s; + break; + case NID_id_qt_unotice: + int k; + un = UserNotice(); + + if(qualinfo->d.usernotice->noticeref) + { + NOTICEREF *ref; + blocxx::List<blocxx::Int32> numberList; - cpsURI.push_back(String(s)); - delete [] s; - break; - case NID_id_qt_unotice: - int k; - un = UserNotice(); + ref = qualinfo->d.usernotice->noticeref; - if(qualinfo->d.usernotice->noticeref) + for(k = 0; k < sk_ASN1_INTEGER_num(ref->noticenos); k++) { - NOTICEREF *ref; - blocxx::List<blocxx::Int32> numberList; + ASN1_INTEGER *num; + char *tmp; - ref = qualinfo->d.usernotice->noticeref; + num = sk_ASN1_INTEGER_value(ref->noticenos, k); + tmp = i2s_ASN1_INTEGER(NULL, num); - for(k = 0; k < sk_ASN1_INTEGER_num(ref->noticenos); k++) - { - ASN1_INTEGER *num; - char *tmp; - - num = sk_ASN1_INTEGER_value(ref->noticenos, k); - tmp = i2s_ASN1_INTEGER(NULL, num); - - numberList.push_back(String(tmp).toInt32()); - - OPENSSL_free(tmp); - } - s = new char[ref->organization->length +1]; - memcpy(s, ref->organization->data, ref->organization->length); - s[ref->organization->length] = '\0'; - - un.setOrganizationNotice(s, numberList); - - delete [] s; - } - if(qualinfo->d.usernotice->exptext) - { - s = new char[qualinfo->d.usernotice->exptext->length +1]; - memcpy(s, qualinfo->d.usernotice->exptext->data, - qualinfo->d.usernotice->exptext->length); - s[qualinfo->d.usernotice->exptext->length] = '\0'; - - un.setExplicitText(s); - - delete [] s; + numberList.push_back(String(tmp).toInt32()); + + OPENSSL_free(tmp); } - noticeList.push_back(un); - break; - default: - i2t_ASN1_OBJECT(obj_tmp, sizeof obj_tmp, qualinfo->pqualid); - - LOGIT_INFO("Unknown Qualifier: " << obj_tmp); - break; + s = new char[ref->organization->length +1]; + memcpy(s, ref->organization->data, ref->organization->length); + s[ref->organization->length] = '\0'; + + un.setOrganizationNotice(s, numberList); + + delete [] s; + } + if(qualinfo->d.usernotice->exptext) + { + s = new char[qualinfo->d.usernotice->exptext->length +1]; + memcpy(s, qualinfo->d.usernotice->exptext->data, + qualinfo->d.usernotice->exptext->length); + s[qualinfo->d.usernotice->exptext->length] = '\0'; + + un.setExplicitText(s); + + delete [] s; + } + noticeList.push_back(un); + break; + default: + i2t_ASN1_OBJECT(obj_tmp, sizeof obj_tmp, qualinfo->pqualid); + + LOGIT_INFO("Unknown Qualifier: " << obj_tmp); + break; } } cp.setCpsURI(cpsURI); cp.setUserNoticeList(noticeList); } policies.push_back(cp); - } + } ext.setPolicies(policies); Modified: limal-head/limal-ca-mgm/src/X509v3CertificateExtensions_Priv.hpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/X509v3Cer… ============================================================================== --- limal-head/limal-ca-mgm/src/X509v3CertificateExtensions_Priv.hpp (original) +++ limal-head/limal-ca-mgm/src/X509v3CertificateExtensions_Priv.hpp Wed Oct 17 14:18:38 2007 @@ -31,112 +31,112 @@ namespace CA_MGM_NAMESPACE { - class X509v3CertificateExts_Priv : public X509v3CertificateExts { - public: - X509v3CertificateExts_Priv(); - X509v3CertificateExts_Priv(STACK_OF(X509_EXTENSION) *extensions); - X509v3CertificateExts_Priv(const X509v3CertificateExts_Priv& extensions); - virtual ~X509v3CertificateExts_Priv(); - - void - setNsBaseUrl(const NsBaseUrlExt &ext); - - void - setNsRevocationUrl(const NsRevocationUrlExt &ext); - - void - setNsCaRevocationUrl(const NsCaRevocationUrlExt &ext); - - void - setNsRenewalUrl(const NsRenewalUrlExt &ext); - - void - setNsCaPolicyUrl(const NsCaPolicyUrlExt &ext); - - void - setNsSslServerName(const NsSslServerNameExt &ext); - - void - setNsComment(const NsCommentExt &ext); - - void - setNsCertType(const NsCertTypeExt &ext); - - void - setKeyUsage(const KeyUsageExt &ext); - - void - setBasicConstraints(const BasicConstraintsExt &ext); - - void - setExtendedKeyUsage(const ExtendedKeyUsageExt &ext); - - void - setSubjectKeyIdentifier(const SubjectKeyIdentifierExt &ext); - - void - setAuthorityKeyIdentifier(const AuthorityKeyIdentifierExt &ext); - - void - setSubjectAlternativeName(const SubjectAlternativeNameExt &ext); - - void - setIssuerAlternativeName(const IssuerAlternativeNameExt &ext); - - void - setAuthorityInfoAccess(const AuthorityInfoAccessExt &ext); - - void - setCRLDistributionPoints(const CRLDistributionPointsExt &ext); - - void - setCertificatePolicies(const CertificatePoliciesExt &ext); - - private: - - X509v3CertificateExts_Priv& - operator=(const X509v3CertificateExts_Priv& extensions); - - void - parseStringExt(STACK_OF(X509_EXTENSION)* cert, - int nid, StringExtension &ext); - - void - parseBitExt(STACK_OF(X509_EXTENSION)* cert, - int nid, BitExtension &ext); - - void - parseExtendedKeyUsageExt(STACK_OF(X509_EXTENSION)* cert, - ExtendedKeyUsageExt &ext); - - void - parseBasicConstraintsExt(STACK_OF(X509_EXTENSION)* cert, - BasicConstraintsExt &ext); - - void - parseSubjectKeyIdentifierExt(STACK_OF(X509_EXTENSION) *cert, - SubjectKeyIdentifierExt &ext); - - void - parseSubjectAlternativeNameExt(STACK_OF(X509_EXTENSION) *cert, - SubjectAlternativeNameExt &ext); - - void - parseIssuerAlternativeNameExt(STACK_OF(X509_EXTENSION) *cert, - IssuerAlternativeNameExt &ext); - - void - parseCRLDistributionPointsExt(STACK_OF(X509_EXTENSION) *cert, - CRLDistributionPointsExt &ext); - - void - parseAuthorityInfoAccessExt(STACK_OF(X509_EXTENSION) *cert, - AuthorityInfoAccessExt &ext); - - void - parseCertificatePoliciesExt(STACK_OF(X509_EXTENSION) *cert, - CertificatePoliciesExt &ext); - }; +class X509v3CertificateExts_Priv : public X509v3CertificateExts { +public: + X509v3CertificateExts_Priv(); + X509v3CertificateExts_Priv(STACK_OF(X509_EXTENSION) *extensions); + X509v3CertificateExts_Priv(const X509v3CertificateExts_Priv& extensions); + virtual ~X509v3CertificateExts_Priv(); + + void + setNsBaseUrl(const NsBaseUrlExt &ext); + + void + setNsRevocationUrl(const NsRevocationUrlExt &ext); + + void + setNsCaRevocationUrl(const NsCaRevocationUrlExt &ext); + + void + setNsRenewalUrl(const NsRenewalUrlExt &ext); + + void + setNsCaPolicyUrl(const NsCaPolicyUrlExt &ext); + + void + setNsSslServerName(const NsSslServerNameExt &ext); + + void + setNsComment(const NsCommentExt &ext); + + void + setNsCertType(const NsCertTypeExt &ext); + + void + setKeyUsage(const KeyUsageExt &ext); + + void + setBasicConstraints(const BasicConstraintsExt &ext); + + void + setExtendedKeyUsage(const ExtendedKeyUsageExt &ext); + + void + setSubjectKeyIdentifier(const SubjectKeyIdentifierExt &ext); + + void + setAuthorityKeyIdentifier(const AuthorityKeyIdentifierExt &ext); + + void + setSubjectAlternativeName(const SubjectAlternativeNameExt &ext); + + void + setIssuerAlternativeName(const IssuerAlternativeNameExt &ext); + + void + setAuthorityInfoAccess(const AuthorityInfoAccessExt &ext); + + void + setCRLDistributionPoints(const CRLDistributionPointsExt &ext); + + void + setCertificatePolicies(const CertificatePoliciesExt &ext); + +private: + + X509v3CertificateExts_Priv& + operator=(const X509v3CertificateExts_Priv& extensions); + + void + parseStringExt(STACK_OF(X509_EXTENSION)* cert, + int nid, StringExtension &ext); + + void + parseBitExt(STACK_OF(X509_EXTENSION)* cert, + int nid, BitExtension &ext); + + void + parseExtendedKeyUsageExt(STACK_OF(X509_EXTENSION)* cert, + ExtendedKeyUsageExt &ext); + + void + parseBasicConstraintsExt(STACK_OF(X509_EXTENSION)* cert, + BasicConstraintsExt &ext); + + void + parseSubjectKeyIdentifierExt(STACK_OF(X509_EXTENSION) *cert, + SubjectKeyIdentifierExt &ext); + + void + parseSubjectAlternativeNameExt(STACK_OF(X509_EXTENSION) *cert, + SubjectAlternativeNameExt &ext); + + void + parseIssuerAlternativeNameExt(STACK_OF(X509_EXTENSION) *cert, + IssuerAlternativeNameExt &ext); + + void + parseCRLDistributionPointsExt(STACK_OF(X509_EXTENSION) *cert, + CRLDistributionPointsExt &ext); + + void + parseAuthorityInfoAccessExt(STACK_OF(X509_EXTENSION) *cert, + AuthorityInfoAccessExt &ext); + + void + parseCertificatePoliciesExt(STACK_OF(X509_EXTENSION) *cert, + CertificatePoliciesExt &ext); +}; } } Modified: limal-head/limal-ca-mgm/src/X509v3CertificateIssueExtensions.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/X509v3Cer… ============================================================================== --- limal-head/limal-ca-mgm/src/X509v3CertificateIssueExtensions.cpp (original) +++ limal-head/limal-ca-mgm/src/X509v3CertificateIssueExtensions.cpp Wed Oct 17 14:18:38 2007 @@ -38,70 +38,70 @@ class X509v3CertificateIssueExtsImpl : public blocxx::COWIntrusiveCountableBase { - public: +public: X509v3CertificateIssueExtsImpl() : nsBaseUrl(NsBaseUrlExt()), - nsRevocationUrl(NsRevocationUrlExt()), - nsCaRevocationUrl(NsCaRevocationUrlExt()), - nsRenewalUrl(NsRenewalUrlExt()), - nsCaPolicyUrl(NsCaPolicyUrlExt()), - nsSslServerName(NsSslServerNameExt()), - nsComment(NsCommentExt()), - keyUsage(KeyUsageExt()), - nsCertType(NsCertTypeExt()), - basicConstraints(BasicConstraintsExt()), - extendedKeyUsage(ExtendedKeyUsageExt()), - subjectKeyIdentifier(SubjectKeyIdentifierExt()), - authorityKeyIdentifier(AuthorityKeyIdentifierGenerateExt()), - subjectAlternativeName(SubjectAlternativeNameExt()), - issuerAlternativeName(IssuerAlternativeNameExt()), - authorityInfoAccess(AuthorityInfoAccessExt()), - crlDistributionPoints(CRLDistributionPointsExt()), - certificatePolicies(CertificatePoliciesExt()) + nsRevocationUrl(NsRevocationUrlExt()), + nsCaRevocationUrl(NsCaRevocationUrlExt()), + nsRenewalUrl(NsRenewalUrlExt()), + nsCaPolicyUrl(NsCaPolicyUrlExt()), + nsSslServerName(NsSslServerNameExt()), + nsComment(NsCommentExt()), + keyUsage(KeyUsageExt()), + nsCertType(NsCertTypeExt()), + basicConstraints(BasicConstraintsExt()), + extendedKeyUsage(ExtendedKeyUsageExt()), + subjectKeyIdentifier(SubjectKeyIdentifierExt()), + authorityKeyIdentifier(AuthorityKeyIdentifierGenerateExt()), + subjectAlternativeName(SubjectAlternativeNameExt()), + issuerAlternativeName(IssuerAlternativeNameExt()), + authorityInfoAccess(AuthorityInfoAccessExt()), + crlDistributionPoints(CRLDistributionPointsExt()), + certificatePolicies(CertificatePoliciesExt()) {} X509v3CertificateIssueExtsImpl(CAConfig* caConfig, Type type) : nsBaseUrl(caConfig, type), - nsRevocationUrl(caConfig, type), - nsCaRevocationUrl(caConfig, type), - nsRenewalUrl(caConfig, type), - nsCaPolicyUrl(caConfig, type), - nsSslServerName(caConfig, type), - nsComment(caConfig, type), - keyUsage(caConfig, type), - nsCertType(caConfig, type), - basicConstraints(caConfig, type), - extendedKeyUsage(caConfig, type), - subjectKeyIdentifier(caConfig, type), - authorityKeyIdentifier(caConfig, type), - subjectAlternativeName(caConfig, type), - issuerAlternativeName(caConfig, type), - authorityInfoAccess(caConfig, type), - crlDistributionPoints(caConfig, type), - certificatePolicies(caConfig, type) + nsRevocationUrl(caConfig, type), + nsCaRevocationUrl(caConfig, type), + nsRenewalUrl(caConfig, type), + nsCaPolicyUrl(caConfig, type), + nsSslServerName(caConfig, type), + nsComment(caConfig, type), + keyUsage(caConfig, type), + nsCertType(caConfig, type), + basicConstraints(caConfig, type), + extendedKeyUsage(caConfig, type), + subjectKeyIdentifier(caConfig, type), + authorityKeyIdentifier(caConfig, type), + subjectAlternativeName(caConfig, type), + issuerAlternativeName(caConfig, type), + authorityInfoAccess(caConfig, type), + crlDistributionPoints(caConfig, type), + certificatePolicies(caConfig, type) {} X509v3CertificateIssueExtsImpl(const X509v3CertificateIssueExtsImpl& impl) : COWIntrusiveCountableBase(impl), - nsBaseUrl(impl.nsBaseUrl), - nsRevocationUrl(impl.nsRevocationUrl), - nsCaRevocationUrl(impl.nsCaRevocationUrl), - nsRenewalUrl(impl.nsRenewalUrl), - nsCaPolicyUrl(impl.nsCaPolicyUrl), - nsSslServerName(impl.nsSslServerName), - nsComment(impl.nsComment), - keyUsage(impl.keyUsage), - nsCertType(impl.nsCertType), - basicConstraints(impl.basicConstraints), - extendedKeyUsage(impl.extendedKeyUsage), - subjectKeyIdentifier(impl.subjectKeyIdentifier), - authorityKeyIdentifier(impl.authorityKeyIdentifier), - subjectAlternativeName(impl.subjectAlternativeName), - issuerAlternativeName(impl.issuerAlternativeName), - authorityInfoAccess(impl.authorityInfoAccess), - crlDistributionPoints(impl.crlDistributionPoints), - certificatePolicies(impl.certificatePolicies) + nsBaseUrl(impl.nsBaseUrl), + nsRevocationUrl(impl.nsRevocationUrl), + nsCaRevocationUrl(impl.nsCaRevocationUrl), + nsRenewalUrl(impl.nsRenewalUrl), + nsCaPolicyUrl(impl.nsCaPolicyUrl), + nsSslServerName(impl.nsSslServerName), + nsComment(impl.nsComment), + keyUsage(impl.keyUsage), + nsCertType(impl.nsCertType), + basicConstraints(impl.basicConstraints), + extendedKeyUsage(impl.extendedKeyUsage), + subjectKeyIdentifier(impl.subjectKeyIdentifier), + authorityKeyIdentifier(impl.authorityKeyIdentifier), + subjectAlternativeName(impl.subjectAlternativeName), + issuerAlternativeName(impl.issuerAlternativeName), + authorityInfoAccess(impl.authorityInfoAccess), + crlDistributionPoints(impl.crlDistributionPoints), + certificatePolicies(impl.certificatePolicies) {} ~X509v3CertificateIssueExtsImpl() {} @@ -120,31 +120,31 @@ NsCaPolicyUrlExt nsCaPolicyUrl; NsSslServerNameExt nsSslServerName; NsCommentExt nsComment; - + /* Bit Strings */ KeyUsageExt keyUsage; NsCertTypeExt nsCertType; - + BasicConstraintsExt basicConstraints; ExtendedKeyUsageExt extendedKeyUsage; SubjectKeyIdentifierExt subjectKeyIdentifier; AuthorityKeyIdentifierGenerateExt authorityKeyIdentifier; SubjectAlternativeNameExt subjectAlternativeName; IssuerAlternativeNameExt issuerAlternativeName; - + AuthorityInfoAccessExt authorityInfoAccess; CRLDistributionPointsExt crlDistributionPoints; CertificatePoliciesExt certificatePolicies; - + }; - + X509v3CertificateIssueExts::X509v3CertificateIssueExts() : m_impl(new X509v3CertificateIssueExtsImpl()) {} X509v3CertificateIssueExts::X509v3CertificateIssueExts(CAConfig* caConfig, - Type type) + Type type) : m_impl(new X509v3CertificateIssueExtsImpl(caConfig, type)) {} @@ -170,7 +170,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(limal::ValueException, + BLOCXX_THROW(limal::ValueException, __("Invalid value for X509v3CertificateIssueExts::setNsBaseUrl.")); } m_impl->nsBaseUrl = ext; @@ -193,7 +193,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(limal::ValueException, + BLOCXX_THROW(limal::ValueException, __("Invalid value for X509v3CertificateIssueExts::setNsRevocationUrl.")); } m_impl->nsRevocationUrl = ext; @@ -216,7 +216,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(limal::ValueException, + BLOCXX_THROW(limal::ValueException, __("Invalid value for X509v3CertificateIssueExts::setNsCaRevocationUrl.")); } m_impl->nsCaRevocationUrl = ext; @@ -239,7 +239,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(limal::ValueException, + BLOCXX_THROW(limal::ValueException, __("Invalid value for X509v3CertificateIssueExts::setNsRenewalUrl.")); } m_impl->nsRenewalUrl = ext; @@ -262,7 +262,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(limal::ValueException, + BLOCXX_THROW(limal::ValueException, __("Invalid value for X509v3CertificateIssueExts::setNsCaPolicyUrl.")); } m_impl->nsCaPolicyUrl = ext; @@ -285,7 +285,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(limal::ValueException, + BLOCXX_THROW(limal::ValueException, __("Invalid value for X509v3CertificateIssueExts::setNsSslServerName.")); } m_impl->nsSslServerName = ext; @@ -308,7 +308,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(limal::ValueException, + BLOCXX_THROW(limal::ValueException, __("Invalid value for X509v3CertificateIssueExts::setNsComment.")); } m_impl->nsComment = ext; @@ -331,7 +331,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(limal::ValueException, + BLOCXX_THROW(limal::ValueException, __("Invalid value for X509v3CertificateIssueExts::setNsCertType.")); } m_impl->nsCertType = ext; @@ -354,7 +354,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(limal::ValueException, + BLOCXX_THROW(limal::ValueException, __("Invalid value for X509v3CertificateIssueExts::setKeyUsage.")); } m_impl->keyUsage = ext; @@ -377,7 +377,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(limal::ValueException, + BLOCXX_THROW(limal::ValueException, __("Invalid value for X509v3CertificateIssueExts::setBasicConstraints.")); } m_impl->basicConstraints = ext; @@ -400,7 +400,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(limal::ValueException, + BLOCXX_THROW(limal::ValueException, __("Invalid value for X509v3CertificateIssueExts::setExtendedKeyUsage.")); } m_impl->extendedKeyUsage = ext; @@ -423,7 +423,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(limal::ValueException, + BLOCXX_THROW(limal::ValueException, __("Invalid value for X509v3CertificateIssueExts::setSubjectKeyIdentifier.")); } m_impl->subjectKeyIdentifier = ext; @@ -446,7 +446,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(limal::ValueException, + BLOCXX_THROW(limal::ValueException, __("Invalid value for X509v3CertificateIssueExts::setAuthorityKeyIdentifier.")); } m_impl->authorityKeyIdentifier = ext; @@ -469,7 +469,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(limal::ValueException, + BLOCXX_THROW(limal::ValueException, __("Invalid value for X509v3CertificateIssueExts::setSubjectAlternativeName.")); } m_impl->subjectAlternativeName = ext; @@ -492,7 +492,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(limal::ValueException, + BLOCXX_THROW(limal::ValueException, __("Invalid value for X509v3CertificateIssueExts::setIssuerAlternativeName.")); } m_impl->issuerAlternativeName = ext; @@ -515,7 +515,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(limal::ValueException, + BLOCXX_THROW(limal::ValueException, __("Invalid value for X509v3CertificateIssueExts::setAuthorityInfoAccess.")); } m_impl->authorityInfoAccess = ext; @@ -538,7 +538,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(limal::ValueException, + BLOCXX_THROW(limal::ValueException, __("Invalid value for X509v3CertificateIssueExts::setCRLDistributionPoints.")); } m_impl->crlDistributionPoints = ext; @@ -561,7 +561,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(limal::ValueException, + BLOCXX_THROW(limal::ValueException, __("Invalid value for X509v3CertificateIssueExts::setCertificatePolicies.")); } m_impl->certificatePolicies = ext; @@ -645,9 +645,9 @@ result.appendArray(m_impl->nsCaPolicyUrl.verify()); result.appendArray(m_impl->nsSslServerName.verify()); result.appendArray(m_impl->nsComment.verify()); - result.appendArray(m_impl->keyUsage.verify()); - result.appendArray(m_impl->nsCertType.verify()); - result.appendArray(m_impl->basicConstraints.verify()); + result.appendArray(m_impl->keyUsage.verify()); + result.appendArray(m_impl->nsCertType.verify()); + result.appendArray(m_impl->basicConstraints.verify()); result.appendArray(m_impl->extendedKeyUsage.verify()); result.appendArray(m_impl->subjectKeyIdentifier.verify()); result.appendArray(m_impl->authorityKeyIdentifier.verify()); @@ -674,9 +674,9 @@ result.appendArray(m_impl->nsCaPolicyUrl.dump()); result.appendArray(m_impl->nsSslServerName.dump()); result.appendArray(m_impl->nsComment.dump()); - result.appendArray(m_impl->keyUsage.dump()); - result.appendArray(m_impl->nsCertType.dump()); - result.appendArray(m_impl->basicConstraints.dump()); + result.appendArray(m_impl->keyUsage.dump()); + result.appendArray(m_impl->nsCertType.dump()); + result.appendArray(m_impl->basicConstraints.dump()); result.appendArray(m_impl->extendedKeyUsage.dump()); result.appendArray(m_impl->subjectKeyIdentifier.dump()); result.appendArray(m_impl->authorityKeyIdentifier.dump()); Modified: limal-head/limal-ca-mgm/src/X509v3RequestExtensions.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/X509v3Req… ============================================================================== --- limal-head/limal-ca-mgm/src/X509v3RequestExtensions.cpp (original) +++ limal-head/limal-ca-mgm/src/X509v3RequestExtensions.cpp Wed Oct 17 14:18:38 2007 @@ -35,7 +35,7 @@ using namespace limal; using namespace blocxx; - + X509v3RequestExts::X509v3RequestExts() : m_impl(new X509v3RequestExtsImpl()) {} @@ -66,7 +66,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(limal::ValueException, + BLOCXX_THROW(limal::ValueException, __("Invalid value for X509v3RequestExts::setNsSslServerName.")); } m_impl->nsSslServerName = ext; @@ -89,7 +89,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(limal::ValueException, + BLOCXX_THROW(limal::ValueException, __("Invalid value for X509v3RequestExts::setNsComment.")); } m_impl->nsComment = ext; @@ -112,7 +112,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(limal::ValueException, + BLOCXX_THROW(limal::ValueException, __("Invalid value for X509v3RequestExts::setNsCertType.")); } m_impl->nsCertType = ext; @@ -135,7 +135,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(limal::ValueException, + BLOCXX_THROW(limal::ValueException, __("Invalid value for X509v3RequestExts::setKeyUsage.")); } m_impl->keyUsage = ext; @@ -158,7 +158,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(limal::ValueException, + BLOCXX_THROW(limal::ValueException, __("Invalid value for X509v3RequestExts::setBasicConstraints.")); } m_impl->basicConstraints = ext; @@ -181,7 +181,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(limal::ValueException, + BLOCXX_THROW(limal::ValueException, __("Invalid value for X509v3RequestExts::setExtendedKeyUsage.")); } m_impl->extendedKeyUsage = ext; @@ -204,7 +204,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(limal::ValueException, + BLOCXX_THROW(limal::ValueException, __("Invalid value for X509v3RequestExts::setSubjectKeyIdentifier.")); } m_impl->subjectKeyIdentifier = ext; @@ -227,7 +227,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(limal::ValueException, + BLOCXX_THROW(limal::ValueException, __("Invalid value for X509v3RequestExts::setSubjectAlternativeName.")); } m_impl->subjectAlternativeName = ext; @@ -285,9 +285,9 @@ result.appendArray(m_impl->nsSslServerName.verify()); result.appendArray(m_impl->nsComment.verify()); - result.appendArray(m_impl->keyUsage.verify()); - result.appendArray(m_impl->nsCertType.verify()); - result.appendArray(m_impl->basicConstraints.verify()); + result.appendArray(m_impl->keyUsage.verify()); + result.appendArray(m_impl->nsCertType.verify()); + result.appendArray(m_impl->basicConstraints.verify()); result.appendArray(m_impl->extendedKeyUsage.verify()); result.appendArray(m_impl->subjectKeyIdentifier.verify()); result.appendArray(m_impl->subjectAlternativeName.verify()); @@ -304,9 +304,9 @@ result.appendArray(m_impl->nsSslServerName.dump()); result.appendArray(m_impl->nsComment.dump()); - result.appendArray(m_impl->keyUsage.dump()); - result.appendArray(m_impl->nsCertType.dump()); - result.appendArray(m_impl->basicConstraints.dump()); + result.appendArray(m_impl->keyUsage.dump()); + result.appendArray(m_impl->nsCertType.dump()); + result.appendArray(m_impl->basicConstraints.dump()); result.appendArray(m_impl->extendedKeyUsage.dump()); result.appendArray(m_impl->subjectKeyIdentifier.dump()); result.appendArray(m_impl->subjectAlternativeName.dump()); Modified: limal-head/limal-ca-mgm/src/X509v3RequestExtensionsImpl.hpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/X509v3Req… ============================================================================== --- limal-head/limal-ca-mgm/src/X509v3RequestExtensionsImpl.hpp (original) +++ limal-head/limal-ca-mgm/src/X509v3RequestExtensionsImpl.hpp Wed Oct 17 14:18:38 2007 @@ -32,39 +32,39 @@ class X509v3RequestExtsImpl : public blocxx::COWIntrusiveCountableBase { - public: +public: X509v3RequestExtsImpl() : nsSslServerName(NsSslServerNameExt()), - nsComment(NsCommentExt()), - keyUsage(KeyUsageExt()), - nsCertType(NsCertTypeExt()), - basicConstraints(BasicConstraintsExt()), - extendedKeyUsage(ExtendedKeyUsageExt()), - subjectKeyIdentifier(SubjectKeyIdentifierExt()), - subjectAlternativeName(SubjectAlternativeNameExt()) + nsComment(NsCommentExt()), + keyUsage(KeyUsageExt()), + nsCertType(NsCertTypeExt()), + basicConstraints(BasicConstraintsExt()), + extendedKeyUsage(ExtendedKeyUsageExt()), + subjectKeyIdentifier(SubjectKeyIdentifierExt()), + subjectAlternativeName(SubjectAlternativeNameExt()) {} X509v3RequestExtsImpl(CAConfig* caConfig, Type type) : nsSslServerName(caConfig, type), - nsComment(caConfig, type), - keyUsage(caConfig, type), - nsCertType(caConfig, type), - basicConstraints(caConfig, type), - extendedKeyUsage(caConfig, type), - subjectKeyIdentifier(caConfig, type), - subjectAlternativeName(caConfig, type) + nsComment(caConfig, type), + keyUsage(caConfig, type), + nsCertType(caConfig, type), + basicConstraints(caConfig, type), + extendedKeyUsage(caConfig, type), + subjectKeyIdentifier(caConfig, type), + subjectAlternativeName(caConfig, type) {} X509v3RequestExtsImpl(const X509v3RequestExtsImpl& impl) : COWIntrusiveCountableBase(impl), - nsSslServerName(impl.nsSslServerName), - nsComment(impl.nsComment), - keyUsage(impl.keyUsage), - nsCertType(impl.nsCertType), - basicConstraints(impl.basicConstraints), - extendedKeyUsage(impl.extendedKeyUsage), - subjectKeyIdentifier(impl.subjectKeyIdentifier), - subjectAlternativeName(impl.subjectAlternativeName) + nsSslServerName(impl.nsSslServerName), + nsComment(impl.nsComment), + keyUsage(impl.keyUsage), + nsCertType(impl.nsCertType), + basicConstraints(impl.basicConstraints), + extendedKeyUsage(impl.extendedKeyUsage), + subjectKeyIdentifier(impl.subjectKeyIdentifier), + subjectAlternativeName(impl.subjectAlternativeName) {} ~X509v3RequestExtsImpl() {} @@ -75,19 +75,19 @@ } /* String extensions */ - + NsSslServerNameExt nsSslServerName; NsCommentExt nsComment; - + /* Bit Strings */ - KeyUsageExt keyUsage; + KeyUsageExt keyUsage; NsCertTypeExt nsCertType; - + BasicConstraintsExt basicConstraints; ExtendedKeyUsageExt extendedKeyUsage; SubjectKeyIdentifierExt subjectKeyIdentifier; SubjectAlternativeNameExt subjectAlternativeName; - + // AuthorityInfoAccessExt authorityInfoAccess; // ??? }; Modified: limal-head/limal-ca-mgm/src/X509v3RequestExtensions_Priv.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/X509v3Req… ============================================================================== --- limal-head/limal-ca-mgm/src/X509v3RequestExtensions_Priv.cpp (original) +++ limal-head/limal-ca-mgm/src/X509v3RequestExtensions_Priv.cpp Wed Oct 17 14:18:38 2007 @@ -45,7 +45,7 @@ X509v3RequestExts_Priv::X509v3RequestExts_Priv() : X509v3RequestExts() {} - + X509v3RequestExts_Priv::X509v3RequestExts_Priv(STACK_OF(X509_EXTENSION)* extensions) : X509v3RequestExts() { @@ -59,7 +59,7 @@ parseStringExt(extensions, NID_netscape_comment, m_impl->nsComment); - // KeyUsageExt keyUsage; + // KeyUsageExt keyUsage; parseBitExt(extensions, NID_key_usage, m_impl->keyUsage); @@ -101,24 +101,24 @@ X509v3RequestExts_Priv::operator=(const X509v3RequestExts_Priv& extensions) { if(this == &extensions) return *this; - + X509v3RequestExts::operator=(extensions); return *this; } void -X509v3RequestExts_Priv::parseStringExt(STACK_OF(X509_EXTENSION) * cert, +X509v3RequestExts_Priv::parseStringExt(STACK_OF(X509_EXTENSION) * cert, int nid, StringExtension &ext) { int crit = 0; - + ASN1_STRING *str = NULL; str = static_cast<ASN1_STRING *>(X509V3_get_d2i(cert, nid, &crit, NULL)); - + if(str == NULL) - { + { if(crit == -1) { // extension not found @@ -128,7 +128,7 @@ } else if(crit == -2) { - // extension occurred more than once + // extension occurred more than once LOGIT_ERROR("Extension occurred more than once: " << nid); BLOCXX_THROW(limal::SyntaxException, Format(__("Extension occurred more than once: %1."), @@ -141,7 +141,7 @@ Format(__("Unable to parse the certificate (NID: %1 Crit: %2)."), nid, crit).c_str()); } - + char *s = new char[str->length +1]; memcpy(s, str->data, str->length); s[str->length] = '\0'; @@ -163,17 +163,17 @@ } void -X509v3RequestExts_Priv::parseBitExt(STACK_OF(X509_EXTENSION)* cert, +X509v3RequestExts_Priv::parseBitExt(STACK_OF(X509_EXTENSION)* cert, int nid, BitExtension &ext) { int crit = 0; - + ASN1_BIT_STRING *bit = NULL; bit = static_cast<ASN1_BIT_STRING *>(X509V3_get_d2i(cert, nid, &crit, NULL)); - + if(bit == NULL) - { + { if(crit == -1) { // extension not found @@ -183,7 +183,7 @@ } else if(crit == -2) { - // extension occurred more than once + // extension occurred more than once LOGIT_ERROR("Extension occurred more than once: " << nid); BLOCXX_THROW(limal::SyntaxException, Format(__("Extension occurred more than once: %1."), @@ -196,17 +196,17 @@ Format(__("Unable to parse the certificate (NID: %1 Crit: %2)."), nid, crit).c_str()); } - + int len = bit->length -1; UInt32 ret = 0; - + for(; len >= 0; --len) - { + { int bits = bit->data[len]; int shift = bits<<(len*8); ret |= shift; } - + ext.setValue(ret); if(crit == 1) @@ -221,19 +221,19 @@ ASN1_STRING_free(bit); } -void +void X509v3RequestExts_Priv::parseExtendedKeyUsageExt(STACK_OF(X509_EXTENSION)* cert, ExtendedKeyUsageExt &ext) { int crit = 0; - + EXTENDED_KEY_USAGE *eku = NULL; eku = static_cast<EXTENDED_KEY_USAGE *>(X509V3_get_d2i(cert, - NID_ext_key_usage, - &crit, NULL)); - + NID_ext_key_usage, + &crit, NULL)); + if(eku == NULL) - { + { if(crit == -1) { // extension not found @@ -243,7 +243,7 @@ } else if(crit == -2) { - // extension occurred more than once + // extension occurred more than once LOGIT_ERROR("Extension occurred more than once"); BLOCXX_THROW(limal::SyntaxException, __("Extension occurred more than once.")); @@ -259,7 +259,7 @@ ASN1_OBJECT *obj; char obj_tmp[80]; StringList usageList; - + for(i = 0; i < sk_ASN1_OBJECT_num(eku); i++) { obj = sk_ASN1_OBJECT_value(eku, i); @@ -288,18 +288,18 @@ EXTENDED_KEY_USAGE_free(eku); } -void +void X509v3RequestExts_Priv::parseBasicConstraintsExt(STACK_OF(X509_EXTENSION)* cert, BasicConstraintsExt &ext) { int crit = 0; - + BASIC_CONSTRAINTS *bs = NULL; bs = static_cast<BASIC_CONSTRAINTS *>(X509V3_get_d2i(cert, - NID_basic_constraints, - &crit, NULL)); + NID_basic_constraints, + &crit, NULL)); if(bs == NULL) - { + { if(crit == -1) { // extension not found @@ -309,7 +309,7 @@ } else if(crit == -2) { - // extension occurred more than once + // extension occurred more than once LOGIT_ERROR("Extension occurred more than once"); BLOCXX_THROW(limal::SyntaxException, __("Extension occurred more than once.")); @@ -351,18 +351,18 @@ BASIC_CONSTRAINTS_free(bs); } -void -X509v3RequestExts_Priv::parseSubjectKeyIdentifierExt(STACK_OF(X509_EXTENSION) *cert, +void +X509v3RequestExts_Priv::parseSubjectKeyIdentifierExt(STACK_OF(X509_EXTENSION) *cert, SubjectKeyIdentifierExt &ext) { int crit = 0; - + ASN1_OCTET_STRING *ski = NULL; ski = static_cast<ASN1_OCTET_STRING *>(X509V3_get_d2i(cert, - NID_subject_key_identifier, - &crit, NULL)); + NID_subject_key_identifier, + &crit, NULL)); if(ski == NULL) - { + { if(crit == -1) { // extension not found @@ -372,7 +372,7 @@ } else if(crit == -2) { - // extension occurred more than once + // extension occurred more than once LOGIT_ERROR("Extension occurred more than once"); BLOCXX_THROW(limal::SyntaxException, __("Extension occurred more than once.")); @@ -413,17 +413,17 @@ ASN1_OCTET_STRING_free(ski); } -void +void X509v3RequestExts_Priv::parseSubjectAlternativeNameExt(STACK_OF(X509_EXTENSION) *cert, SubjectAlternativeNameExt &ext) { int crit = 0; - + GENERAL_NAMES *gns = NULL; gns = static_cast<GENERAL_NAMES *>(X509V3_get_d2i(cert, NID_subject_alt_name, &crit, NULL)); - + if(gns == NULL) - { + { if(crit == -1) { // extension not found @@ -433,7 +433,7 @@ } else if(crit == -2) { - // extension occurred more than once + // extension occurred more than once LOGIT_ERROR("Extension occurred more than once"); BLOCXX_THROW(limal::SyntaxException, __("Extension occurred more than once.")); @@ -444,7 +444,7 @@ Format(__("Unable to parse the certificate (Crit: %1)."), crit).c_str()); } - + int j; GENERAL_NAME *gen; blocxx::List<LiteralValue> lvList; @@ -473,7 +473,7 @@ ext.setAlternativeNameList(lvList); } else - { + { ext.setPresent(false); } Modified: limal-head/limal-ca-mgm/src/X509v3RequestExtensions_Priv.hpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/X509v3Req… ============================================================================== --- limal-head/limal-ca-mgm/src/X509v3RequestExtensions_Priv.hpp (original) +++ limal-head/limal-ca-mgm/src/X509v3RequestExtensions_Priv.hpp Wed Oct 17 14:18:38 2007 @@ -31,43 +31,43 @@ namespace CA_MGM_NAMESPACE { - class X509v3RequestExts_Priv : public X509v3RequestExts { - public: - X509v3RequestExts_Priv(); - X509v3RequestExts_Priv(STACK_OF(X509_EXTENSION)* extensions); - X509v3RequestExts_Priv(const X509v3RequestExts_Priv& extensions); - virtual ~X509v3RequestExts_Priv(); - - private: - - X509v3RequestExts_Priv& - operator=(const X509v3RequestExts_Priv& extensions); - - void - parseStringExt(STACK_OF(X509_EXTENSION)* cert, - int nid, StringExtension &ext); - - void - parseBitExt(STACK_OF(X509_EXTENSION)* cert, - int nid, BitExtension &ext); - - void - parseExtendedKeyUsageExt(STACK_OF(X509_EXTENSION)* cert, - ExtendedKeyUsageExt &ext); - - void - parseBasicConstraintsExt(STACK_OF(X509_EXTENSION)* cert, - BasicConstraintsExt &ext); - - void - parseSubjectKeyIdentifierExt(STACK_OF(X509_EXTENSION) *cert, - SubjectKeyIdentifierExt &ext); - - void - parseSubjectAlternativeNameExt(STACK_OF(X509_EXTENSION) *cert, - SubjectAlternativeNameExt &ext); +class X509v3RequestExts_Priv : public X509v3RequestExts { +public: + X509v3RequestExts_Priv(); + X509v3RequestExts_Priv(STACK_OF(X509_EXTENSION)* extensions); + X509v3RequestExts_Priv(const X509v3RequestExts_Priv& extensions); + virtual ~X509v3RequestExts_Priv(); + +private: + + X509v3RequestExts_Priv& + operator=(const X509v3RequestExts_Priv& extensions); + + void + parseStringExt(STACK_OF(X509_EXTENSION)* cert, + int nid, StringExtension &ext); + + void + parseBitExt(STACK_OF(X509_EXTENSION)* cert, + int nid, BitExtension &ext); + + void + parseExtendedKeyUsageExt(STACK_OF(X509_EXTENSION)* cert, + ExtendedKeyUsageExt &ext); + + void + parseBasicConstraintsExt(STACK_OF(X509_EXTENSION)* cert, + BasicConstraintsExt &ext); + + void + parseSubjectKeyIdentifierExt(STACK_OF(X509_EXTENSION) *cert, + SubjectKeyIdentifierExt &ext); + + void + parseSubjectAlternativeNameExt(STACK_OF(X509_EXTENSION) *cert, + SubjectAlternativeNameExt &ext); - }; +}; } } Modified: limal-head/limal-ca-mgm/src/config.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/config.cp… ============================================================================== --- limal-head/limal-ca-mgm/src/config.cpp (original) +++ limal-head/limal-ca-mgm/src/config.cpp Wed Oct 17 14:18:38 2007 @@ -23,17 +23,17 @@ // ------------------------------------------------------------------- -const char * const limal_ca_mgm_lib_version() -{ - return LIMAL_CA_MGM_LIB_VERSION; -} + const char * const limal_ca_mgm_lib_version() + { + return LIMAL_CA_MGM_LIB_VERSION; + } // ------------------------------------------------------------------- -const unsigned int limal_ca_mgm_api_version() -{ - return LIMAL_CA_MGM_API_VERSION; -} + const unsigned int limal_ca_mgm_api_version() + { + return LIMAL_CA_MGM_API_VERSION; + } } /* extern C */ -- To unsubscribe, e-mail: limal-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: limal-commit+help(a)opensuse.org

1 0

r2354 - /limal-head/limal-ca-mgm/src/CA.cpp
by mcalmer＠svn.opensuse.org 17 Oct '07

17 Oct '07

Author: mcalmer Date: Wed Oct 17 12:22:20 2007 New Revision: 2354 URL: http://svn.opensuse.org/viewcvs/limal?rev=2354&view=rev Log: fix indenting Modified: limal-head/limal-ca-mgm/src/CA.cpp Modified: limal-head/limal-ca-mgm/src/CA.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/CA.cpp?re… ============================================================================== --- limal-head/limal-ca-mgm/src/CA.cpp (original) +++ limal-head/limal-ca-mgm/src/CA.cpp Wed Oct 17 12:22:20 2007 @@ -51,7 +51,7 @@ class CAImpl : public blocxx::COWIntrusiveCountableBase { - public: +public: CAImpl(const String& caName, const String& caPasswd, const String& repos) : caName(caName) @@ -63,7 +63,7 @@ ~CAImpl() { - + if(config) { delete config; @@ -82,7 +82,7 @@ } String - initConfigFile() + initConfigFile() { if(templ) { @@ -102,15 +102,15 @@ } return ""; } - + String caName; String caPasswd; String repositoryDir; - CAConfig *config; - CAConfig *templ; + CAConfig *config; + CAConfig *templ; - private: +private: CAImpl() {} CAImpl(const CAImpl &impl) : COWIntrusiveCountableBase(impl) @@ -118,7 +118,7 @@ CAImpl& operator=(const CAImpl &) { return *this; } }; - + class CATreeCompare { public: @@ -146,7 +146,7 @@ return true; } return l.front() < r.front(); - } + } }; @@ -171,7 +171,7 @@ OpenSSLUtils ost(pi.toString()); bool passOK = ost.checkKey(caName, caPasswd, "cacert", repos); - + if(!passOK) { LOGIT_ERROR("Invalid CA password"); @@ -180,7 +180,7 @@ } m_impl = new CAImpl(caName, caPasswd, repos); - + m_impl->templ = new CAConfig(repos+"/"+caName+"/openssl.cnf.tmpl"); } @@ -192,7 +192,7 @@ if(pi.exists()) { int r = path::removeFile(m_impl->config->filename()); - + if(r != 0) { LOGIT_INFO("Remove of openssl.cnf failed: " << r); @@ -200,7 +200,7 @@ } } } - + blocxx::String CA::createSubCA(const String& newCaName, const String& keyPasswd, @@ -213,7 +213,7 @@ caIssueData, E_CA_Cert); - + try { OpenSSLUtils::createCaInfrastructure(newCaName, m_impl->repositoryDir); @@ -221,14 +221,14 @@ catch(blocxx::Exception &e) { LOGIT_ERROR(e); - BLOCXX_THROW_SUBEX(limal::SystemException, + BLOCXX_THROW_SUBEX(limal::SystemException, __("Error while creating the CA infrastructure."), e); } String request; PerlRegEx p("^([[:xdigit:]]+):([[:xdigit:]]+[\\d-]*)$"); - StringArray sa = p.capture(certificate); + StringArray sa = p.capture(certificate); if(sa.size() == 3) { @@ -241,7 +241,7 @@ LOGIT_ERROR("Can not parse certificate name: " << certificate); // %1 is the name of the CA - BLOCXX_THROW(limal::RuntimeException, + BLOCXX_THROW(limal::RuntimeException, Format(__("Cannot parse the certificate name %1."), certificate).c_str()); } @@ -269,7 +269,7 @@ r = path::copyFile(m_impl->repositoryDir + "/" + newCaName + "/" + "cacert.pem", m_impl->repositoryDir + "/" + ".cas/" + newCaName + ".pem"); - + if(r != 0) { LOGIT_INFO("Copy of cacert.pem to .cas/ failed: " << r); @@ -298,19 +298,19 @@ LOGIT_ERROR("Invalid request data"); BLOCXX_THROW(limal::ValueException, __("Invalid request data.")); } - + // copy template to config String configFilename = initConfigFile(); removeDefaultsFromConfig(); - + OpenSSLUtils ost(configFilename); String opensslDN = requestData.getSubjectDN().getOpenSSLString(); blocxx::MD5 md5(opensslDN); String request = md5.toString() + "-" + String(blocxx::DateTime::getCurrent().get()); - + path::PathInfo dKey(m_impl->repositoryDir + "/" + m_impl->caName + "/keys/"+ request + ".key"); if(dKey.exists()) { @@ -349,8 +349,8 @@ E_PEM, requestData.getChallengePassword(), requestData.getUnstructuredName()); - - + + OpenSSLUtils::addCAM(m_impl->caName, request, opensslDN, m_impl->repositoryDir); return request; @@ -368,7 +368,7 @@ { LOGIT_ERROR("Request does not exist.(" << requestFile << ")"); // %1 is the absolute path to the request - BLOCXX_THROW(ValueException, + BLOCXX_THROW(ValueException, Format(__("Request does not exist (%1)."), requestFile ).c_str()); } @@ -377,7 +377,7 @@ LOGIT_ERROR("Invalid issue data"); BLOCXX_THROW(limal::ValueException, __("Invalid issue data.")); } - + String serial = OpenSSLUtils::nextSerial(m_impl->repositoryDir + "/" + m_impl->caName + "/serial"); String certificate = serial + ":" + requestName; @@ -389,12 +389,12 @@ if(issueData.getEndDate() > cdata.getEndDate()) { LOGIT_ERROR("CA expires before the certificate should expire."); - LOGIT_ERROR("CA expires: '" << cdata.getEndDate() << + LOGIT_ERROR("CA expires: '" << cdata.getEndDate() << "' Cert should expire: '" << issueData.getEndDate()<< "'"); - BLOCXX_THROW(limal::RuntimeException, + BLOCXX_THROW(limal::RuntimeException, __("The CA expires before the certificate should expire.")); } - + // Check the DN Policy RequestData rdata = getRequest(requestName); @@ -402,7 +402,7 @@ // copy template to config String configFilename = initConfigFile(); - + // write data to config issueData.commit2Config(*this, certType); @@ -411,7 +411,7 @@ ost.signRequest(m_impl->repositoryDir + "/" + m_impl->caName + "/req/"+ requestName + ".req", m_impl->repositoryDir + "/" + m_impl->caName + "/newcerts/" + certificate + ".pem", m_impl->repositoryDir + "/" + m_impl->caName + "/cacert.key", - m_impl->caPasswd, + m_impl->caPasswd, type2Section(certType, true), issueData.getStartDateAsString(), issueData.getEndDateAsString(), @@ -464,9 +464,9 @@ certificate = issueCertificate(requestName, certificateData, t); } catch(blocxx::Exception &e) - { + { OpenSSLUtils::delCAM(m_impl->caName, requestName, m_impl->repositoryDir); - + path::removeFile(m_impl->repositoryDir + "/" + m_impl->caName + "/keys/" + requestName + ".key"); path::removeFile(m_impl->repositoryDir + "/" + m_impl->caName + "/req/" + requestName + ".req"); BLOCXX_THROW_SUBEX(limal::RuntimeException, @@ -522,7 +522,7 @@ // copy template to config String configFilename = initConfigFile(); - + // write crl data to config crlData.commit2Config(*this, E_CRL); @@ -537,12 +537,12 @@ int r = path::copyFile(m_impl->repositoryDir + "/" + m_impl->caName + "/crl/crl.pem", m_impl->repositoryDir + "/" + ".cas/crl_" + m_impl->caName + ".pem"); - + if(r != 0) { LOGIT_INFO("Copy of crl.pem to .cas/ failed: " << r); } - + rehashCAs(m_impl->repositoryDir + "/.cas/"); } @@ -551,16 +551,16 @@ FormatType formatType) { RequestData rd = RequestData_Priv(request, formatType); - + String name = rd.getSubjectDN().getOpenSSLString(); - + blocxx::MD5 md5(name); - + String requestName = md5.toString() + "-" + String(blocxx::DateTime::getCurrent().get()); - + path::PathInfo outPi(m_impl->repositoryDir + "/" + m_impl->caName + "/req/" + requestName + ".req"); - + if(outPi.exists()) { LOGIT_ERROR("Duplicate DN. Request already exists."); @@ -573,16 +573,16 @@ LocalManagement::writeFile(request, outPi.toString()); } else - { + { // we have to convert the request to PEM format -#if OPENSSL_VERSION_NUMBER >= 0x0090801fL +#if OPENSSL_VERSION_NUMBER >= 0x0090801fL const unsigned char *dbuf = (const unsigned char*)request.data(); #else unsigned char *dbuf = (unsigned char*)request.data(); #endif - + X509_REQ *req = NULL; - + req=d2i_X509_REQ(NULL, &dbuf , request.size()); char *pbuf = NULL; @@ -592,7 +592,7 @@ ByteBuffer d(pbuf, k); LocalManagement::writeFile(d, outPi.toString()); - + BIO_free(bio); X509_REQ_free(req); } @@ -607,7 +607,7 @@ FormatType formatType) { ByteBuffer ba = LocalManagement::readFile(requestFile); - + return importRequestData(ba, formatType); } @@ -712,7 +712,7 @@ return CRLData_Priv(m_impl->repositoryDir + "/" + m_impl->caName + "/crl/crl.pem"); } -/** +/** * Return the CA certificate in PEM or DER format * */ @@ -732,11 +732,11 @@ } - + /** * Return the CA private key in PEM format. * If a new Password is given, the key will be encrypted - * using the newPassword. + * using the newPassword. * If newPassword is empty the returned key is decrypted. */ ByteBuffer @@ -747,7 +747,7 @@ ret = LocalManagement::readFile(m_impl->repositoryDir + "/" + m_impl->caName + "/cacert.key"); ret = OpenSSLUtils::rsaConvert(ret, E_PEM, E_PEM, m_impl->caPasswd, newPassword); - + return ret; } @@ -763,7 +763,7 @@ ret = LocalManagement::readFile(m_impl->repositoryDir + "/" + m_impl->caName + "/cacert.key"); ret = OpenSSLUtils::rsaConvert(ret, E_PEM, E_DER, m_impl->caPasswd, ""); - + return ret; } @@ -790,7 +790,7 @@ return ret; } -/** +/** * Return the certificate in PEM or DER format * */ @@ -800,7 +800,7 @@ { ByteBuffer ret; - ret = LocalManagement::readFile(m_impl->repositoryDir + "/" + m_impl->caName + "/newcerts/" + + ret = LocalManagement::readFile(m_impl->repositoryDir + "/" + m_impl->caName + "/newcerts/" + certificateName + ".pem"); if( exportType == E_DER ) @@ -810,11 +810,11 @@ return ret; } - + /** * Return the certificate private key in PEM format. * If a new Password is given, the key will be encrypted - * using the newPassword. + * using the newPassword. * If newPassword is empty the returned key is decrypted. */ ByteBuffer @@ -833,11 +833,11 @@ BLOCXX_THROW(limal::ValueException, __("Cannot parse the certificate name.")); } - ret = LocalManagement::readFile(m_impl->repositoryDir + "/" + m_impl->caName + "/keys/" + + ret = LocalManagement::readFile(m_impl->repositoryDir + "/" + m_impl->caName + "/keys/" + sa[1] + ".key"); ret = OpenSSLUtils::rsaConvert(ret, E_PEM, E_PEM, keyPassword, newPassword); - + return ret; } @@ -860,14 +860,14 @@ BLOCXX_THROW(limal::ValueException, __("Cannot parse the certificate name.")); } - ret = LocalManagement::readFile(m_impl->repositoryDir + "/" + m_impl->caName + "/keys/" + + ret = LocalManagement::readFile(m_impl->repositoryDir + "/" + m_impl->caName + "/keys/" + sa[1] + ".key"); ret = OpenSSLUtils::rsaConvert(ret, E_PEM, E_DER, keyPassword, ""); - + return ret; } - + /** * Return the certificate in PKCS12 format. * If withChain is true, all issuer certificates @@ -904,7 +904,7 @@ caCert, m_impl->repositoryDir + "/.cas/", withChain); - + return ret; } @@ -923,7 +923,7 @@ ret = LocalManagement::readFile(m_impl->repositoryDir + "/" + m_impl->caName + "/crl/crl.pem"); if( exportType == E_DER ) - { + { ret = OpenSSLUtils::crlConvert(ret, E_PEM, E_DER); } @@ -941,11 +941,11 @@ BLOCXX_THROW(limal::SystemException, Format(__("Request %1 does not exist."), reqFile.toString()).c_str()); } - + OpenSSLUtils::delCAM(m_impl->caName, requestName, m_impl->repositoryDir); path::PathInfo keyFile(m_impl->repositoryDir + "/" + m_impl->caName + "/keys/" + requestName + ".key"); - + int r = 0; if(keyFile.exists()) @@ -958,14 +958,14 @@ r = path::removeFile(reqFile.toString()); if(r != 0) { - BLOCXX_THROW(limal::SystemException, + BLOCXX_THROW(limal::SystemException, // %1 is the error code Format(__("Removing the request failed (%1)."), r).c_str()); } } void -CA::deleteCertificate(const String& certificateName, +CA::deleteCertificate(const String& certificateName, bool requestToo) { path::PathInfo certFile(m_impl->repositoryDir + "/" + m_impl->caName + "/newcerts/" + certificateName + ".pem"); @@ -1021,7 +1021,7 @@ int r = path::removeFile(certFile.toString()); if(r != 0) { - BLOCXX_THROW(limal::SystemException, + BLOCXX_THROW(limal::SystemException, // %1 is the error code of rm Format(__("Removing the certificate failed: %1."), r).c_str()); } @@ -1039,7 +1039,7 @@ CA::updateDB() { path::PathInfo db(m_impl->repositoryDir + "/" + m_impl->caName + "/index.txt"); - + if(!db.exists()) { LOGIT_ERROR("Database not found."); @@ -1049,17 +1049,17 @@ if(db.size() != 0) { String configFilename = initConfigFile(); - + OpenSSLUtils ost(configFilename); - + ost.updateDB(m_impl->repositoryDir + "/" + m_impl->caName + "/cacert.pem", m_impl->repositoryDir + "/" + m_impl->caName + "/cacert.key", m_impl->caPasswd); - + } // else => empty index.txt no database to update } - + bool CA::verifyCertificate(const String& certificateName, bool crlCheck, @@ -1072,22 +1072,22 @@ BLOCXX_THROW(limal::SystemException, __("Certificate does not exist.")); } - if(purpose != "sslclient" && - purpose != "sslserver" && - purpose != "nssslserver" && - purpose != "smimesign" && - purpose != "smimeencrypt" && - purpose != "crlsign" && - purpose != "any" && + if(purpose != "sslclient" && + purpose != "sslserver" && + purpose != "nssslserver" && + purpose != "smimesign" && + purpose != "smimeencrypt" && + purpose != "crlsign" && + purpose != "any" && purpose != "ocsphelper") { LOGIT_ERROR("Invalid purpose: " << purpose); - BLOCXX_THROW(limal::ValueException, + BLOCXX_THROW(limal::ValueException, Format(__("Invalid purpose %1."), purpose).c_str()); } String configFilename = initConfigFile(); - + OpenSSLUtils ost(configFilename); String ret = ost.verify(certFile.toString(), @@ -1100,7 +1100,7 @@ LOGIT_ERROR(ret); BLOCXX_THROW(limal::RuntimeException, ret.c_str()); } - + return true; } @@ -1116,7 +1116,7 @@ * ########################################################################## */ -void +void CA::createRootCA(const String& caName, const String& caPasswd, const RequestGenerationData& caRequestData, @@ -1134,7 +1134,7 @@ LOGIT_ERROR("Invalid CA issue data"); BLOCXX_THROW(limal::ValueException, __("Invalid CA issue data.")); } - + // Create the infrastructure @@ -1145,16 +1145,16 @@ catch(blocxx::Exception &e) { LOGIT_ERROR(e); - BLOCXX_THROW_SUBEX(limal::SystemException, + BLOCXX_THROW_SUBEX(limal::SystemException, __("Error while creating the CA infrastructure."), e); } { OpenSSLUtils ost(repos + "/openssl.cnf.tmpl"); - + // create key - + ost.createRSAKey(repos + "/" + caName + "/" + "cacert.key", caPasswd, caRequestData.getKeysize()); } @@ -1164,7 +1164,7 @@ // copy template to config String configFilename = tmpCA.initConfigFile(); - + tmpCA.removeDefaultsFromConfig(); // write request data to config @@ -1174,7 +1174,7 @@ tmpCA.getConfig()->copySection(type2Section(E_CA_Req, false), "req"); OpenSSLUtils ost(configFilename); - + // create request ost.createRequest(caRequestData.getSubjectDN(), repos + "/" + caName + "/" + "cacert.req", @@ -1196,16 +1196,16 @@ caPasswd, "v3_ca", (caIssueData.getEndDate() - caIssueData.getStartDate()) /(60*60*24)); - // some clean-ups - + // some clean-ups + int r = path::copyFile(repos + "/" + caName + "/" + "cacert.pem", repos + "/" + ".cas/" + caName + ".pem"); - + if(r != 0) { LOGIT_INFO("Copy of cacert.pem to .cas/ failed: " << r); } - + rehashCAs(repos + "/.cas/"); // reinit the config , write the defaults and copy back to template @@ -1214,7 +1214,7 @@ dnp.setDefaults2Config(tmpCA); tmpCA.commitConfig2Template(); } - + void CA::importCA(const String& caName, @@ -1258,7 +1258,7 @@ } PerlRegEx keyregex("-----BEGIN[\\w\\s]+KEY[-]{5}[\\S\\s\n]+-----END[\\w\\s]+KEY[-]{5}"); - + if(!keyregex.match(String(caKey.data(), caKey.size()))) { LOGIT_ERROR("Invalid Key data."); @@ -1269,7 +1269,7 @@ PerlRegEx keycrypt("ENCRYPTED"); if(!keycrypt.match( String(caKey.data(), caKey.size()) ) && caPasswd.empty()) - { + { LOGIT_ERROR("CA password is empty."); BLOCXX_THROW(limal::ValueException, __("CA password is empty.")); @@ -1290,7 +1290,7 @@ LocalManagement::writeFile(caCertificate, caDir.toString() + "/cacert.pem"); if(keycrypt.match( String(caKey.data(), caKey.size()) )) - { + { LocalManagement::writeFile(caKey, caDir.toString() + "/cacert.key"); } @@ -1299,18 +1299,18 @@ ByteBuffer buf; try - { + { buf = OpenSSLUtils::rsaConvert(caKey, E_PEM, E_PEM, "", caPasswd); } catch(Exception &e) - { + { path::removeDirRecursive(repos + "/" + caName); - + LOGIT_ERROR ("Error during key encryption." ); BLOCXX_THROW_SUBEX(limal::RuntimeException, __("Error during key encryption."), e); } - + LocalManagement::writeFile(buf, caDir.toString() + "/cacert.key"); } @@ -1338,13 +1338,13 @@ CA::getCAList(const String& repos) { Array<String> caList; - + caList = OpenSSLUtils::listCA(repos); return caList; } - + blocxx::List<blocxx::Array<blocxx::String> > CA::getCATree(const String& repos) { @@ -1362,7 +1362,7 @@ Array<String>::const_iterator it = caList.begin(); for(; it != caList.end(); ++it) { - CertificateData caData = + CertificateData caData = LocalManagement::getCertificate(repos + "/" + (*it) + "/cacert.pem", E_PEM); @@ -1389,7 +1389,7 @@ else { bool issuerFound = false; - + // sub CA; find caName of the issuer Map<String, Array<String> >::const_iterator chitnew = caHash.begin(); for(; chitnew != caHash.end(); ++chitnew) @@ -1400,7 +1400,7 @@ Array<String> d; d.push_back((*chit).first); d.push_back((*chitnew).first); - + ret.push_back(d); issuerFound = true; break; @@ -1413,7 +1413,7 @@ Array<String> d; d.push_back((*chit).first); d.push_back(""); - + ret.push_back(d); } } @@ -1466,7 +1466,7 @@ Format(__("CA name does not exist (%1)."), pi.toString()).c_str(), E_FILE_NOT_FOUND); } - + OpenSSLUtils ost(repos + "/" + caName + "/openssl.cnf.tmpl"); bool ret = ost.checkKey(caName, caPasswd, "cacert", repos); @@ -1485,7 +1485,7 @@ { // test if expire date of the CA is greater then "now" - CertificateData ca = + CertificateData ca = LocalManagement::getCertificate(repos + "/" + caName + "/cacert.pem", E_PEM); @@ -1515,7 +1515,7 @@ int r = path::removeDirRecursive(repos + "/" + caName); if( r != 0 ) - { + { LOGIT_ERROR("Deleting the CA failed: " << r); BLOCXX_THROW(limal::SystemException, // %1 is the error code of rm @@ -1528,7 +1528,7 @@ { path::removeFile(p.toString()); } - + p.stat(repos + "/.cas/crl_" + caName + ".pem"); if(p.exists()) @@ -1569,21 +1569,21 @@ if(!p) { LOGIT_ERROR("missing value 'policy' in config file"); - BLOCXX_THROW(limal::SyntaxException, + BLOCXX_THROW(limal::SyntaxException, __("The configuration file is missing a value for policy.")); } String policySect = m_impl->config->getValue(type2Section(type, false), "policy"); - + StringList policyKeys = m_impl->config->getKeylist(policySect); - + if(policyKeys.empty()) { LOGIT_ERROR("Can not parse Section " << policySect); - BLOCXX_THROW(limal::SyntaxException, + BLOCXX_THROW(limal::SyntaxException, Format(__("Cannot parse section %1."), policySect).c_str()); } StringList::const_iterator it = policyKeys.begin(); - + blocxx::List<RDNObject> l = dn.getDN(); bool policyFound = false; @@ -1597,7 +1597,7 @@ String policyString = m_impl->config->getValue(policySect, *it); LOGIT_DEBUG("PolicyKey:" << *it << " PolicyString:"<< policyString); - + if(policyString.equalsIgnoreCase("optional")) { // do not care @@ -1609,7 +1609,7 @@ // we need a value bool foundInDN = false; - + blocxx::List<RDNObject>::const_iterator rdnit = l.begin(); for(; rdnit != l.end(); ++rdnit) @@ -1617,7 +1617,7 @@ if( (*it).equalsIgnoreCase( (*rdnit).getType() ) ) { foundInDN = true; - + if( (*rdnit).getValue().empty() ) { int errorCode = E_GENERIC; @@ -1648,8 +1648,8 @@ else if(*it == "emailAddress") { errorCode = E_EM_EMPTY; - } - + } + LOGIT_ERROR("Field '" << *it << "' must have a value"); BLOCXX_THROW_ERR(limal::ValueException, Format(__("Field %1 must have a value."), @@ -1699,7 +1699,7 @@ { String caMatchValue; String reqMatchValue; - + // read the CA and check the value // *it == key (e.g. commonName, emailAddress, ... @@ -1709,21 +1709,21 @@ for(; rdnit != l.end(); ++rdnit) { if( (*it).equalsIgnoreCase( (*rdnit).getType() ) ) - { + { rdn2check = *rdnit; break; } } bool validMatch = false; - + blocxx::List<RDNObject>::const_iterator caRdnIT = caDNList.begin(); for(; caRdnIT != caDNList.end(); ++caRdnIT) { LOGIT_DEBUG("Type (ca == request): " <<(*caRdnIT).getType() << "==" << rdn2check.getType()); LOGIT_DEBUG("Value(ca == request): " <<(*caRdnIT).getValue() << "==" << rdn2check.getValue()); - + if((*caRdnIT).getType().equalsIgnoreCase(rdn2check.getType())) { if((*caRdnIT).getValue() == rdn2check.getValue()) @@ -1738,7 +1738,7 @@ } } } - + if(!validMatch) { int errorCode = E_GENERIC; @@ -1780,9 +1780,9 @@ *it, caMatchValue, reqMatchValue).c_str(), errorCode); } - + policyFound = true; - + } if(!policyFound) { @@ -1826,7 +1826,7 @@ LOGIT_ERROR("config not initialized"); BLOCXX_THROW(limal::RuntimeException, __("The configuration is not initialized.")); } - + bool p = m_impl->config->exists("req_ca", "distinguished_name"); if(!p) { @@ -1835,9 +1835,9 @@ __("Missing section 'distinguished_name' in the configuration file.")); } String dnSect = m_impl->config->getValue("req_ca", "distinguished_name"); - + StringList dnKeys = m_impl->config->getKeylist(dnSect); - + if(dnKeys.empty()) { LOGIT_ERROR("Can not parse Section " << dnSect); @@ -1845,7 +1845,7 @@ Format(__("Cannot parse section %1."), dnSect).c_str()); } StringList::const_iterator it = dnKeys.begin(); - + for(; it != dnKeys.end(); ++it) { if((*it).endsWith("_default", String::E_CASE_INSENSITIVE)) @@ -1856,6 +1856,5 @@ } } - } } -- To unsubscribe, e-mail: limal-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: limal-commit+help(a)opensuse.org

1 0

r2353 - /limal-head/limal-ca-mgm/src/OpenSSLUtils.cpp
by mcalmer＠svn.opensuse.org 17 Oct '07

17 Oct '07

Author: mcalmer Date: Wed Oct 17 10:33:23 2007 New Revision: 2353 URL: http://svn.opensuse.org/viewcvs/limal?rev=2353&view=rev Log: fix indenting Modified: limal-head/limal-ca-mgm/src/OpenSSLUtils.cpp Modified: limal-head/limal-ca-mgm/src/OpenSSLUtils.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/OpenSSLUt… ============================================================================== --- limal-head/limal-ca-mgm/src/OpenSSLUtils.cpp (original) +++ limal-head/limal-ca-mgm/src/OpenSSLUtils.cpp Wed Oct 17 10:33:23 2007 @@ -76,23 +76,23 @@ path::PathName r = path::PathName::dirName(configFile); if( r.toString() == "") - { + { m_rand = "./.rand"; } else - { + { m_rand = r.toString() + "/.rand"; } } void OpenSSLUtils::createRSAKey(const String &outFile, - const String &password, - UInt32 bits, - const String &cryptAlgorithm) + const String &password, + UInt32 bits, + const String &cryptAlgorithm) { blocxx::String debugCmd; - + debugCmd += m_cmd + " "; debugCmd += "genrsa "; debugCmd += "-out "; @@ -103,13 +103,13 @@ debugCmd += "-passout env:pass "; debugCmd += "-" + cryptAlgorithm + " "; } - + debugCmd += String(bits); StringArray cmd = PerlRegEx("\\s").split(debugCmd); - + LOGIT_DEBUG("Command: " << debugCmd); - + blocxx::EnvVars env; env.addVar("PATH", "/usr/bin/"); env.addVar("RANDFILE", m_rand); @@ -119,17 +119,17 @@ blocxx::String stdOutput; blocxx::String errOutput; int status = -1; - + try { status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, - errOutput, env); + errOutput, env); } catch(blocxx::Exception& e) { LOGIT_ERROR( "openssl exception:" << e); BLOCXX_THROW_SUBEX(limal::RuntimeException, - __("Executing openssl command failed."), e); + __("Executing openssl command failed."), e); } if(status != 0) { @@ -140,7 +140,7 @@ StringArray sa = errOutput.tokenize("\n\r"); String msg = (sa.empty()? "" : sa[0]); BLOCXX_THROW(limal::RuntimeException, - Format(__("openssl command failed: %1"), msg).c_str()); + Format(__("openssl command failed: %1"), msg).c_str()); } if(!errOutput.empty()) @@ -155,16 +155,16 @@ void OpenSSLUtils::createRequest(const DNObject &dn, - const String &outFile, - const String &keyFile, - const String &password, - const String &extension, - FormatType outForm, - const String &challengePassword, - const String &unstructuredName) + const String &outFile, + const String &keyFile, + const String &password, + const String &extension, + FormatType outForm, + const String &challengePassword, + const String &unstructuredName) { blocxx::String debugCmd; - + debugCmd += m_cmd + " "; debugCmd += "req -new "; @@ -173,7 +173,7 @@ { LOGIT_ERROR("No valid keyfile specified"); BLOCXX_THROW(limal::ValueException, - __("No valid key file specified.")); + __("No valid key file specified.")); } debugCmd += "-config "; @@ -183,7 +183,7 @@ { debugCmd += "-reqexts " + extension + " "; } - + debugCmd += "-key " + keyFile + " "; if(outForm == E_PEM) @@ -200,9 +200,9 @@ debugCmd += "-passin env:pass "; StringArray cmd = PerlRegEx("\\s").split(debugCmd); - + LOGIT_DEBUG("Command: " << debugCmd); - + blocxx::EnvVars env; env.addVar("PATH", "/usr/bin/"); env.addVar("RANDFILE", m_rand); @@ -213,10 +213,10 @@ blocxx::String stdOutput; blocxx::String errOutput; int status = -1; - + blocxx::List<RDNObject> dnList = dn.getDN(); blocxx::List<RDNObject>::const_iterator it; - + for(it = dnList.begin(); it != dnList.end(); ++it) { stdInput += (*it).getValue() + "\n"; @@ -230,14 +230,14 @@ try { status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, - errOutput, env, - -1, -1, stdInput); + errOutput, env, + -1, -1, stdInput); } catch(blocxx::Exception& e) { LOGIT_ERROR( "openssl exception:" << e); BLOCXX_THROW_SUBEX(limal::RuntimeException, - __("Executing openssl command failed."), e); + __("Executing openssl command failed."), e); } if(status != 0) { @@ -248,9 +248,9 @@ StringArray sa = errOutput.tokenize("\n\r"); String msg = (sa.empty()? "" : sa[0]); BLOCXX_THROW(limal::RuntimeException, - Format(__("openssl command failed: %1"), msg).c_str()); + Format(__("openssl command failed: %1"), msg).c_str()); } - + if(!errOutput.empty()) { LOGIT_DEBUG("openssl stderr:" << errOutput); @@ -263,19 +263,19 @@ void OpenSSLUtils::createSelfSignedCertificate(const String &outFile, - const String &keyFile, - const String &requestFile, - const String &password, - const String &extension, - UInt32 days, - bool noEmailDN) + const String &keyFile, + const String &requestFile, + const String &password, + const String &extension, + UInt32 days, + bool noEmailDN) { path::PathInfo pi(keyFile); if(!pi.exists() || !pi.isFile()) - { + { LOGIT_ERROR("No valid keyfile specified"); BLOCXX_THROW(limal::ValueException, - __("No valid key file specified.")); + __("No valid key file specified.")); } pi.stat(requestFile); @@ -283,17 +283,17 @@ { LOGIT_ERROR("No valid request file specified"); BLOCXX_THROW(limal::ValueException, - __("No valid request file specified.")); + __("No valid request file specified.")); } blocxx::String debugCmd; - + debugCmd += m_cmd + " "; debugCmd += "req -x509 "; debugCmd += "-config "; debugCmd += m_conf + " "; - + if(noEmailDN) { debugCmd += "-noemailDN "; @@ -313,9 +313,9 @@ debugCmd += "-out " + outFile + " "; StringArray cmd = PerlRegEx("\\s").split(debugCmd); - + LOGIT_DEBUG("Command: " << debugCmd); - + blocxx::EnvVars env; env.addVar("PATH", "/usr/bin/"); env.addVar("RANDFILE", m_rand); @@ -325,17 +325,17 @@ blocxx::String stdOutput; blocxx::String errOutput; int status = -1; - + try { status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, - errOutput, env); + errOutput, env); } catch(blocxx::Exception& e) { LOGIT_ERROR( "openssl exception:" << e); BLOCXX_THROW_SUBEX(limal::RuntimeException, - __("Executing openssl command failed."), e); + __("Executing openssl command failed."), e); } if(status != 0) { @@ -346,7 +346,7 @@ StringArray sa = errOutput.tokenize("\n\r"); String msg = (sa.empty()? "" : sa[0]); BLOCXX_THROW(limal::RuntimeException, - Format(__("openssl command failed: %1"), msg).c_str()); + Format(__("openssl command failed: %1"), msg).c_str()); } if(!errOutput.empty()) @@ -359,38 +359,38 @@ } } -void +void OpenSSLUtils::signRequest(const String &requestFile, - const String &outFile, - const String &caKeyFile, - const String &caPassword, - const String &extension, - const String &startDate, - const String &endDate, - const String &caSection, - const String &outDir, - bool noEmailDN, - bool noUniqueDN, - bool noText) + const String &outFile, + const String &caKeyFile, + const String &caPassword, + const String &extension, + const String &startDate, + const String &endDate, + const String &caSection, + const String &outDir, + bool noEmailDN, + bool noUniqueDN, + bool noText) { path::PathInfo pi(caKeyFile); if(!pi.exists() || !pi.isFile()) { LOGIT_ERROR("No valid keyfile specified"); BLOCXX_THROW(limal::ValueException, - __("No valid key file specified.")); + __("No valid key file specified.")); } pi.stat(requestFile); if(!pi.exists() || !pi.isFile()) - { + { LOGIT_ERROR("No valid request file specified"); BLOCXX_THROW(limal::ValueException, - __("No valid request file specified.")); + __("No valid request file specified.")); } blocxx::String debugCmd; - + debugCmd += m_cmd + " "; debugCmd += "ca -batch "; @@ -413,7 +413,7 @@ debugCmd += "-startdate " + startDate + " "; debugCmd += "-enddate " + endDate + " "; - + if(noEmailDN) { debugCmd += "-noemailDN "; @@ -436,10 +436,10 @@ } StringArray cmd = PerlRegEx("\\s").split(debugCmd); - + LOGIT_DEBUG("Command: " << debugCmd); //LOGIT_DEBUG("PASSWORD: " << caPassword); - + blocxx::EnvVars env; env.addVar("PATH", "/usr/bin/"); env.addVar("RANDFILE", m_rand); @@ -449,17 +449,17 @@ blocxx::String stdOutput; blocxx::String errOutput; int status = -1; - + try { status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, - errOutput, env); + errOutput, env); } catch(blocxx::Exception& e) { LOGIT_ERROR( "openssl exception:" << e); BLOCXX_THROW_SUBEX(limal::RuntimeException, - __("Executing openssl command failed."), e); + __("Executing openssl command failed."), e); } if(status != 0) { @@ -470,9 +470,9 @@ StringArray sa = errOutput.tokenize("\n\r"); String msg = (sa.empty()? "" : sa[0]); BLOCXX_THROW(limal::RuntimeException, - Format(__("openssl command failed: %1"), msg).c_str()); + Format(__("openssl command failed: %1"), msg).c_str()); } - + if(!errOutput.empty()) { LOGIT_DEBUG("openssl stderr:" << errOutput); @@ -485,38 +485,38 @@ void OpenSSLUtils::revokeCertificate(const blocxx::String &caCertFile, - const blocxx::String &caKeyFile, - const blocxx::String &caPassword, - const blocxx::String &certFile, - const CRLReason &reason, - bool noUniqueDN) + const blocxx::String &caKeyFile, + const blocxx::String &caPassword, + const blocxx::String &certFile, + const CRLReason &reason, + bool noUniqueDN) { path::PathInfo pi(caKeyFile); if(!pi.exists() || !pi.isFile()) - { + { LOGIT_ERROR("No valid keyfile specified"); BLOCXX_THROW(limal::ValueException, - __("No valid key file specified.")); + __("No valid key file specified.")); } pi.stat(caCertFile); if(!pi.exists() || !pi.isFile()) - { + { LOGIT_ERROR("No valid CA certificate file specified"); BLOCXX_THROW(limal::ValueException, - __("No valid CA certificate file specified.")); + __("No valid CA certificate file specified.")); } pi.stat(certFile); if(!pi.exists() || !pi.isFile()) - { + { LOGIT_ERROR("No valid certificate file specified"); BLOCXX_THROW(limal::ValueException, - __("No valid certificate file specified.")); + __("No valid certificate file specified.")); } blocxx::String debugCmd; - + debugCmd += m_cmd + " "; debugCmd += "ca "; @@ -535,9 +535,9 @@ { debugCmd += "-nouniqueDN "; } - + if(!reason.getReason().equalsIgnoreCase("none")) - { + { String reasonStr = reason.getReason(); if(reasonStr.equalsIgnoreCase("certificateHold")) @@ -575,9 +575,9 @@ } StringArray cmd = PerlRegEx("\\s").split(debugCmd); - + LOGIT_DEBUG("Command: " << debugCmd); - + blocxx::EnvVars env; env.addVar("PATH", "/usr/bin/"); env.addVar("RANDFILE", m_rand); @@ -587,17 +587,17 @@ blocxx::String stdOutput; blocxx::String errOutput; int status = -1; - + try { status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, - errOutput, env); + errOutput, env); } catch(blocxx::Exception& e) { LOGIT_ERROR( "openssl exception:" << e); BLOCXX_THROW_SUBEX(limal::RuntimeException, - __("Executing openssl command failed."), e); + __("Executing openssl command failed."), e); } if(status != 0) { @@ -608,7 +608,7 @@ StringArray sa = errOutput.tokenize("\n\r"); String msg = (sa.empty()? "" : sa[0]); BLOCXX_THROW(limal::RuntimeException, - Format(__("openssl command failed: %1"), msg).c_str()); + Format(__("openssl command failed: %1"), msg).c_str()); } if(!errOutput.empty()) @@ -623,19 +623,19 @@ void OpenSSLUtils::issueCRL(const blocxx::String &caCertFile, - const blocxx::String &caKeyFile, - const blocxx::String &caPassword, - blocxx::UInt32 hours, - const blocxx::String &outfile, - const blocxx::String &extension, - bool noUniqueDN) + const blocxx::String &caKeyFile, + const blocxx::String &caPassword, + blocxx::UInt32 hours, + const blocxx::String &outfile, + const blocxx::String &extension, + bool noUniqueDN) { path::PathInfo pi(caKeyFile); if(!pi.exists() || !pi.isFile()) - { + { LOGIT_ERROR("No valid keyfile specified"); BLOCXX_THROW(limal::ValueException, - __("No valid key file specified.")); + __("No valid key file specified.")); } pi.stat(caCertFile); @@ -643,11 +643,11 @@ { LOGIT_ERROR("No valid CA certificate file specified"); BLOCXX_THROW(limal::ValueException, - __("No valid CA certificate file specified.")); + __("No valid CA certificate file specified.")); } blocxx::String debugCmd; - + debugCmd += m_cmd + " "; debugCmd += "ca -gencrl "; @@ -668,16 +668,16 @@ { debugCmd += "-crlexts " + extension + " "; } - + if(noUniqueDN) { debugCmd += "-nouniqueDN "; } - + StringArray cmd = PerlRegEx("\\s").split(debugCmd); - + LOGIT_DEBUG("Command: " << debugCmd); - + blocxx::EnvVars env; env.addVar("PATH", "/usr/bin/"); env.addVar("RANDFILE", m_rand); @@ -687,17 +687,17 @@ blocxx::String stdOutput; blocxx::String errOutput; int status = -1; - + try { status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, - errOutput, env); + errOutput, env); } catch(blocxx::Exception& e) { LOGIT_ERROR( "openssl exception:" << e); BLOCXX_THROW_SUBEX(limal::RuntimeException, - __("Executing openssl command failed."), e); + __("Executing openssl command failed."), e); } if(status != 0) { @@ -708,7 +708,7 @@ StringArray sa = errOutput.tokenize("\n\r"); String msg = (sa.empty()? "" : sa[0]); BLOCXX_THROW(limal::RuntimeException, - Format(__("openssl command failed: %1"), msg).c_str()); + Format(__("openssl command failed: %1"), msg).c_str()); } if(!errOutput.empty()) @@ -721,29 +721,29 @@ } } -void +void OpenSSLUtils::updateDB(const blocxx::String &caCertFile, - const blocxx::String &caKeyFile, - const blocxx::String &caPassword) + const blocxx::String &caKeyFile, + const blocxx::String &caPassword) { path::PathInfo pi(caKeyFile); if(!pi.exists() || !pi.isFile()) { LOGIT_ERROR("No valid keyfile specified"); BLOCXX_THROW(limal::ValueException, - __("No valid key file specified.")); + __("No valid key file specified.")); } pi.stat(caCertFile); if(!pi.exists() || !pi.isFile()) - { + { LOGIT_ERROR("No valid CA certificate file specified"); BLOCXX_THROW(limal::ValueException, - __("No valid CA certificate file specified.")); + __("No valid CA certificate file specified.")); } blocxx::String debugCmd; - + debugCmd += m_cmd + " "; debugCmd += "ca -updatedb "; @@ -757,9 +757,9 @@ debugCmd += "-passin env:pass "; StringArray cmd = PerlRegEx("\\s").split(debugCmd); - + LOGIT_DEBUG("Command: " << debugCmd); - + blocxx::EnvVars env; env.addVar("PATH", "/usr/bin/"); env.addVar("RANDFILE", m_rand); @@ -769,19 +769,19 @@ blocxx::String stdOutput; blocxx::String errOutput; int status = -1; - + try - { + { status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, - errOutput, env); + errOutput, env); } catch(blocxx::Exception& e) { LOGIT_ERROR( "openssl exception:" << e); BLOCXX_THROW_SUBEX(limal::RuntimeException, - __("Executing openssl command failed."), e); + __("Executing openssl command failed."), e); } - + PerlRegEx r("error"); if( (status != 0 && status != 256) || r.match(errOutput) ) @@ -793,9 +793,9 @@ StringArray sa = errOutput.tokenize("\n\r"); String msg = (sa.empty()? "" : sa[0]); BLOCXX_THROW(limal::RuntimeException, - Format(__("openssl command failed: %1"), msg).c_str()); + Format(__("openssl command failed: %1"), msg).c_str()); } - + if(!errOutput.empty()) { LOGIT_DEBUG("openssl stderr:" << errOutput); @@ -808,28 +808,28 @@ blocxx::String OpenSSLUtils::verify(const blocxx::String &certFile, - const blocxx::String &caPath, - bool crlCheck, - const blocxx::String &purpose) + const blocxx::String &caPath, + bool crlCheck, + const blocxx::String &purpose) { path::PathInfo pi(certFile); if(!pi.exists() || !pi.isFile()) - { + { LOGIT_ERROR("No valid certificate file specified"); BLOCXX_THROW(limal::ValueException, - __("No valid certificate file specified.")); + __("No valid certificate file specified.")); } pi.stat(caPath); if(!pi.exists() || !pi.isDir()) - { + { LOGIT_ERROR("No valid CA directory specified"); BLOCXX_THROW(limal::ValueException, - __("No valid CA directory specified.")); + __("No valid CA directory specified.")); } blocxx::String debugCmd; - + debugCmd += m_cmd + " "; debugCmd += "verify "; @@ -848,9 +848,9 @@ debugCmd += certFile; StringArray cmd = PerlRegEx("\\s").split(debugCmd); - + LOGIT_DEBUG("Command: " << debugCmd); - + blocxx::EnvVars env; env.addVar("PATH", "/usr/bin/"); env.addVar("RANDFILE", m_rand); @@ -858,17 +858,17 @@ blocxx::String stdOutput; blocxx::String errOutput; int status = -1; - + try { status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, - errOutput, env); + errOutput, env); } catch(blocxx::Exception& e) { LOGIT_ERROR( "openssl exception:" << e); BLOCXX_THROW_SUBEX(limal::RuntimeException, - __("Executing openssl command failed."), e); + __("Executing openssl command failed."), e); } StringArray lines = PerlRegEx("\n").split(stdOutput); @@ -883,7 +883,7 @@ for(line = lines.begin(); line != lines.end(); ++line) { StringArray sa = ok.capture(*line); - + if(sa.size() == 2 && sa[1] == "OK") { result = "OK"; @@ -899,7 +899,7 @@ errNum = sa[1]; } } - + if(result != "OK") { if(!errOutput.empty()) @@ -920,7 +920,7 @@ OpenSSLUtils::status(const blocxx::String &serial) { blocxx::String debugCmd; - + debugCmd += m_cmd + " "; debugCmd += "ca "; @@ -929,9 +929,9 @@ debugCmd += "-status " + serial; StringArray cmd = PerlRegEx("\\s").split(debugCmd); - + LOGIT_DEBUG("Command: " << debugCmd); - + blocxx::EnvVars env; env.addVar("PATH", "/usr/bin/"); env.addVar("RANDFILE", m_rand); @@ -939,17 +939,17 @@ blocxx::String stdOutput; blocxx::String errOutput; int status = -1; - + try - { + { status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, - errOutput, env); + errOutput, env); } catch(blocxx::Exception& e) { LOGIT_ERROR( "openssl exception:" << e); BLOCXX_THROW_SUBEX(limal::RuntimeException, - __("Executing openssl command failed."), e); + __("Executing openssl command failed."), e); } StringArray lines = PerlRegEx("\n").split(errOutput); @@ -962,7 +962,7 @@ for(line = lines.begin(); line != lines.end(); ++line) { StringArray sa = serialMatch.capture(*line); - + if(sa.size() == 2) { return sa[1]; @@ -972,22 +972,22 @@ errMsg += *line + "\n"; } } - LOGIT_ERROR(Format("Show certificate status with serial '%1' failed.(%2)", - serial, status).toString()); + LOGIT_ERROR(Format("Show certificate status with serial '%1' failed.(%2)", + serial, status).toString()); if(!errOutput.empty()) { LOGIT_ERROR("openssl stderr:" << errOutput); } BLOCXX_THROW(limal::RuntimeException, - Format(__("Showing certificate status with serial %1 failed (%2)."), - serial, status).c_str()); + Format(__("Showing certificate status with serial %1 failed (%2)."), + serial, status).c_str()); } bool OpenSSLUtils::checkKey(const blocxx::String &caName, - const blocxx::String &password, - const blocxx::String &certificateName, - const blocxx::String &repository) + const blocxx::String &password, + const blocxx::String &certificateName, + const blocxx::String &repository) { String keyFile; @@ -999,27 +999,27 @@ { PerlRegEx r("^[[:xdigit:]]+:([[:xdigit:]]+[\\d-]*)$"); StringArray sa = r.capture(certificateName); - + if(sa.size() != 2) { LOGIT_ERROR("Can not parse certificate name"); BLOCXX_THROW(limal::RuntimeException, - __("Cannot parse the certificate name.")); + __("Cannot parse the certificate name.")); } - + keyFile = repository + "/" + caName + "/keys/" + sa[1] + ".key"; } path::PathInfo pi(keyFile); if(!pi.exists() || !pi.isFile()) - { + { LOGIT_ERROR("Keyfile does not exist"); BLOCXX_THROW(limal::SystemException, - __("The key file does not exist.")); + __("The key file does not exist.")); } blocxx::String debugCmd; - + debugCmd += limal::ca_mgm::OPENSSL_COMMAND + " "; debugCmd += "rsa -noout -in "; debugCmd += keyFile + " "; @@ -1040,15 +1040,15 @@ int status = -1; try - { + { status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, - errOutput, env); + errOutput, env); } catch(blocxx::Exception& e) { LOGIT_ERROR( "openssl exception:" << e); BLOCXX_THROW_SUBEX(limal::RuntimeException, - __("Executing openssl command failed."), e); + __("Executing openssl command failed."), e); } if(status == 0) { @@ -1057,7 +1057,7 @@ else { return false; - } + } } // ################################################### @@ -1067,19 +1067,19 @@ limal::ByteBuffer OpenSSLUtils::x509Convert(const ByteBuffer &certificate, - FormatType inform, - FormatType outform ) + FormatType inform, + FormatType outform ) { - // FIXME: use tmp file + // FIXME: use tmp file blocxx::String inFileName(::tempnam("/tmp/", "x509I")); blocxx::String outFileName(::tempnam("/tmp/", "x509O")); - + LocalManagement::writeFile(certificate, inFileName, - false, 0600); - + false, 0600); + blocxx::String debugCmd; bool foundError = false; - + debugCmd += limal::ca_mgm::OPENSSL_COMMAND + " "; debugCmd += "x509 "; debugCmd += "-nameopt "; @@ -1089,44 +1089,44 @@ debugCmd += "-out "; debugCmd += outFileName + " "; debugCmd += "-inform "; - + switch(inform) { - case E_PEM: - debugCmd += "PEM "; - break; - case E_DER: - debugCmd += "DER "; - break; + case E_PEM: + debugCmd += "PEM "; + break; + case E_DER: + debugCmd += "DER "; + break; } - + debugCmd += "-outform "; - + switch(outform) { - case E_PEM: - debugCmd += "PEM "; - break; - case E_DER: - debugCmd += "DER "; - break; + case E_PEM: + debugCmd += "PEM "; + break; + case E_DER: + debugCmd += "DER "; + break; } - + StringArray cmd = PerlRegEx("\\s").split(debugCmd); LOGIT_DEBUG("Command: " << debugCmd); - + blocxx::EnvVars env; env.addVar("PATH", "/usr/bin/"); env.addVar("RANDFILE", "./.rnd"); blocxx::String stdOutput; blocxx::String errOutput; int status = -1; - + try { status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, - errOutput, env); + errOutput, env); } catch(blocxx::Exception& e) { @@ -1134,7 +1134,7 @@ path::removeFile(inFileName); path::removeFile(outFileName); BLOCXX_THROW_SUBEX(limal::RuntimeException, - __("Executing openssl command failed."), e); + __("Executing openssl command failed."), e); } if(status != 0) { @@ -1159,38 +1159,38 @@ StringArray sa = errOutput.tokenize("\n\r"); String msg = (sa.empty()? "" : sa[0]); BLOCXX_THROW(limal::RuntimeException, - Format(__("openssl command failed: %1"), msg).c_str()); + Format(__("openssl command failed: %1"), msg).c_str()); } ByteBuffer out = LocalManagement::readFile(outFileName); - + path::removeFile(inFileName); path::removeFile(outFileName); - + return out; } limal::ByteBuffer OpenSSLUtils::rsaConvert(const ByteBuffer &key, - FormatType inform, - FormatType outform, - const String &inPassword, - const String &outPassword, - const String &algorithm) + FormatType inform, + FormatType outform, + const String &inPassword, + const String &outPassword, + const String &algorithm) { - // FIXME: use tmp file + // FIXME: use tmp file blocxx::String inFileName(::tempnam("/tmp/", "keyIn")); blocxx::String outFileName(::tempnam("/tmp/", "keyOt")); bool isInPassSet = false; bool isOutPassSet = false; bool foundError = false; - + LocalManagement::writeFile(key, inFileName, - false, 0600); - + false, 0600); + blocxx::String debugCmd; - + debugCmd += limal::ca_mgm::OPENSSL_COMMAND + " "; debugCmd += "rsa "; debugCmd += "-in "; @@ -1198,43 +1198,43 @@ debugCmd += "-out "; debugCmd += outFileName + " "; debugCmd += "-inform "; - + switch(inform) { - case E_PEM: - debugCmd += "PEM "; - break; - case E_DER: - debugCmd += "DER "; - break; + case E_PEM: + debugCmd += "PEM "; + break; + case E_DER: + debugCmd += "DER "; + break; } - + debugCmd += "-outform "; - + switch(outform) { - case E_PEM: - debugCmd += "PEM "; - break; - case E_DER: - debugCmd += "DER "; - break; + case E_PEM: + debugCmd += "PEM "; + break; + case E_DER: + debugCmd += "DER "; + break; } - + if(!inPassword.empty() && inform != E_DER) { debugCmd += "-passin env:inpass "; isInPassSet = true; } - + if(!outPassword.empty() && outform != E_DER) - { + { debugCmd += "-passout env:outpass "; - + debugCmd += "-"+ algorithm; isOutPassSet = true; } - + StringArray cmd = PerlRegEx("\\s").split(debugCmd); LOGIT_DEBUG("Command: " << debugCmd); @@ -1249,18 +1249,18 @@ } if(isOutPassSet) - { + { env.addVar("outpass", outPassword); } blocxx::String stdOutput; blocxx::String errOutput; int status = -1; - + try { status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, - errOutput, env); + errOutput, env); } catch(blocxx::Exception& e) { @@ -1268,7 +1268,7 @@ path::removeFile(inFileName); path::removeFile(outFileName); BLOCXX_THROW_SUBEX(limal::RuntimeException, - __("Executing openssl command failed."), e); + __("Executing openssl command failed."), e); } if(status != 0) { @@ -1279,12 +1279,12 @@ { // This message is not an error if(!PerlRegEx("^writing RSA key$").match(errOutput)) - { + { LOGIT_ERROR("openssl stderr:" << errOutput); foundError = true; } else - { + { LOGIT_DEBUG("openssl stderr:" << errOutput); } } @@ -1301,32 +1301,32 @@ StringArray sa = errOutput.tokenize("\n\r"); String msg = (sa.empty()? "" : sa[0]); BLOCXX_THROW(limal::RuntimeException, - Format(__("openssl command failed: %1"),msg).c_str()); + Format(__("openssl command failed: %1"),msg).c_str()); } ByteBuffer out = LocalManagement::readFile(outFileName); - + path::removeFile(inFileName); path::removeFile(outFileName); - + return out; } limal::ByteBuffer OpenSSLUtils::crlConvert(const ByteBuffer &crl, - FormatType inform, - FormatType outform ) + FormatType inform, + FormatType outform ) { - // FIXME: use tmp file + // FIXME: use tmp file blocxx::String inFileName(::tempnam("/tmp/", "crlIn")); blocxx::String outFileName(::tempnam("/tmp/", "crlOt")); - + LocalManagement::writeFile(crl, inFileName, - false, 0600); - + false, 0600); + blocxx::String debugCmd; - bool foundError = false; - + bool foundError = false; + debugCmd += limal::ca_mgm::OPENSSL_COMMAND + " "; debugCmd += "crl "; debugCmd += "-in "; @@ -1334,44 +1334,44 @@ debugCmd += "-out "; debugCmd += outFileName + " "; debugCmd += "-inform "; - + switch(inform) { - case E_PEM: - debugCmd += "PEM "; - break; - case E_DER: - debugCmd += "DER "; - break; + case E_PEM: + debugCmd += "PEM "; + break; + case E_DER: + debugCmd += "DER "; + break; } - + debugCmd += "-outform "; - + switch(outform) { - case E_PEM: - debugCmd += "PEM "; - break; - case E_DER: - debugCmd += "DER "; - break; + case E_PEM: + debugCmd += "PEM "; + break; + case E_DER: + debugCmd += "DER "; + break; } - + StringArray cmd = PerlRegEx("\\s").split(debugCmd); - + LOGIT_DEBUG("Command: " << debugCmd); - + blocxx::EnvVars env; env.addVar("PATH", "/usr/bin/"); env.addVar("RANDFILE", "./.rnd"); blocxx::String stdOutput; blocxx::String errOutput; int status = -1; - + try { status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, - errOutput, env); + errOutput, env); } catch(blocxx::Exception& e) { @@ -1379,7 +1379,7 @@ path::removeFile(inFileName); path::removeFile(outFileName); BLOCXX_THROW_SUBEX(limal::RuntimeException, - __("Executing openssl command failed."), e); + __("Executing openssl command failed."), e); } if(status != 0) { @@ -1395,7 +1395,7 @@ { LOGIT_DEBUG("openssl stdout:" << stdOutput); } - + if(foundError) { path::removeFile(inFileName); @@ -1404,11 +1404,11 @@ StringArray sa = errOutput.tokenize("\n\r"); String msg = (sa.empty()? "" : sa[0]); BLOCXX_THROW(limal::RuntimeException, - Format(__("openssl command failed: %1"), msg).c_str()); + Format(__("openssl command failed: %1"), msg).c_str()); } ByteBuffer out = LocalManagement::readFile(outFileName); - + path::removeFile(inFileName); path::removeFile(outFileName); @@ -1417,19 +1417,19 @@ limal::ByteBuffer OpenSSLUtils::reqConvert(const ByteBuffer &req, - FormatType inform, - FormatType outform ) + FormatType inform, + FormatType outform ) { - // FIXME: use tmp file + // FIXME: use tmp file blocxx::String inFileName(::tempnam("/tmp/", "reqIn")); blocxx::String outFileName(::tempnam("/tmp/", "reqOt")); - + LocalManagement::writeFile(req, inFileName, - false, 0600); - + false, 0600); + blocxx::String debugCmd; - bool foundError = false; - + bool foundError = false; + debugCmd += limal::ca_mgm::OPENSSL_COMMAND + " "; debugCmd += "req "; debugCmd += "-in "; @@ -1437,44 +1437,44 @@ debugCmd += "-out "; debugCmd += outFileName + " "; debugCmd += "-inform "; - + switch(inform) { - case E_PEM: - debugCmd += "PEM "; - break; - case E_DER: - debugCmd += "DER "; - break; + case E_PEM: + debugCmd += "PEM "; + break; + case E_DER: + debugCmd += "DER "; + break; } - + debugCmd += "-outform "; - + switch(outform) { - case E_PEM: - debugCmd += "PEM "; - break; - case E_DER: - debugCmd += "DER "; - break; + case E_PEM: + debugCmd += "PEM "; + break; + case E_DER: + debugCmd += "DER "; + break; } - + StringArray cmd = PerlRegEx("\\s").split(debugCmd); - + LOGIT_DEBUG("Command: " << debugCmd); - + blocxx::EnvVars env; env.addVar("PATH", "/usr/bin/"); env.addVar("RANDFILE", "./.rnd"); blocxx::String stdOutput; blocxx::String errOutput; int status = -1; - + try { status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, - errOutput, env); + errOutput, env); } catch(blocxx::Exception& e) { @@ -1482,7 +1482,7 @@ path::removeFile(inFileName); path::removeFile(outFileName); BLOCXX_THROW_SUBEX(limal::RuntimeException, - __("Executing openssl command failed."), e); + __("Executing openssl command failed."), e); } if(status != 0) { @@ -1498,7 +1498,7 @@ { LOGIT_DEBUG("openssl stdout:" << stdOutput); } - + if(foundError) { path::removeFile(inFileName); @@ -1507,11 +1507,11 @@ StringArray sa = errOutput.tokenize("\n\r"); String msg = (sa.empty()? "" : sa[0]); BLOCXX_THROW(limal::RuntimeException, - Format(__("openssl command failed: %1"), msg).c_str()); + Format(__("openssl command failed: %1"), msg).c_str()); } ByteBuffer out = LocalManagement::readFile(outFileName); - + path::removeFile(inFileName); path::removeFile(outFileName); @@ -1520,14 +1520,14 @@ limal::ByteBuffer OpenSSLUtils::createPKCS12(const ByteBuffer &certificate, - const ByteBuffer &key, - const String &inPassword, - const String &outPassword, - const ByteBuffer &caCert, - const String &caPath, - bool withChain ) + const ByteBuffer &key, + const String &inPassword, + const String &outPassword, + const ByteBuffer &caCert, + const String &caPath, + bool withChain ) { - // FIXME: use tmp file + // FIXME: use tmp file blocxx::String inFileName1(::tempnam("/tmp/", "crtIn")); blocxx::String inFileName2(::tempnam("/tmp/", "keyIn")); blocxx::String inFileName3(::tempnam("/tmp/", "caIn")); @@ -1535,20 +1535,20 @@ bool isInPassSet = false; bool isOutPassSet = false; - bool foundError = false; - + bool foundError = false; + LocalManagement::writeFile(certificate, inFileName1, - false, 0600); + false, 0600); LocalManagement::writeFile(key, inFileName2, - false, 0600); + false, 0600); if(!caCert.empty()) { LocalManagement::writeFile(caCert, inFileName3, - false, 0600); + false, 0600); } blocxx::String debugCmd; - + debugCmd += limal::ca_mgm::OPENSSL_COMMAND + " "; debugCmd += "pkcs12 "; debugCmd += "-in "; @@ -1562,7 +1562,7 @@ { debugCmd += "-CApath "; debugCmd += caPath + " "; - + if( withChain ) { debugCmd += "-chain "; @@ -1584,7 +1584,7 @@ { LOGIT_ERROR("Out password is required"); BLOCXX_THROW(limal::ValueException, - __("The password for encrypting the output is required.")); + __("The password for encrypting the output is required.")); } debugCmd += "-inkey "; @@ -1610,18 +1610,18 @@ } if(isOutPassSet) - { + { env.addVar("outpass", outPassword); } blocxx::String stdOutput; blocxx::String errOutput; int status = -1; - + try { status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, - errOutput, env); + errOutput, env); } catch(blocxx::Exception& e) { @@ -1634,7 +1634,7 @@ } path::removeFile(outFileName); BLOCXX_THROW_SUBEX(limal::RuntimeException, - __("Executing openssl command failed."), e); + __("Executing openssl command failed."), e); } if(status != 0) { @@ -1660,15 +1660,15 @@ path::removeFile(inFileName3); } path::removeFile(outFileName); - + StringArray sa = errOutput.tokenize("\n\r"); String msg = (sa.empty()? "" : sa[0]); BLOCXX_THROW(limal::RuntimeException, - Format(__("openssl command failed: %1"), msg).c_str()); + Format(__("openssl command failed: %1"), msg).c_str()); } ByteBuffer out = LocalManagement::readFile(outFileName); - + path::removeFile(inFileName1); path::removeFile(inFileName2); if(!caCert.empty()) @@ -1682,23 +1682,23 @@ limal::ByteBuffer OpenSSLUtils::pkcs12ToPEM(const ByteBuffer &pkcs12, - const String &inPassword, - const String &outPassword, - const String &algorithm) + const String &inPassword, + const String &outPassword, + const String &algorithm) { - // FIXME: use tmp file + // FIXME: use tmp file blocxx::String inFileName(::tempnam("/tmp/", "p12In")); blocxx::String outFileName(::tempnam("/tmp/", "x509O")); - + bool isInPassSet = false; bool isOutPassSet = false; - bool foundError = false; - + bool foundError = false; + LocalManagement::writeFile(pkcs12, inFileName, - false, 0600); - + false, 0600); + blocxx::String debugCmd; - + debugCmd += limal::ca_mgm::OPENSSL_COMMAND + " "; debugCmd += "pkcs12 "; debugCmd += "-in "; @@ -1709,17 +1709,17 @@ // -nokeys? if(!inPassword.empty()) - { + { debugCmd += "-passin env:inpass "; isInPassSet = true; } else - { + { LOGIT_ERROR("PKCS12 password is required"); BLOCXX_THROW(limal::ValueException, - __("The PKCS12 password is required.")); + __("The PKCS12 password is required.")); } - + if(!outPassword.empty()) { debugCmd += "-passout env:outpass "; @@ -1727,14 +1727,14 @@ isOutPassSet = true; } else - { + { debugCmd += "-nodes "; } - + StringArray cmd = PerlRegEx("\\s").split(debugCmd); - + LOGIT_DEBUG("Command: " << debugCmd); - + blocxx::EnvVars env; env.addVar("PATH", "/usr/bin/"); @@ -1742,20 +1742,20 @@ { env.addVar("inpass", inPassword); } - + if(isOutPassSet) - { + { env.addVar("outpass", outPassword); } - + blocxx::String stdOutput; blocxx::String errOutput; int status = -1; - + try { status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, - errOutput, env); + errOutput, env); } catch(blocxx::Exception& e) { @@ -1763,7 +1763,7 @@ path::removeFile(inFileName); path::removeFile(outFileName); BLOCXX_THROW_SUBEX(limal::RuntimeException, - __("Executing openssl command failed."), e); + __("Executing openssl command failed."), e); } if(status != 0) { @@ -1774,12 +1774,12 @@ { // This message is not an error if(!PerlRegEx("^MAC verified OK$").match(errOutput)) - { + { LOGIT_ERROR("openssl stderr:" << errOutput); foundError = true; } else - { + { LOGIT_DEBUG("openssl stderr:" << errOutput); } } @@ -1792,18 +1792,18 @@ { path::removeFile(inFileName); path::removeFile(outFileName); - + StringArray sa = errOutput.tokenize("\n\r"); String msg = (sa.empty()? "" : sa[0]); BLOCXX_THROW(limal::RuntimeException, - Format(__("openssl command failed: %1"), msg).c_str()); + Format(__("openssl command failed: %1"), msg).c_str()); } ByteBuffer out = LocalManagement::readFile(outFileName); - + path::removeFile(inFileName); path::removeFile(outFileName); - + return out; } @@ -1812,36 +1812,36 @@ { List<String> tmpList; Array<String> retList; - + int r = path::readDir(tmpList, repository, false); - + if(r != 0) { - LOGIT_ERROR("Cannot read directory: " << repository << - "(" << System::errorMsg(r) << ") [" << r << "]"); + LOGIT_ERROR("Cannot read directory: " << repository << + "(" << System::errorMsg(r) << ") [" << r << "]"); BLOCXX_THROW(limal::SystemException, - Format(__("Cannot read directory: %1 (%2) [%3]."), - repository, System::errorMsg(r), r).c_str()); + Format(__("Cannot read directory: %1 (%2) [%3]."), + repository, System::errorMsg(r), r).c_str()); } - + tmpList.sort(); - + List<String>::const_iterator cont; - + path::PathInfo pi(repository); - + for(cont = tmpList.begin(); cont != tmpList.end(); ++cont) { pi.stat(repository + "/" + *cont); - + if(pi.exists() && pi.isDir()) { pi.stat(repository + "/" + *cont + "/openssl.cnf.tmpl"); - + if(pi.exists() && pi.isFile()) { pi.stat(repository + "/" + *cont + "/cacert.pem"); - + if(pi.exists() && pi.isFile()) { retList.push_back(*cont); @@ -1859,7 +1859,7 @@ String s(b.data(), b.size()); PerlRegEx r("^([[:xdigit:]]+)$"); - + StringArray sa = r.capture(s); if(sa.size() == 2) @@ -1870,16 +1870,16 @@ { LOGIT_ERROR("No serial number found in " << serialFile); BLOCXX_THROW(limal::RuntimeException, - Format(__("No serial number found in %1."), - serialFile).c_str()); + Format(__("No serial number found in %1."), + serialFile).c_str()); } } void OpenSSLUtils::addCAM(const String &caName, - const String &md5, - const String &dnString, - const String &repository) + const String &md5, + const String &dnString, + const String &repository) { Array<Array<String> > db = OpenSSLUtils::parseCAMDB(caName, repository); Array<Array<String> >::const_iterator it; @@ -1890,51 +1890,51 @@ { LOGIT_ERROR("Request already exist."); BLOCXX_THROW(limal::RuntimeException, - __("The request already exists.")); + __("The request already exists.")); } } - + ByteBuffer b = LocalManagement::readFile(repository + "/" + caName + "/cam.txt"); String cam(b.data(), b.size()); cam += md5 + " " + dnString + "\n"; LocalManagement::writeFile(ByteBuffer(cam.c_str(), cam.length()), - repository + "/" + caName + "/cam.txt"); + repository + "/" + caName + "/cam.txt"); } void OpenSSLUtils::delCAM(const String &caName, - const String &md5, - const String &repository) + const String &md5, + const String &repository) { ByteBuffer b = LocalManagement::readFile(repository + "/" + caName + "/cam.txt"); String cam(b.data(), b.size()); StringArray lines = PerlRegEx("\n").split(cam); - + StringArray::const_iterator line; String camNew; for(line = lines.begin(); line != lines.end(); ++line) { PerlRegEx r("^" + md5); - + if(!r.match(*line)) { camNew += *line + "\n"; } } LocalManagement::writeFile(ByteBuffer(camNew.c_str(), camNew.length()), - repository + "/" + caName + "/cam.txt"); + repository + "/" + caName + "/cam.txt"); } blocxx::Array<blocxx::Array<blocxx::String> > OpenSSLUtils::parseCAMDB(const String &caName, - const String &repository) + const String &repository) { Array<Array<String> > ret; @@ -1943,21 +1943,21 @@ String cam(b.data(), b.size()); StringArray lines = PerlRegEx("\n").split(cam); - + StringArray::const_iterator line; for(line = lines.begin(); line != lines.end(); ++line) { PerlRegEx r("^([[:xdigit:]]+[\\d-]*)\\s(.*)$"); - + StringArray col = r.capture(*line); - + if(col.size() != 3) { LOGIT_INFO("Can not parse line '" << *line << "'"); continue; } - + Array<String> a; a.push_back(col[1]); a.push_back(col[2]); @@ -1968,7 +1968,7 @@ blocxx::Array<blocxx::Array<blocxx::String> > OpenSSLUtils::parseIndexTXT(const String &caName, - const String &repository) + const String &repository) { Array<Array<String> > ret; @@ -1977,21 +1977,21 @@ String cam(b.data(), b.size()); StringArray lines = PerlRegEx("\n").split(cam); - + StringArray::const_iterator line; for(line = lines.begin(); line != lines.end(); ++line) { PerlRegEx r("^(\\w)\\s([\\d\\w]+)\\s([\\w\\d,.]*)\\s([[:xdigit:]]+)\\s(\\w+)\\s(.*)$"); - + StringArray col = r.capture(*line); - + if(col.size() != 7) { LOGIT_INFO("Can not parse line '" << *line << "'"); continue; } - + Array<String> a; a.push_back(col[1]); a.push_back(col[2]); @@ -2006,7 +2006,7 @@ blocxx::Array<blocxx::Map<blocxx::String, blocxx::String> > OpenSSLUtils::listRequests(const String &caName, - const String &repository) + const String &repository) { Array<Map<String, String> > ret; List<String> tmpList; @@ -2017,35 +2017,35 @@ if(r != 0) { - LOGIT_ERROR("Cannot read directory: " << reqDir << - "(" << System::errorMsg(r) << ") [" << r << "]"); + LOGIT_ERROR("Cannot read directory: " << reqDir << + "(" << System::errorMsg(r) << ") [" << r << "]"); BLOCXX_THROW(limal::SystemException, - Format(__("Cannot read directory: %1 (%2) [%3]."), - reqDir, System::errorMsg(r), r).c_str()); + Format(__("Cannot read directory: %1 (%2) [%3]."), + reqDir, System::errorMsg(r), r).c_str()); } tmpList.sort(); - + Array<Array<String> > camdb = OpenSSLUtils::parseCAMDB(caName, repository); List<String>::const_iterator cont; path::PathInfo pi(reqDir); - + for(cont = tmpList.begin(); cont != tmpList.end(); ++cont) { pi.stat(reqDir + "/" + *cont); - + if(!pi.exists() || !pi.isFile()) { LOGIT_INFO("skipping file " << pi.toString()); continue; } - + PerlRegEx requestR("^([[:xdigit:]]+)-?(\\d*)\\.req$"); StringArray sa = requestR.capture(*cont); if(sa.size() <= 1) - { + { LOGIT_INFO("unknown filename ... skipping (" << *cont << ")"); continue; } @@ -2056,11 +2056,11 @@ if(sa.size() == 3 && !sa[2].empty()) { md5 += "-" + sa[2]; - - DateTime dt( sa[2].toInt64() ); + + DateTime dt( sa[2].toInt64() ); date = dt.toString("%Y-%m-%d %H:%M:%S", DateTime::E_LOCAL_TIME); } - + Map<String, String> reqLine; String subject; @@ -2081,7 +2081,7 @@ { LOGIT_ERROR("Can not find request subject."); BLOCXX_THROW(limal::RuntimeException, - __("Cannot find the request subject.")); + __("Cannot find the request subject.")); } sa.clear(); @@ -2089,9 +2089,9 @@ { StringArray saTmp = PerlRegEx("(.*?[^\\\\])(\\/|$)").capture(subject); uint pos = 0; - + if(saTmp.size() >=2) - { + { pos = saTmp[1].length(); sa.push_back(saTmp[1]); } @@ -2117,13 +2117,13 @@ { String toMatch = quoteR.replace(*it, "/", true); toMatch = PerlRegEx("^/").replace(toMatch, ""); - + if(cR.match(toMatch)) - { + { reqLine["country"] = toMatch.substring(2); } else if(stR.match(toMatch)) - { + { reqLine["stateOrProvinceName"] = toMatch.substring(3); } else if(lR.match(toMatch)) @@ -2131,11 +2131,11 @@ reqLine["localityName"] = toMatch.substring(2); } else if(oR.match(toMatch)) - { + { reqLine["organizationName"] = toMatch.substring(2); } else if(ouR.match(toMatch)) - { + { reqLine["organizationalUnitName"] = toMatch.substring(3); } else if(cnR.match(toMatch)) @@ -2143,7 +2143,7 @@ reqLine["commonName"] = toMatch.substring(3); } else if(emailR.match(toMatch)) - { + { reqLine["emailAddress"] = toMatch.substring(13); } else @@ -2158,7 +2158,7 @@ blocxx::Array<blocxx::Map<blocxx::String, blocxx::String> > OpenSSLUtils::listCertificates(const String &caName, - const String &repository) + const String &repository) { Array<Map<String, String> > ret; List<String> tmpList; @@ -2169,23 +2169,23 @@ if(r != 0) { - LOGIT_ERROR("Cannot read directory: " << certDir << - "(" << System::errorMsg(r) << ") [" << r << "]"); + LOGIT_ERROR("Cannot read directory: " << certDir << + "(" << System::errorMsg(r) << ") [" << r << "]"); BLOCXX_THROW(limal::SystemException, - Format(__("Cannot read directory: %1 (%2) [%3]."), - certDir, System::errorMsg(r), r).c_str()); + Format(__("Cannot read directory: %1 (%2) [%3]."), + certDir, System::errorMsg(r), r).c_str()); } tmpList.sort(); - + Array<Array<String> > indexTXT = OpenSSLUtils::parseIndexTXT(caName, repository); List<String>::const_iterator cont; path::PathInfo pi(certDir); - + for(cont = tmpList.begin(); cont != tmpList.end(); ++cont) { pi.stat(certDir + "/" + *cont); - + if(!pi.exists() || !pi.isFile()) { LOGIT_INFO("skipping file " << pi.toString()); @@ -2217,7 +2217,7 @@ if( (*dbIT)[3] == serial ) { subject = (*dbIT)[5]; - + if((*dbIT)[0] == "V" ) { certLine["status"] = "Valid"; @@ -2231,7 +2231,7 @@ certLine["status"] = "Expired"; } else - { + { certLine["status"] = (*dbIT)[0]; } break; @@ -2242,7 +2242,7 @@ { LOGIT_ERROR("Can not find certificate subject."); BLOCXX_THROW(limal::RuntimeException, - __("Cannot find the certificate subject.")); + __("Cannot find the certificate subject.")); } sa.clear(); @@ -2252,7 +2252,7 @@ uint pos = 0; if(saTmp.size() >=2) - { + { pos = saTmp[1].length(); sa.push_back(saTmp[1]); } @@ -2279,14 +2279,14 @@ { String toMatch = quoteR.replace(*it, "/", true); toMatch = PerlRegEx("^/").replace(toMatch, ""); - + if(cR.match(toMatch)) - { + { certLine["country"] = toMatch.substring(2); lastPart = "country"; } else if(stR.match(toMatch)) - { + { certLine["stateOrProvinceName"] = toMatch.substring(3); lastPart = "stateOrProvinceName"; } @@ -2296,34 +2296,34 @@ lastPart = "localityName"; } else if(oR.match(toMatch)) - { + { certLine["organizationName"] = toMatch.substring(2); lastPart = "organizationName"; } else if(ouR.match(toMatch)) - { + { certLine["organizationalUnitName"] = toMatch.substring(3); lastPart = "organizationalUnitName"; } else if(cnR.match(toMatch)) - { + { certLine["commonName"] = toMatch.substring(3); lastPart = "commonName"; } else if(emailR.match(toMatch)) - { + { certLine["emailAddress"] = toMatch.substring(13); lastPart = "emailAddress"; } else { if(!lastPart.empty() && (*it).charAt(0) == '/') - { + { certLine[lastPart] = certLine[lastPart] + *it; LOGIT_DEBUG(Format("Append '%1' to %2", *it, lastPart)); } else - { + { LOGIT_INFO("Unknown rdn: " << toMatch); } } @@ -2334,14 +2334,14 @@ } void -OpenSSLUtils::createCaInfrastructure(const String &caName, - const String &repository) +OpenSSLUtils::createCaInfrastructure(const String &caName, + const String &repository) { if(caName.empty() || !PerlRegEx("\\w+").match(caName)) - { + { LOGIT_ERROR("Invalid caName: " << caName); BLOCXX_THROW(limal::ValueException, - Format(__("Invalid caName: %1."), caName).c_str()); + Format(__("Invalid caName: %1."), caName).c_str()); } path::PathInfo pi(repository); @@ -2350,8 +2350,8 @@ { LOGIT_ERROR(repository << " does not exist"); BLOCXX_THROW_ERR(limal::SystemException, - Format(__("'%1' does not exist."), repository).c_str(), - E_FILE_NOT_FOUND); + Format(__("'%1' does not exist."), repository).c_str(), + E_FILE_NOT_FOUND); } pi.stat(repository + "/" + caName); @@ -2360,26 +2360,26 @@ { LOGIT_ERROR(pi.toString() << " still exist"); BLOCXX_THROW_ERR(limal::SystemException, - Format(__("%1 still exists."), pi.toString()).c_str(), - E_FILE_EXISTS); + Format(__("%1 still exists."), pi.toString()).c_str(), + E_FILE_EXISTS); } - + int r = path::createDir(pi.toString(), 0700); if( r != 0 ) { LOGIT_ERROR(Format("Can not create directory: %1 (%2 [%3])", - pi.toString(), System::errorMsg(r), r)); + pi.toString(), System::errorMsg(r), r)); BLOCXX_THROW(limal::SystemException, - Format(__("Cannot create directory: %1 (%2 [%3])."), - pi.toString(), System::errorMsg(r), r).c_str()); + Format(__("Cannot create directory: %1 (%2 [%3])."), + pi.toString(), System::errorMsg(r), r).c_str()); } ByteBuffer tmpl; try { tmpl = LocalManagement::readFile(repository + "/openssl.cnf.tmpl"); - + StringArray tmplArray = PerlRegEx("\n").split(String(tmpl.data(), tmpl.size()), true); PerlRegEx dirR("^\\s*dir\\s*="); @@ -2393,20 +2393,20 @@ newConf += "dir = " + pi.toString() + "/\n"; } else - { + { newConf += *line + "\n"; } } - LocalManagement::writeFile(ByteBuffer(newConf.c_str(), newConf.length()), - pi.toString() + "/openssl.cnf.tmpl"); + LocalManagement::writeFile(ByteBuffer(newConf.c_str(), newConf.length()), + pi.toString() + "/openssl.cnf.tmpl"); } catch(blocxx::Exception &e) { path::removeDirRecursive(repository + "/" + caName); BLOCXX_THROW_SUBEX(limal::SystemException, - __("Cannot copy the configuration template."), e); + __("Cannot copy the configuration template."), e); } String dir = pi.toString() + "/certs"; @@ -2415,12 +2415,12 @@ if( r != 0 ) { path::removeDirRecursive(repository + "/" + caName); - + LOGIT_ERROR(Format("Can not create directory: %1 (%2 [%3])", - dir, System::errorMsg(r), r)); + dir, System::errorMsg(r), r)); BLOCXX_THROW(limal::SystemException, - Format(__("Cannot create directory: %1 (%2 [%3])."), - dir, System::errorMsg(r), r).c_str()); + Format(__("Cannot create directory: %1 (%2 [%3])."), + dir, System::errorMsg(r), r).c_str()); } dir = pi.toString() + "/crl"; @@ -2431,10 +2431,10 @@ path::removeDirRecursive(repository + "/" + caName); LOGIT_ERROR(Format("Can not create directory: %1 (%2 [%3])", - dir, System::errorMsg(r), r)); + dir, System::errorMsg(r), r)); BLOCXX_THROW(limal::SystemException, - Format(__("Cannot create directory: %1 (%2 [%3])."), - dir, System::errorMsg(r), r).c_str()); + Format(__("Cannot create directory: %1 (%2 [%3])."), + dir, System::errorMsg(r), r).c_str()); } dir = pi.toString() + "/newcerts"; @@ -2445,10 +2445,10 @@ path::removeDirRecursive(repository + "/" + caName); LOGIT_ERROR(Format("Can not create directory: %1 (%2 [%3])", - dir, System::errorMsg(r), r)); + dir, System::errorMsg(r), r)); BLOCXX_THROW(limal::SystemException, - Format(__("Cannot create directory: %1 (%2 [%3])."), - dir, System::errorMsg(r), r).c_str()); + Format(__("Cannot create directory: %1 (%2 [%3])."), + dir, System::errorMsg(r), r).c_str()); } dir = pi.toString() + "/req"; @@ -2459,10 +2459,10 @@ path::removeDirRecursive(repository + "/" + caName); LOGIT_ERROR(Format("Can not create directory: %1 (%2 [%3])", - dir, System::errorMsg(r), r)); + dir, System::errorMsg(r), r)); BLOCXX_THROW(limal::SystemException, - Format(__("Cannot create directory: %1 (%2 [%3])."), - dir, System::errorMsg(r), r).c_str()); + Format(__("Cannot create directory: %1 (%2 [%3])."), + dir, System::errorMsg(r), r).c_str()); } dir = pi.toString() + "/keys"; @@ -2473,27 +2473,27 @@ path::removeDirRecursive(repository + "/" + caName); LOGIT_ERROR(Format("Can not create directory: %1 (%2 [%3])", - dir, System::errorMsg(r), r)); + dir, System::errorMsg(r), r)); BLOCXX_THROW(limal::SystemException, - Format(__("Cannot create directory: %1 (%2 [%3])."), - dir, System::errorMsg(r), r).c_str()); + Format(__("Cannot create directory: %1 (%2 [%3])."), + dir, System::errorMsg(r), r).c_str()); } try { - LocalManagement::writeFile(ByteBuffer("01"), - pi.toString() + "/serial"); - LocalManagement::writeFile(ByteBuffer(), - pi.toString() + "/index.txt"); - LocalManagement::writeFile(ByteBuffer(), - pi.toString() + "/cam.txt"); + LocalManagement::writeFile(ByteBuffer("01"), + pi.toString() + "/serial"); + LocalManagement::writeFile(ByteBuffer(), + pi.toString() + "/index.txt"); + LocalManagement::writeFile(ByteBuffer(), + pi.toString() + "/cam.txt"); } catch(blocxx::Exception &e) { path::removeDirRecursive(repository + "/" + caName); - + BLOCXX_THROW_SUBEX(limal::SystemException, - __("Cannot create the file."), e); + __("Cannot create the file."), e); } } -- To unsubscribe, e-mail: limal-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: limal-commit+help(a)opensuse.org

1 0

r2352 - /limal-head/limal/package/limal.changes
by mcalmer＠svn.opensuse.org 12 Oct '07

12 Oct '07

Author: mcalmer Date: Fri Oct 12 17:55:27 2007 New Revision: 2352 URL: http://svn.opensuse.org/viewcvs/limal?rev=2352&view=rev Log: update changes Modified: limal-head/limal/package/limal.changes Modified: limal-head/limal/package/limal.changes URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal/package/limal.change… ============================================================================== --- limal-head/limal/package/limal.changes (original) +++ limal-head/limal/package/limal.changes Fri Oct 12 17:55:27 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Oct 12 17:54:43 CEST 2007 - mc(a)suse.de + +- PathUtils: remove a non existing file is not an error + +------------------------------------------------------------------- Thu Oct 11 11:59:09 CEST 2007 - mc(a)suse.de - version 1.4.0 -- To unsubscribe, e-mail: limal-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: limal-commit+help(a)opensuse.org

1 0

r2351 - /limal-head/limal/src/PathUtils.cpp
by mcalmer＠svn.opensuse.org 12 Oct '07

12 Oct '07

Author: mcalmer Date: Fri Oct 12 17:54:30 2007 New Revision: 2351 URL: http://svn.opensuse.org/viewcvs/limal?rev=2351&view=rev Log: - remove a non existing file is not an error - beautify error messages Modified: limal-head/limal/src/PathUtils.cpp Modified: limal-head/limal/src/PathUtils.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal/src/PathUtils.cpp?re… ============================================================================== --- limal-head/limal/src/PathUtils.cpp (original) +++ limal-head/limal/src/PathUtils.cpp Fri Oct 12 17:54:30 2007 @@ -167,7 +167,7 @@ status = ps.exitStatus(); } catch(const blocxx::Exception &e) { - LOGIT_ERROR( "removeDirRecursive exception:" << e); + LOGIT_ERROR( "removeDirRecursive exception: " << e); } #else try { @@ -179,17 +179,17 @@ status = WEXITSTATUS(execStatus); } catch(const blocxx::Exception &e) { - LOGIT_ERROR( "removeDirRecursive exception:" << e); + LOGIT_ERROR( "removeDirRecursive exception: " << e); } #endif if(status != 0) { - LOGIT_ERROR( "removeDirRecursive status:" << status ); + LOGIT_ERROR( "removeDirRecursive status: " << status ); } if(!errOutput.empty()) { - LOGIT_ERROR( "removeDirRecursive stderr:" << errOutput ); + LOGIT_ERROR( "removeDirRecursive stderr: " << errOutput ); } if(!stdOutput.empty()) { - LOGIT_DEBUG( "removeDirRecursive stdout:" << stdOutput ); + LOGIT_DEBUG( "removeDirRecursive stdout: " << stdOutput ); } return status; @@ -242,7 +242,7 @@ status = ps.exitStatus(); } catch(const blocxx::Exception &e) { - LOGIT_ERROR( "copyDir exception:" << e); + LOGIT_ERROR( "copyDir exception: " << e); } #else try { @@ -254,17 +254,17 @@ status = WEXITSTATUS(execStatus); } catch(const blocxx::Exception &e) { - LOGIT_ERROR( "copyDir exception:" << e); + LOGIT_ERROR( "copyDir exception: " << e); } #endif if(status != 0) { - LOGIT_ERROR( "copyDir status:" << status ); + LOGIT_ERROR( "copyDir status: " << status ); } if(!errOutput.empty()) { - LOGIT_ERROR( "copyDir stderr:" << errOutput ); + LOGIT_ERROR( "copyDir stderr: " << errOutput ); } if(!stdOutput.empty()) { - LOGIT_DEBUG( "copyDir stdout:" << stdOutput ); + LOGIT_DEBUG( "copyDir stdout: " << stdOutput ); } return status; @@ -287,7 +287,7 @@ DIR * dir = ::opendir( path.toString().c_str() ); if ( ! dir ) { - LOGIT_ERROR("readDir ::opendir returned" << errno2String(errno)); + LOGIT_ERROR("readDir ::opendir returned " << errno2String(errno)); return errno; } @@ -323,7 +323,13 @@ { LOGIT_DEBUG("removeFile " << path); if ( ::unlink( path.toString().c_str() ) == -1 ) { - LOGIT_ERROR("removeFile "<< path << "returned" << errno2String(errno)); + if(errno == ENOENT) + { + // remove a file which does not exist: the result is ok + // The file does not exist after this call. So return 0. + return 0; + } + LOGIT_ERROR("removeFile "<< path << " returned " << errno2String(errno)); return errno; } return 0; @@ -341,7 +347,7 @@ { LOGIT_DEBUG("moveFile " << oldpath << " -> " << newpath); if ( ::rename( oldpath.toString().c_str(), newpath.toString().c_str() ) == -1 ) { - LOGIT_ERROR("moveFile " << oldpath << " -> " << newpath << "returned" << errno2String(errno)); + LOGIT_ERROR("moveFile " << oldpath << " -> " << newpath << " returned " << errno2String(errno)); return errno; } return 0 ; @@ -391,7 +397,7 @@ status = ps.exitStatus(); } catch(const blocxx::Exception &e) { - LOGIT_ERROR( "copyFile exception:" << e); + LOGIT_ERROR( "copyFile exception: " << e); } #else try { @@ -403,7 +409,7 @@ status = WEXITSTATUS(execStatus); } catch(const blocxx::Exception &e) { - LOGIT_ERROR( "copyFile exception:" << e); + LOGIT_ERROR( "copyFile exception: " << e); } #endif if(status != 0) { @@ -431,7 +437,7 @@ { LOGIT_DEBUG("symLink " << newpath << " -> " << oldpath); if ( ::symlink( oldpath.toString().c_str(), newpath.toString().c_str() ) == -1 ) { - LOGIT_ERROR("symLink " << newpath << " -> " << oldpath << "returned " << errno2String(errno)); + LOGIT_ERROR("symLink " << newpath << " -> " << oldpath << " returned " << errno2String(errno)); return errno ; } return 0; @@ -449,7 +455,7 @@ LOGIT_DEBUG("changeMode " << path << ' ' << mode2String( mode )); if ( ::chmod( path.toString().c_str(), mode ) == -1 ) { LOGIT_ERROR("changeMode " << path << ' ' << mode2String( mode ) << - "returned " << errno2String(errno)); + " returned " << errno2String(errno)); return errno; } return 0; -- To unsubscribe, e-mail: limal-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: limal-commit+help(a)opensuse.org

1 0

r2350 - in /limal-head/limal-ca-mgm: package/ src/ testsuite/ testsuite/single.out/
by mcalmer＠svn.opensuse.org 12 Oct '07

12 Oct '07

Author: mcalmer Date: Fri Oct 12 17:53:17 2007 New Revision: 2350 URL: http://svn.opensuse.org/viewcvs/limal?rev=2350&view=rev Log: - improve error reporting from openssl commands - add Exception tests Modified: limal-head/limal-ca-mgm/package/limal-ca-mgm.changes limal-head/limal-ca-mgm/src/OpenSSLUtils.cpp limal-head/limal-ca-mgm/src/Utils.cpp limal-head/limal-ca-mgm/src/Utils.hpp limal-head/limal-ca-mgm/testsuite/ConvertTest.cc limal-head/limal-ca-mgm/testsuite/perl-CertificateExceptionTest.single limal-head/limal-ca-mgm/testsuite/single.out/ConvertTest.err limal-head/limal-ca-mgm/testsuite/single.out/ConvertTest.out limal-head/limal-ca-mgm/testsuite/single.out/perl-CertificateExceptionTest.out Modified: limal-head/limal-ca-mgm/package/limal-ca-mgm.changes URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/package/limal… ============================================================================== --- limal-head/limal-ca-mgm/package/limal-ca-mgm.changes (original) +++ limal-head/limal-ca-mgm/package/limal-ca-mgm.changes Fri Oct 12 17:53:17 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 12 17:52:14 CEST 2007 - mc(a)suse.de + +- improve error reporting from openssl commands +- add Exception tests + +------------------------------------------------------------------- Fri Sep 28 16:18:14 CEST 2007 - mc(a)suse.de - version 1.4.0 Modified: limal-head/limal-ca-mgm/src/OpenSSLUtils.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/OpenSSLUt… ============================================================================== --- limal-head/limal-ca-mgm/src/OpenSSLUtils.cpp (original) +++ limal-head/limal-ca-mgm/src/OpenSSLUtils.cpp Fri Oct 12 17:53:17 2007 @@ -85,78 +85,83 @@ } } - void - OpenSSLUtils::createRSAKey(const String &outFile, - const String &password, - UInt32 bits, - const String &cryptAlgorithm) - { - blocxx::String debugCmd; +void +OpenSSLUtils::createRSAKey(const String &outFile, + const String &password, + UInt32 bits, + const String &cryptAlgorithm) +{ + blocxx::String debugCmd; - debugCmd += m_cmd + " "; - debugCmd += "genrsa "; - debugCmd += "-out "; - debugCmd += outFile + " "; + debugCmd += m_cmd + " "; + debugCmd += "genrsa "; + debugCmd += "-out "; + debugCmd += outFile + " "; - if(!cryptAlgorithm.empty()) - { - debugCmd += "-passout env:pass "; - debugCmd += "-" + cryptAlgorithm + " "; - } + if(!cryptAlgorithm.empty()) + { + debugCmd += "-passout env:pass "; + debugCmd += "-" + cryptAlgorithm + " "; + } - debugCmd += String(bits); + debugCmd += String(bits); - StringArray cmd = PerlRegEx("\\s").split(debugCmd); + StringArray cmd = PerlRegEx("\\s").split(debugCmd); - LOGIT_DEBUG("Command: " << debugCmd); + LOGIT_DEBUG("Command: " << debugCmd); - blocxx::EnvVars env; - env.addVar("PATH", "/usr/bin/"); - env.addVar("RANDFILE", m_rand); + blocxx::EnvVars env; + env.addVar("PATH", "/usr/bin/"); + env.addVar("RANDFILE", m_rand); - env.addVar("pass", password); + env.addVar("pass", password); - blocxx::String stdOutput; - blocxx::String errOutput; - int status = -1; + blocxx::String stdOutput; + blocxx::String errOutput; + int status = -1; - try - { - status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, - errOutput, env); - } - catch(blocxx::Exception& e) - { - LOGIT_ERROR( "openssl exception:" << e); - } - if(status != 0) - { - LOGIT_ERROR("openssl status:" << blocxx::String(status)); - LOGIT_ERROR("openssl stderr:" << errOutput); - LOGIT_DEBUG("openssl stdout:" << stdOutput); - BLOCXX_THROW(limal::RuntimeException, - Format(__("Command returned '%1' : %2"), - status, errOutput).c_str()); - } + try + { + status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, + errOutput, env); + } + catch(blocxx::Exception& e) + { + LOGIT_ERROR( "openssl exception:" << e); + BLOCXX_THROW_SUBEX(limal::RuntimeException, + __("Executing openssl command failed."), e); + } + if(status != 0) + { + LOGIT_ERROR("openssl status:" << blocxx::String(status)); + LOGIT_ERROR("openssl stderr:" << errOutput); + LOGIT_DEBUG("openssl stdout:" << stdOutput); - if(!errOutput.empty()) - { - LOGIT_DEBUG("openssl stderr:" << errOutput); - } - if(!stdOutput.empty()) - { - LOGIT_DEBUG("openssl stdout:" << stdOutput); - } + StringArray sa = errOutput.tokenize("\n\r"); + String msg = (sa.empty()? "" : sa[0]); + BLOCXX_THROW(limal::RuntimeException, + Format(__("openssl command failed: %1"), msg).c_str()); } -void OpenSSLUtils::createRequest(const DNObject &dn, - const String &outFile, - const String &keyFile, - const String &password, - const String &extension, - FormatType outForm, - const String &challengePassword, - const String &unstructuredName) + if(!errOutput.empty()) + { + LOGIT_DEBUG("openssl stderr:" << errOutput); + } + if(!stdOutput.empty()) + { + LOGIT_DEBUG("openssl stdout:" << stdOutput); + } +} + +void +OpenSSLUtils::createRequest(const DNObject &dn, + const String &outFile, + const String &keyFile, + const String &password, + const String &extension, + FormatType outForm, + const String &challengePassword, + const String &unstructuredName) { blocxx::String debugCmd; @@ -168,7 +173,7 @@ { LOGIT_ERROR("No valid keyfile specified"); BLOCXX_THROW(limal::ValueException, - __("No valid key file specified.")); + __("No valid key file specified.")); } debugCmd += "-config "; @@ -225,20 +230,25 @@ try { status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, - errOutput, env, - -1, -1, stdInput); + errOutput, env, + -1, -1, stdInput); } catch(blocxx::Exception& e) { LOGIT_ERROR( "openssl exception:" << e); + BLOCXX_THROW_SUBEX(limal::RuntimeException, + __("Executing openssl command failed."), e); } if(status != 0) { LOGIT_ERROR("openssl status:" << blocxx::String(status)); LOGIT_ERROR("openssl stderr:" << errOutput); LOGIT_DEBUG("openssl stdout:" << stdOutput); + + StringArray sa = errOutput.tokenize("\n\r"); + String msg = (sa.empty()? "" : sa[0]); BLOCXX_THROW(limal::RuntimeException, - Format(__("Command returned '%1' : %2"), status, errOutput).c_str()); + Format(__("openssl command failed: %1"), msg).c_str()); } if(!errOutput.empty()) @@ -253,19 +263,19 @@ void OpenSSLUtils::createSelfSignedCertificate(const String &outFile, - const String &keyFile, - const String &requestFile, - const String &password, - const String &extension, - UInt32 days, - bool noEmailDN) + const String &keyFile, + const String &requestFile, + const String &password, + const String &extension, + UInt32 days, + bool noEmailDN) { path::PathInfo pi(keyFile); if(!pi.exists() || !pi.isFile()) { LOGIT_ERROR("No valid keyfile specified"); BLOCXX_THROW(limal::ValueException, - __("No valid key file specified.")); + __("No valid key file specified.")); } pi.stat(requestFile); @@ -273,7 +283,7 @@ { LOGIT_ERROR("No valid request file specified"); BLOCXX_THROW(limal::ValueException, - __("No valid request file specified.")); + __("No valid request file specified.")); } blocxx::String debugCmd; @@ -319,19 +329,24 @@ try { status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, - errOutput, env); + errOutput, env); } catch(blocxx::Exception& e) { LOGIT_ERROR( "openssl exception:" << e); + BLOCXX_THROW_SUBEX(limal::RuntimeException, + __("Executing openssl command failed."), e); } if(status != 0) { LOGIT_ERROR("openssl status:" << blocxx::String(status)); LOGIT_ERROR("openssl stderr:" << errOutput); LOGIT_DEBUG("openssl stdout:" << stdOutput); + + StringArray sa = errOutput.tokenize("\n\r"); + String msg = (sa.empty()? "" : sa[0]); BLOCXX_THROW(limal::RuntimeException, - Format(__("Command returned '%1' : %2"), status, errOutput).c_str()); + Format(__("openssl command failed: %1"), msg).c_str()); } if(!errOutput.empty()) @@ -346,24 +361,24 @@ void OpenSSLUtils::signRequest(const String &requestFile, - const String &outFile, - const String &caKeyFile, - const String &caPassword, - const String &extension, - const String &startDate, - const String &endDate, - const String &caSection, - const String &outDir, - bool noEmailDN, - bool noUniqueDN, - bool noText) + const String &outFile, + const String &caKeyFile, + const String &caPassword, + const String &extension, + const String &startDate, + const String &endDate, + const String &caSection, + const String &outDir, + bool noEmailDN, + bool noUniqueDN, + bool noText) { path::PathInfo pi(caKeyFile); if(!pi.exists() || !pi.isFile()) { LOGIT_ERROR("No valid keyfile specified"); BLOCXX_THROW(limal::ValueException, - __("No valid key file specified.")); + __("No valid key file specified.")); } pi.stat(requestFile); @@ -371,7 +386,7 @@ { LOGIT_ERROR("No valid request file specified"); BLOCXX_THROW(limal::ValueException, - __("No valid request file specified.")); + __("No valid request file specified.")); } blocxx::String debugCmd; @@ -438,19 +453,24 @@ try { status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, - errOutput, env); + errOutput, env); } catch(blocxx::Exception& e) { LOGIT_ERROR( "openssl exception:" << e); + BLOCXX_THROW_SUBEX(limal::RuntimeException, + __("Executing openssl command failed."), e); } if(status != 0) { LOGIT_ERROR("openssl status:" << blocxx::String(status)); LOGIT_ERROR("openssl stderr:" << errOutput); LOGIT_DEBUG("openssl stdout:" << stdOutput); + + StringArray sa = errOutput.tokenize("\n\r"); + String msg = (sa.empty()? "" : sa[0]); BLOCXX_THROW(limal::RuntimeException, - Format(__("Command returned '%1' : %2"), status, errOutput).c_str()); + Format(__("openssl command failed: %1"), msg).c_str()); } if(!errOutput.empty()) @@ -465,18 +485,18 @@ void OpenSSLUtils::revokeCertificate(const blocxx::String &caCertFile, - const blocxx::String &caKeyFile, - const blocxx::String &caPassword, - const blocxx::String &certFile, - const CRLReason &reason, - bool noUniqueDN) + const blocxx::String &caKeyFile, + const blocxx::String &caPassword, + const blocxx::String &certFile, + const CRLReason &reason, + bool noUniqueDN) { path::PathInfo pi(caKeyFile); if(!pi.exists() || !pi.isFile()) { LOGIT_ERROR("No valid keyfile specified"); BLOCXX_THROW(limal::ValueException, - __("No valid key file specified.")); + __("No valid key file specified.")); } pi.stat(caCertFile); @@ -484,7 +504,7 @@ { LOGIT_ERROR("No valid CA certificate file specified"); BLOCXX_THROW(limal::ValueException, - __("No valid CA certificate file specified.")); + __("No valid CA certificate file specified.")); } pi.stat(certFile); @@ -492,7 +512,7 @@ { LOGIT_ERROR("No valid certificate file specified"); BLOCXX_THROW(limal::ValueException, - __("No valid certificate file specified.")); + __("No valid certificate file specified.")); } blocxx::String debugCmd; @@ -571,19 +591,24 @@ try { status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, - errOutput, env); + errOutput, env); } catch(blocxx::Exception& e) { LOGIT_ERROR( "openssl exception:" << e); + BLOCXX_THROW_SUBEX(limal::RuntimeException, + __("Executing openssl command failed."), e); } if(status != 0) { LOGIT_ERROR("openssl status:" << blocxx::String(status)); LOGIT_ERROR("openssl stderr:" << errOutput); LOGIT_DEBUG("openssl stdout:" << stdOutput); + + StringArray sa = errOutput.tokenize("\n\r"); + String msg = (sa.empty()? "" : sa[0]); BLOCXX_THROW(limal::RuntimeException, - Format(__("Command returned '%1' : %2"), status, errOutput).c_str()); + Format(__("openssl command failed: %1"), msg).c_str()); } if(!errOutput.empty()) @@ -598,19 +623,19 @@ void OpenSSLUtils::issueCRL(const blocxx::String &caCertFile, - const blocxx::String &caKeyFile, - const blocxx::String &caPassword, - blocxx::UInt32 hours, - const blocxx::String &outfile, - const blocxx::String &extension, - bool noUniqueDN) + const blocxx::String &caKeyFile, + const blocxx::String &caPassword, + blocxx::UInt32 hours, + const blocxx::String &outfile, + const blocxx::String &extension, + bool noUniqueDN) { path::PathInfo pi(caKeyFile); if(!pi.exists() || !pi.isFile()) { LOGIT_ERROR("No valid keyfile specified"); BLOCXX_THROW(limal::ValueException, - __("No valid key file specified.")); + __("No valid key file specified.")); } pi.stat(caCertFile); @@ -618,7 +643,7 @@ { LOGIT_ERROR("No valid CA certificate file specified"); BLOCXX_THROW(limal::ValueException, - __("No valid CA certificate file specified.")); + __("No valid CA certificate file specified.")); } blocxx::String debugCmd; @@ -666,19 +691,24 @@ try { status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, - errOutput, env); + errOutput, env); } catch(blocxx::Exception& e) { LOGIT_ERROR( "openssl exception:" << e); + BLOCXX_THROW_SUBEX(limal::RuntimeException, + __("Executing openssl command failed."), e); } if(status != 0) { LOGIT_ERROR("openssl status:" << blocxx::String(status)); LOGIT_ERROR("openssl stderr:" << errOutput); LOGIT_DEBUG("openssl stdout:" << stdOutput); + + StringArray sa = errOutput.tokenize("\n\r"); + String msg = (sa.empty()? "" : sa[0]); BLOCXX_THROW(limal::RuntimeException, - Format(__("Command returned '%1' : %2"), status, errOutput).c_str()); + Format(__("openssl command failed: %1"), msg).c_str()); } if(!errOutput.empty()) @@ -693,15 +723,15 @@ void OpenSSLUtils::updateDB(const blocxx::String &caCertFile, - const blocxx::String &caKeyFile, - const blocxx::String &caPassword) + const blocxx::String &caKeyFile, + const blocxx::String &caPassword) { path::PathInfo pi(caKeyFile); if(!pi.exists() || !pi.isFile()) { LOGIT_ERROR("No valid keyfile specified"); BLOCXX_THROW(limal::ValueException, - __("No valid key file specified.")); + __("No valid key file specified.")); } pi.stat(caCertFile); @@ -709,7 +739,7 @@ { LOGIT_ERROR("No valid CA certificate file specified"); BLOCXX_THROW(limal::ValueException, - __("No valid CA certificate file specified.")); + __("No valid CA certificate file specified.")); } blocxx::String debugCmd; @@ -743,11 +773,13 @@ try { status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, - errOutput, env); + errOutput, env); } catch(blocxx::Exception& e) { LOGIT_ERROR( "openssl exception:" << e); + BLOCXX_THROW_SUBEX(limal::RuntimeException, + __("Executing openssl command failed."), e); } PerlRegEx r("error"); @@ -757,8 +789,11 @@ LOGIT_ERROR("openssl status:" << blocxx::String(status)); LOGIT_ERROR("openssl stderr:" << errOutput); LOGIT_DEBUG("openssl stdout:" << stdOutput); + + StringArray sa = errOutput.tokenize("\n\r"); + String msg = (sa.empty()? "" : sa[0]); BLOCXX_THROW(limal::RuntimeException, - Format(__("Command returned '%1' : %2"), status, errOutput).c_str()); + Format(__("openssl command failed: %1"), msg).c_str()); } if(!errOutput.empty()) @@ -773,16 +808,16 @@ blocxx::String OpenSSLUtils::verify(const blocxx::String &certFile, - const blocxx::String &caPath, - bool crlCheck, - const blocxx::String &purpose) + const blocxx::String &caPath, + bool crlCheck, + const blocxx::String &purpose) { path::PathInfo pi(certFile); if(!pi.exists() || !pi.isFile()) { LOGIT_ERROR("No valid certificate file specified"); BLOCXX_THROW(limal::ValueException, - __("No valid certificate file specified.")); + __("No valid certificate file specified.")); } pi.stat(caPath); @@ -790,7 +825,7 @@ { LOGIT_ERROR("No valid CA directory specified"); BLOCXX_THROW(limal::ValueException, - __("No valid CA directory specified.")); + __("No valid CA directory specified.")); } blocxx::String debugCmd; @@ -827,11 +862,13 @@ try { status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, - errOutput, env); + errOutput, env); } catch(blocxx::Exception& e) { LOGIT_ERROR( "openssl exception:" << e); + BLOCXX_THROW_SUBEX(limal::RuntimeException, + __("Executing openssl command failed."), e); } StringArray lines = PerlRegEx("\n").split(stdOutput); @@ -906,11 +943,13 @@ try { status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, - errOutput, env); + errOutput, env); } catch(blocxx::Exception& e) { LOGIT_ERROR( "openssl exception:" << e); + BLOCXX_THROW_SUBEX(limal::RuntimeException, + __("Executing openssl command failed."), e); } StringArray lines = PerlRegEx("\n").split(errOutput); @@ -934,21 +973,21 @@ } } LOGIT_ERROR(Format("Show certificate status with serial '%1' failed.(%2)", - serial, status).toString()); + serial, status).toString()); if(!errOutput.empty()) { LOGIT_ERROR("openssl stderr:" << errOutput); } BLOCXX_THROW(limal::RuntimeException, - Format(__("Showing certificate status with serial %1 failed (%2)."), - serial, status).c_str()); + Format(__("Showing certificate status with serial %1 failed (%2)."), + serial, status).c_str()); } bool OpenSSLUtils::checkKey(const blocxx::String &caName, - const blocxx::String &password, - const blocxx::String &certificateName, - const blocxx::String &repository) + const blocxx::String &password, + const blocxx::String &certificateName, + const blocxx::String &repository) { String keyFile; @@ -965,7 +1004,7 @@ { LOGIT_ERROR("Can not parse certificate name"); BLOCXX_THROW(limal::RuntimeException, - __("Cannot parse the certificate name.")); + __("Cannot parse the certificate name.")); } keyFile = repository + "/" + caName + "/keys/" + sa[1] + ".key"; @@ -976,7 +1015,7 @@ { LOGIT_ERROR("Keyfile does not exist"); BLOCXX_THROW(limal::SystemException, - __("The key file does not exist.")); + __("The key file does not exist.")); } blocxx::String debugCmd; @@ -1003,11 +1042,13 @@ try { status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, - errOutput, env); + errOutput, env); } catch(blocxx::Exception& e) { LOGIT_ERROR( "openssl exception:" << e); + BLOCXX_THROW_SUBEX(limal::RuntimeException, + __("Executing openssl command failed."), e); } if(status == 0) { @@ -1026,18 +1067,19 @@ limal::ByteBuffer OpenSSLUtils::x509Convert(const ByteBuffer &certificate, - FormatType inform, - FormatType outform ) + FormatType inform, + FormatType outform ) { // FIXME: use tmp file blocxx::String inFileName(::tempnam("/tmp/", "x509I")); blocxx::String outFileName(::tempnam("/tmp/", "x509O")); LocalManagement::writeFile(certificate, inFileName, - false, 0600); + false, 0600); blocxx::String debugCmd; - + bool foundError = false; + debugCmd += limal::ca_mgm::OPENSSL_COMMAND + " "; debugCmd += "x509 "; debugCmd += "-nameopt "; @@ -1084,41 +1126,57 @@ try { status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, - errOutput, env); + errOutput, env); } catch(blocxx::Exception& e) { LOGIT_ERROR( "openssl exception:" << e); + path::removeFile(inFileName); + path::removeFile(outFileName); + BLOCXX_THROW_SUBEX(limal::RuntimeException, + __("Executing openssl command failed."), e); } if(status != 0) { LOGIT_INFO( "openssl status:" << blocxx::String(status)); + foundError = true; } if(!errOutput.empty()) { LOGIT_ERROR("openssl stderr:" << errOutput); + foundError = true; } if(!stdOutput.empty()) { LOGIT_DEBUG("openssl stdout:" << stdOutput); } - + + if(foundError) + { + path::removeFile(inFileName); + path::removeFile(outFileName); + + StringArray sa = errOutput.tokenize("\n\r"); + String msg = (sa.empty()? "" : sa[0]); + BLOCXX_THROW(limal::RuntimeException, + Format(__("openssl command failed: %1"), msg).c_str()); + } + ByteBuffer out = LocalManagement::readFile(outFileName); path::removeFile(inFileName); path::removeFile(outFileName); - + return out; } - limal::ByteBuffer OpenSSLUtils::rsaConvert(const ByteBuffer &key, - FormatType inform, - FormatType outform, - const String &inPassword, - const String &outPassword, - const String &algorithm) + FormatType inform, + FormatType outform, + const String &inPassword, + const String &outPassword, + const String &algorithm) { // FIXME: use tmp file blocxx::String inFileName(::tempnam("/tmp/", "keyIn")); @@ -1126,9 +1184,10 @@ bool isInPassSet = false; bool isOutPassSet = false; - + bool foundError = false; + LocalManagement::writeFile(key, inFileName, - false, 0600); + false, 0600); blocxx::String debugCmd; @@ -1201,15 +1260,20 @@ try { status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, - errOutput, env); + errOutput, env); } catch(blocxx::Exception& e) { LOGIT_ERROR( "openssl exception:" << e); + path::removeFile(inFileName); + path::removeFile(outFileName); + BLOCXX_THROW_SUBEX(limal::RuntimeException, + __("Executing openssl command failed."), e); } if(status != 0) { LOGIT_INFO( "openssl status:" << blocxx::String(status)); + foundError = true; } if(!errOutput.empty()) { @@ -1217,6 +1281,7 @@ if(!PerlRegEx("^writing RSA key$").match(errOutput)) { LOGIT_ERROR("openssl stderr:" << errOutput); + foundError = true; } else { @@ -1228,28 +1293,40 @@ LOGIT_DEBUG("openssl stdout:" << stdOutput); } - ByteBuffer out = LocalManagement::readFile(outFileName); + if(foundError) + { + path::removeFile(inFileName); + path::removeFile(outFileName); + + StringArray sa = errOutput.tokenize("\n\r"); + String msg = (sa.empty()? "" : sa[0]); + BLOCXX_THROW(limal::RuntimeException, + Format(__("openssl command failed: %1"),msg).c_str()); + } + ByteBuffer out = LocalManagement::readFile(outFileName); + path::removeFile(inFileName); path::removeFile(outFileName); - + return out; } limal::ByteBuffer OpenSSLUtils::crlConvert(const ByteBuffer &crl, - FormatType inform, - FormatType outform ) + FormatType inform, + FormatType outform ) { // FIXME: use tmp file blocxx::String inFileName(::tempnam("/tmp/", "crlIn")); blocxx::String outFileName(::tempnam("/tmp/", "crlOt")); LocalManagement::writeFile(crl, inFileName, - false, 0600); + false, 0600); blocxx::String debugCmd; - + bool foundError = false; + debugCmd += limal::ca_mgm::OPENSSL_COMMAND + " "; debugCmd += "crl "; debugCmd += "-in "; @@ -1294,47 +1371,65 @@ try { status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, - errOutput, env); + errOutput, env); } catch(blocxx::Exception& e) { LOGIT_ERROR( "openssl exception:" << e); + path::removeFile(inFileName); + path::removeFile(outFileName); + BLOCXX_THROW_SUBEX(limal::RuntimeException, + __("Executing openssl command failed."), e); } if(status != 0) { LOGIT_INFO( "openssl status:" << blocxx::String(status)); + foundError = true; } if(!errOutput.empty()) { LOGIT_ERROR("openssl stderr:" << errOutput); + foundError = true; } if(!stdOutput.empty()) { LOGIT_DEBUG("openssl stdout:" << stdOutput); } + if(foundError) + { + path::removeFile(inFileName); + path::removeFile(outFileName); + + StringArray sa = errOutput.tokenize("\n\r"); + String msg = (sa.empty()? "" : sa[0]); + BLOCXX_THROW(limal::RuntimeException, + Format(__("openssl command failed: %1"), msg).c_str()); + } + ByteBuffer out = LocalManagement::readFile(outFileName); path::removeFile(inFileName); path::removeFile(outFileName); - + return out; } limal::ByteBuffer OpenSSLUtils::reqConvert(const ByteBuffer &req, - FormatType inform, - FormatType outform ) + FormatType inform, + FormatType outform ) { // FIXME: use tmp file blocxx::String inFileName(::tempnam("/tmp/", "reqIn")); blocxx::String outFileName(::tempnam("/tmp/", "reqOt")); LocalManagement::writeFile(req, inFileName, - false, 0600); + false, 0600); blocxx::String debugCmd; - + bool foundError = false; + debugCmd += limal::ca_mgm::OPENSSL_COMMAND + " "; debugCmd += "req "; debugCmd += "-in "; @@ -1379,41 +1474,58 @@ try { status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, - errOutput, env); + errOutput, env); } catch(blocxx::Exception& e) { LOGIT_ERROR( "openssl exception:" << e); + path::removeFile(inFileName); + path::removeFile(outFileName); + BLOCXX_THROW_SUBEX(limal::RuntimeException, + __("Executing openssl command failed."), e); } if(status != 0) { LOGIT_INFO( "openssl status:" << blocxx::String(status)); + foundError = true; } if(!errOutput.empty()) { LOGIT_ERROR("openssl stderr:" << errOutput); + foundError = true; } if(!stdOutput.empty()) { LOGIT_DEBUG("openssl stdout:" << stdOutput); } + if(foundError) + { + path::removeFile(inFileName); + path::removeFile(outFileName); + + StringArray sa = errOutput.tokenize("\n\r"); + String msg = (sa.empty()? "" : sa[0]); + BLOCXX_THROW(limal::RuntimeException, + Format(__("openssl command failed: %1"), msg).c_str()); + } + ByteBuffer out = LocalManagement::readFile(outFileName); path::removeFile(inFileName); path::removeFile(outFileName); - + return out; } limal::ByteBuffer OpenSSLUtils::createPKCS12(const ByteBuffer &certificate, - const ByteBuffer &key, - const String &inPassword, - const String &outPassword, - const ByteBuffer &caCert, - const String &caPath, - bool withChain ) + const ByteBuffer &key, + const String &inPassword, + const String &outPassword, + const ByteBuffer &caCert, + const String &caPath, + bool withChain ) { // FIXME: use tmp file blocxx::String inFileName1(::tempnam("/tmp/", "crtIn")); @@ -1423,15 +1535,16 @@ bool isInPassSet = false; bool isOutPassSet = false; - + bool foundError = false; + LocalManagement::writeFile(certificate, inFileName1, - false, 0600); + false, 0600); LocalManagement::writeFile(key, inFileName2, - false, 0600); + false, 0600); if(!caCert.empty()) { LocalManagement::writeFile(caCert, inFileName3, - false, 0600); + false, 0600); } blocxx::String debugCmd; @@ -1471,7 +1584,7 @@ { LOGIT_ERROR("Out password is required"); BLOCXX_THROW(limal::ValueException, - __("The password for encrypting the output is required.")); + __("The password for encrypting the output is required.")); } debugCmd += "-inkey "; @@ -1508,25 +1621,52 @@ try { status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, - errOutput, env); + errOutput, env); } catch(blocxx::Exception& e) { LOGIT_ERROR( "openssl exception:" << e); + path::removeFile(inFileName1); + path::removeFile(inFileName2); + if(!caCert.empty()) + { + path::removeFile(inFileName3); + } + path::removeFile(outFileName); + BLOCXX_THROW_SUBEX(limal::RuntimeException, + __("Executing openssl command failed."), e); } if(status != 0) { LOGIT_INFO( "openssl status:" << blocxx::String(status)); + foundError = true; } if(!errOutput.empty()) { LOGIT_ERROR("openssl stderr:" << errOutput); + foundError = true; } if(!stdOutput.empty()) { LOGIT_DEBUG("openssl stdout:" << stdOutput); } + if(foundError) + { + path::removeFile(inFileName1); + path::removeFile(inFileName2); + if(!caCert.empty()) + { + path::removeFile(inFileName3); + } + path::removeFile(outFileName); + + StringArray sa = errOutput.tokenize("\n\r"); + String msg = (sa.empty()? "" : sa[0]); + BLOCXX_THROW(limal::RuntimeException, + Format(__("openssl command failed: %1"), msg).c_str()); + } + ByteBuffer out = LocalManagement::readFile(outFileName); path::removeFile(inFileName1); @@ -1542,9 +1682,9 @@ limal::ByteBuffer OpenSSLUtils::pkcs12ToPEM(const ByteBuffer &pkcs12, - const String &inPassword, - const String &outPassword, - const String &algorithm) + const String &inPassword, + const String &outPassword, + const String &algorithm) { // FIXME: use tmp file blocxx::String inFileName(::tempnam("/tmp/", "p12In")); @@ -1552,9 +1692,10 @@ bool isInPassSet = false; bool isOutPassSet = false; - + bool foundError = false; + LocalManagement::writeFile(pkcs12, inFileName, - false, 0600); + false, 0600); blocxx::String debugCmd; @@ -1565,7 +1706,7 @@ debugCmd += "-out "; debugCmd += outFileName + " "; - // -nokeys? + // -nokeys? if(!inPassword.empty()) { @@ -1576,7 +1717,7 @@ { LOGIT_ERROR("PKCS12 password is required"); BLOCXX_THROW(limal::ValueException, - __("The PKCS12 password is required.")); + __("The PKCS12 password is required.")); } if(!outPassword.empty()) @@ -1614,15 +1755,20 @@ try { status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, - errOutput, env); + errOutput, env); } catch(blocxx::Exception& e) { LOGIT_ERROR( "openssl exception:" << e); + path::removeFile(inFileName); + path::removeFile(outFileName); + BLOCXX_THROW_SUBEX(limal::RuntimeException, + __("Executing openssl command failed."), e); } if(status != 0) { LOGIT_INFO( "openssl status:" << blocxx::String(status)); + foundError = true; } if(!errOutput.empty()) { @@ -1630,6 +1776,7 @@ if(!PerlRegEx("^MAC verified OK$").match(errOutput)) { LOGIT_ERROR("openssl stderr:" << errOutput); + foundError = true; } else { @@ -1641,11 +1788,22 @@ LOGIT_DEBUG("openssl stdout:" << stdOutput); } + if(foundError) + { + path::removeFile(inFileName); + path::removeFile(outFileName); + + StringArray sa = errOutput.tokenize("\n\r"); + String msg = (sa.empty()? "" : sa[0]); + BLOCXX_THROW(limal::RuntimeException, + Format(__("openssl command failed: %1"), msg).c_str()); + } + ByteBuffer out = LocalManagement::readFile(outFileName); path::removeFile(inFileName); path::removeFile(outFileName); - + return out; } @@ -1660,10 +1818,10 @@ if(r != 0) { LOGIT_ERROR("Cannot read directory: " << repository << - "(" << System::errorMsg(r) << ") [" << r << "]"); + "(" << System::errorMsg(r) << ") [" << r << "]"); BLOCXX_THROW(limal::SystemException, - Format(__("Cannot read directory: %1 (%2) [%3]."), - repository, System::errorMsg(r), r).c_str()); + Format(__("Cannot read directory: %1 (%2) [%3]."), + repository, System::errorMsg(r), r).c_str()); } tmpList.sort(); @@ -1712,16 +1870,16 @@ { LOGIT_ERROR("No serial number found in " << serialFile); BLOCXX_THROW(limal::RuntimeException, - Format(__("No serial number found in %1."), - serialFile).c_str()); + Format(__("No serial number found in %1."), + serialFile).c_str()); } } void OpenSSLUtils::addCAM(const String &caName, - const String &md5, - const String &dnString, - const String &repository) + const String &md5, + const String &dnString, + const String &repository) { Array<Array<String> > db = OpenSSLUtils::parseCAMDB(caName, repository); Array<Array<String> >::const_iterator it; @@ -1732,7 +1890,7 @@ { LOGIT_ERROR("Request already exist."); BLOCXX_THROW(limal::RuntimeException, - __("The request already exists.")); + __("The request already exists.")); } } @@ -1742,14 +1900,14 @@ cam += md5 + " " + dnString + "\n"; LocalManagement::writeFile(ByteBuffer(cam.c_str(), cam.length()), - repository + "/" + caName + "/cam.txt"); + repository + "/" + caName + "/cam.txt"); } void OpenSSLUtils::delCAM(const String &caName, - const String &md5, - const String &repository) + const String &md5, + const String &repository) { ByteBuffer b = LocalManagement::readFile(repository + "/" + caName + "/cam.txt"); @@ -1770,13 +1928,13 @@ } } LocalManagement::writeFile(ByteBuffer(camNew.c_str(), camNew.length()), - repository + "/" + caName + "/cam.txt"); + repository + "/" + caName + "/cam.txt"); } blocxx::Array<blocxx::Array<blocxx::String> > OpenSSLUtils::parseCAMDB(const String &caName, - const String &repository) + const String &repository) { Array<Array<String> > ret; @@ -1810,7 +1968,7 @@ blocxx::Array<blocxx::Array<blocxx::String> > OpenSSLUtils::parseIndexTXT(const String &caName, - const String &repository) + const String &repository) { Array<Array<String> > ret; @@ -1848,7 +2006,7 @@ blocxx::Array<blocxx::Map<blocxx::String, blocxx::String> > OpenSSLUtils::listRequests(const String &caName, - const String &repository) + const String &repository) { Array<Map<String, String> > ret; List<String> tmpList; @@ -1860,10 +2018,10 @@ if(r != 0) { LOGIT_ERROR("Cannot read directory: " << reqDir << - "(" << System::errorMsg(r) << ") [" << r << "]"); + "(" << System::errorMsg(r) << ") [" << r << "]"); BLOCXX_THROW(limal::SystemException, - Format(__("Cannot read directory: %1 (%2) [%3]."), - reqDir, System::errorMsg(r), r).c_str()); + Format(__("Cannot read directory: %1 (%2) [%3]."), + reqDir, System::errorMsg(r), r).c_str()); } tmpList.sort(); @@ -1923,7 +2081,7 @@ { LOGIT_ERROR("Can not find request subject."); BLOCXX_THROW(limal::RuntimeException, - __("Cannot find the request subject.")); + __("Cannot find the request subject.")); } sa.clear(); @@ -2000,7 +2158,7 @@ blocxx::Array<blocxx::Map<blocxx::String, blocxx::String> > OpenSSLUtils::listCertificates(const String &caName, - const String &repository) + const String &repository) { Array<Map<String, String> > ret; List<String> tmpList; @@ -2012,10 +2170,10 @@ if(r != 0) { LOGIT_ERROR("Cannot read directory: " << certDir << - "(" << System::errorMsg(r) << ") [" << r << "]"); + "(" << System::errorMsg(r) << ") [" << r << "]"); BLOCXX_THROW(limal::SystemException, - Format(__("Cannot read directory: %1 (%2) [%3]."), - certDir, System::errorMsg(r), r).c_str()); + Format(__("Cannot read directory: %1 (%2) [%3]."), + certDir, System::errorMsg(r), r).c_str()); } tmpList.sort(); @@ -2084,7 +2242,7 @@ { LOGIT_ERROR("Can not find certificate subject."); BLOCXX_THROW(limal::RuntimeException, - __("Cannot find the certificate subject.")); + __("Cannot find the certificate subject.")); } sa.clear(); @@ -2177,13 +2335,13 @@ void OpenSSLUtils::createCaInfrastructure(const String &caName, - const String &repository) + const String &repository) { if(caName.empty() || !PerlRegEx("\\w+").match(caName)) { LOGIT_ERROR("Invalid caName: " << caName); BLOCXX_THROW(limal::ValueException, - Format(__("Invalid caName: %1."), caName).c_str()); + Format(__("Invalid caName: %1."), caName).c_str()); } path::PathInfo pi(repository); @@ -2192,8 +2350,8 @@ { LOGIT_ERROR(repository << " does not exist"); BLOCXX_THROW_ERR(limal::SystemException, - Format(__("'%1' does not exist."), repository).c_str(), - E_FILE_NOT_FOUND); + Format(__("'%1' does not exist."), repository).c_str(), + E_FILE_NOT_FOUND); } pi.stat(repository + "/" + caName); @@ -2202,8 +2360,8 @@ { LOGIT_ERROR(pi.toString() << " still exist"); BLOCXX_THROW_ERR(limal::SystemException, - Format(__("%1 still exists."), pi.toString()).c_str(), - E_FILE_EXISTS); + Format(__("%1 still exists."), pi.toString()).c_str(), + E_FILE_EXISTS); } int r = path::createDir(pi.toString(), 0700); @@ -2211,10 +2369,10 @@ if( r != 0 ) { LOGIT_ERROR(Format("Can not create directory: %1 (%2 [%3])", - pi.toString(), System::errorMsg(r), r)); + pi.toString(), System::errorMsg(r), r)); BLOCXX_THROW(limal::SystemException, - Format(__("Cannot create directory: %1 (%2 [%3])."), - pi.toString(), System::errorMsg(r), r).c_str()); + Format(__("Cannot create directory: %1 (%2 [%3])."), + pi.toString(), System::errorMsg(r), r).c_str()); } ByteBuffer tmpl; @@ -2241,14 +2399,14 @@ } LocalManagement::writeFile(ByteBuffer(newConf.c_str(), newConf.length()), - pi.toString() + "/openssl.cnf.tmpl"); + pi.toString() + "/openssl.cnf.tmpl"); } catch(blocxx::Exception &e) { path::removeDirRecursive(repository + "/" + caName); BLOCXX_THROW_SUBEX(limal::SystemException, - __("Cannot copy the configuration template."), e); + __("Cannot copy the configuration template."), e); } String dir = pi.toString() + "/certs"; @@ -2259,10 +2417,10 @@ path::removeDirRecursive(repository + "/" + caName); LOGIT_ERROR(Format("Can not create directory: %1 (%2 [%3])", - dir, System::errorMsg(r), r)); + dir, System::errorMsg(r), r)); BLOCXX_THROW(limal::SystemException, - Format(__("Cannot create directory: %1 (%2 [%3])."), - dir, System::errorMsg(r), r).c_str()); + Format(__("Cannot create directory: %1 (%2 [%3])."), + dir, System::errorMsg(r), r).c_str()); } dir = pi.toString() + "/crl"; @@ -2273,10 +2431,10 @@ path::removeDirRecursive(repository + "/" + caName); LOGIT_ERROR(Format("Can not create directory: %1 (%2 [%3])", - dir, System::errorMsg(r), r)); + dir, System::errorMsg(r), r)); BLOCXX_THROW(limal::SystemException, - Format(__("Cannot create directory: %1 (%2 [%3])."), - dir, System::errorMsg(r), r).c_str()); + Format(__("Cannot create directory: %1 (%2 [%3])."), + dir, System::errorMsg(r), r).c_str()); } dir = pi.toString() + "/newcerts"; @@ -2287,10 +2445,10 @@ path::removeDirRecursive(repository + "/" + caName); LOGIT_ERROR(Format("Can not create directory: %1 (%2 [%3])", - dir, System::errorMsg(r), r)); + dir, System::errorMsg(r), r)); BLOCXX_THROW(limal::SystemException, - Format(__("Cannot create directory: %1 (%2 [%3])."), - dir, System::errorMsg(r), r).c_str()); + Format(__("Cannot create directory: %1 (%2 [%3])."), + dir, System::errorMsg(r), r).c_str()); } dir = pi.toString() + "/req"; @@ -2301,10 +2459,10 @@ path::removeDirRecursive(repository + "/" + caName); LOGIT_ERROR(Format("Can not create directory: %1 (%2 [%3])", - dir, System::errorMsg(r), r)); + dir, System::errorMsg(r), r)); BLOCXX_THROW(limal::SystemException, - Format(__("Cannot create directory: %1 (%2 [%3])."), - dir, System::errorMsg(r), r).c_str()); + Format(__("Cannot create directory: %1 (%2 [%3])."), + dir, System::errorMsg(r), r).c_str()); } dir = pi.toString() + "/keys"; @@ -2315,27 +2473,27 @@ path::removeDirRecursive(repository + "/" + caName); LOGIT_ERROR(Format("Can not create directory: %1 (%2 [%3])", - dir, System::errorMsg(r), r)); + dir, System::errorMsg(r), r)); BLOCXX_THROW(limal::SystemException, - Format(__("Cannot create directory: %1 (%2 [%3])."), - dir, System::errorMsg(r), r).c_str()); + Format(__("Cannot create directory: %1 (%2 [%3])."), + dir, System::errorMsg(r), r).c_str()); } try { LocalManagement::writeFile(ByteBuffer("01"), - pi.toString() + "/serial"); + pi.toString() + "/serial"); LocalManagement::writeFile(ByteBuffer(), - pi.toString() + "/index.txt"); + pi.toString() + "/index.txt"); LocalManagement::writeFile(ByteBuffer(), - pi.toString() + "/cam.txt"); + pi.toString() + "/cam.txt"); } catch(blocxx::Exception &e) { path::removeDirRecursive(repository + "/" + caName); BLOCXX_THROW_SUBEX(limal::SystemException, - __("Cannot create the file."), e); + __("Cannot create the file."), e); } } Modified: limal-head/limal-ca-mgm/src/Utils.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/Utils.cpp… ============================================================================== --- limal-head/limal-ca-mgm/src/Utils.cpp (original) +++ limal-head/limal-ca-mgm/src/Utils.cpp Fri Oct 12 17:53:17 2007 @@ -149,85 +149,6 @@ return exitStatus; } -// LiteralValue -// gn2lv(GENERAL_NAME *gen) -// { -// char oline[256]; -// char *s = NULL; -// unsigned char *p = NULL; -// LiteralValue lv; - -// switch (gen->type) -// { -// case GEN_EMAIL: -// s = new char[gen->d.ia5->length +1]; -// memcpy(s, gen->d.ia5->data, gen->d.ia5->length); -// s[gen->d.ia5->length] = '\0'; -// lv.setLiteral("email", s); -// delete [] s; -// break; - -// case GEN_DNS: -// s = new char[gen->d.ia5->length +1]; -// memcpy(s, gen->d.ia5->data, gen->d.ia5->length); -// s[gen->d.ia5->length] = '\0'; -// lv.setLiteral("DNS", s); -// delete [] s; -// break; - -// case GEN_URI: -// s = new char[gen->d.ia5->length +1]; -// memcpy(s, gen->d.ia5->data, gen->d.ia5->length); -// s[gen->d.ia5->length] = '\0'; -// lv.setLiteral("URI", s); -// delete [] s; -// break; - -// case GEN_DIRNAME: -// X509_NAME_oneline(gen->d.dirn, oline, 256); -// lv.setLiteral("DirName", oline); -// break; - -// case GEN_IPADD: -// p = gen->d.ip->data; -// /* BUG: doesn't support IPV6 */ -// if(gen->d.ip->length != 4) { -// LOGIT_ERROR("Invalid IP Address: maybe IPv6"); -// BLOCXX_THROW(limal::SyntaxException, "Invalid IP Address: maybe IPv6"); -// break; -// } -// BIO_snprintf(oline, sizeof oline, -// "%d.%d.%d.%d", p[0], p[1], p[2], p[3]); -// lv.setLiteral("IP", oline); -// break; -// case GEN_RID: -// i2t_ASN1_OBJECT(oline, 256, gen->d.rid); -// lv.setLiteral("RID", oline); -// break; -// case GEN_OTHERNAME: -// // krb5PrincipalName || Microsoft Universal Principal Name -// if(OBJ_obj2nid(gen->d.otherName->type_id) == NID_ms_upn) -// { -// lv.setLiteral("othername", -// (char*)ASN1_STRING_data(gen->d.otherName->value->value.sequence)); -// } -// else -// { -// lv.setLiteral("othername", -// String("unsupported(") + String(OBJ_obj2nid(gen->d.otherName->type_id)) + ")"); -// } -// break; -// case GEN_X400: -// lv.setLiteral("X400Name", "unsupported"); -// break; -// case GEN_EDIPARTY: -// lv.setLiteral("EdiPartyName", "unsupported"); -// break; -// } -// return lv; -// } - - // ------------------------------------------------------------------- } // End of CA_MGM_NAMESPACE } // End of LIMAL_NAMESPACE Modified: limal-head/limal-ca-mgm/src/Utils.hpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/Utils.hpp… ============================================================================== --- limal-head/limal-ca-mgm/src/Utils.hpp (original) +++ limal-head/limal-ca-mgm/src/Utils.hpp Fri Oct 12 17:53:17 2007 @@ -277,8 +277,6 @@ return status; } -LiteralValue gn2lv(GENERAL_NAME *gen); - } } Modified: limal-head/limal-ca-mgm/testsuite/ConvertTest.cc URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/testsuite/Con… ============================================================================== --- limal-head/limal-ca-mgm/testsuite/ConvertTest.cc (original) +++ limal-head/limal-ca-mgm/testsuite/ConvertTest.cc Fri Oct 12 17:53:17 2007 @@ -31,7 +31,8 @@ blocxx::StringArray cat; cat.push_back("FATAL"); - cat.push_back("ERROR"); + // do not log errors because the openssl errors include a pid which changes everytime + //cat.push_back("ERROR"); cat.push_back("INFO"); //cat.push_back("DEBUG"); @@ -185,14 +186,92 @@ //cout << pem.data() << endl; } } - - cout << "DONE" << endl; } catch(Exception& e) { cerr << e << endl; } - + + + cout << "===================== Test rsaConvert Exception =====================" << endl; + + try + { + ByteBuffer pem = LocalManagement::readFile("./TestRepos3/SUSERootCA/cacert.key"); + + ByteBuffer der = LocalManagement::rsaConvert(pem, E_PEM, E_DER, "wrong password", ""); + + if(der.size() > 0) + { + cout << "Got DER Key" << endl; + } + } + catch(Exception& e) + { + cout << "Got expected Exception." << endl; + cerr << "Exception:" << endl << e.getFile() << ": " << e.type() << ": "; + blocxx::String msg = blocxx::String(e.getMessage()); + + cerr << msg.tokenize("\n\r")[0] << endl << "END" << endl; + } + + + cout << "===================== Test pkcs12Convert Exception =====================" << endl; + + ByteBuffer crt = LocalManagement::readFile("./TestRepos3/SUSERootCA/certs/01.pem"); + ByteBuffer key = LocalManagement::readFile("./TestRepos3/SUSERootCA/keys/a64a6c95f2a3dc22975e13691ad8e2bb-1111160526.key"); + ByteBuffer ca = LocalManagement::readFile("./TestRepos3/SUSERootCA/cacert.pem"); + + ByteBuffer p12; + + try + { + p12 = LocalManagement::createPKCS12(crt, key, "wrong password", "tralla", + ca, "./TestRepos3/.cas/", false); + + if(p12.size() > 0) + { + cout << "Got PKCS12 data" << endl; + } + } + catch(Exception &e) + { + cout << "Got expected Exception." << endl; + cerr << "Exception:" << endl << e << endl << "END" << endl; + } + + p12 = LocalManagement::createPKCS12(crt, key, "system", "tralla", + ca, "./TestRepos3/.cas/", false); + + try + { + ByteBuffer pem = LocalManagement::pkcs12ToPEM(p12, "wrong password", "system", "aes256"); + + if(pem.size() > 0) + { + cout << "Got PEM " << endl; + + PerlRegEx p("DEK-Info: AES-256-CBC"); + if(p.match(pem.data())) + { + cout << "correct encryption" << endl; + } + else + { + cout << "!!!WRONG encryption" << endl; + } + + //cout << pem.data() << endl; + } + } + catch(Exception &e) + { + cout << "Got expected Exception." << endl; + cerr << "Exception:" << endl << e << endl << "END" << endl; + } + + cout << "DONE" << endl; + return 0; } Modified: limal-head/limal-ca-mgm/testsuite/perl-CertificateExceptionTest.single URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/testsuite/per… ============================================================================== --- limal-head/limal-ca-mgm/testsuite/perl-CertificateExceptionTest.single (original) +++ limal-head/limal-ca-mgm/testsuite/perl-CertificateExceptionTest.single Fri Oct 12 17:53:17 2007 @@ -85,33 +85,12 @@ print "2:".Data::Dumper->Dump([$@]); print $@->{type}.":".$@->{code}.":".$@->{message}."\n"; - exit 0; + #exit 0; } -print "RETURN Certificate \n"; +#--------------------------------------------------------------------------------- -if( -e "./TestRepos/Test_CA1/newcerts/$c.pem") -{ - print "Certificate exists: true\n"; -} -my $cd = $ca->getCertificate($c); - -my $ret = $cd->getExtensions()->dump(); - -for(my $it = $ret->begin(); - !$ret->iterator_equal($it, $ret->end()); - $ret->iterator_incr($it)) -{ - if($ret->iterator_value($it) =~ /^KeyID/) - { - print "found KeyID\n"; - } - else - { - print $ret->iterator_value($it)."\n"; - } -} print "DONE\n"; Modified: limal-head/limal-ca-mgm/testsuite/single.out/ConvertTest.err URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/testsuite/sin… ============================================================================== --- limal-head/limal-ca-mgm/testsuite/single.out/ConvertTest.err (original) +++ limal-head/limal-ca-mgm/testsuite/single.out/ConvertTest.err Fri Oct 12 17:53:17 2007 @@ -0,0 +1,12 @@ +INFO ca-mgm - openssl status:1 +Exception: +OpenSSLUtils.cpp: RuntimeException: openssl command failed: unable to load Private Key +END +INFO ca-mgm - openssl status:1 +Exception: +OpenSSLUtils.cpp: 1667 RuntimeException: openssl command failed: unable to load private key +END +INFO ca-mgm - openssl status:1 +Exception: +OpenSSLUtils.cpp: 1799 RuntimeException: openssl command failed: Mac verify error: invalid password? +END Modified: limal-head/limal-ca-mgm/testsuite/single.out/ConvertTest.out URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/testsuite/sin… ============================================================================== --- limal-head/limal-ca-mgm/testsuite/single.out/ConvertTest.out (original) +++ limal-head/limal-ca-mgm/testsuite/single.out/ConvertTest.out Fri Oct 12 17:53:17 2007 @@ -19,4 +19,9 @@ Got PKCS12 data Got PEM correct encryption +===================== Test rsaConvert Exception ===================== +Got expected Exception. +===================== Test pkcs12Convert Exception ===================== +Got expected Exception. +Got expected Exception. DONE Modified: limal-head/limal-ca-mgm/testsuite/single.out/perl-CertificateExceptionTest.out URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/testsuite/sin… ============================================================================== --- limal-head/limal-ca-mgm/testsuite/single.out/perl-CertificateExceptionTest.out (original) +++ limal-head/limal-ca-mgm/testsuite/single.out/perl-CertificateExceptionTest.out Fri Oct 12 17:53:17 2007 @@ -21,3 +21,4 @@ 'code' => -1 }; RuntimeException:-1:Issuing the certificate failed. +DONE -- To unsubscribe, e-mail: limal-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: limal-commit+help(a)opensuse.org

1 0