- add header RSA signature (untested, disabled for now).

- don't bother with signing check if 16 bits of hash don't match.
- only V3 signatures for now.

CVS patchset: 5347
CVS date: 2002/03/07 22:54:43

1 files changed, 30 insertions, 33 deletions

diff --git a/po/ru.po b/po/ru.po
index cc256d3b9..c88422be0 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-06 21:16-0500\n"
+"POT-Creation-Date: 2002-03-07 17:53-0500\n"
 "PO-Revision-Date: 2001-08-29 13:55-0400\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team:  Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -1666,21 +1666,26 @@ msgid "%s: headerRead failed\n"
 msgstr "%s: ошибка readLead\n"
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338 lib/rpmchecksig.c:633
+#: lib/package.c:338
 msgid "========== Header RSA signature\n"
 msgstr ""
 
+#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:358 lib/rpmchecksig.c:639
+#: lib/package.c:366
 msgid "========== Header DSA signature\n"
 msgstr ""
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:381
+#: lib/package.c:397
 msgid "========== Package DSA/RSA signature\n"
 msgstr ""
 
-#: lib/package.c:390 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: ошибка Fread: %s\n"
@@ -2455,35 +2460,27 @@ msgstr "%s: ошибка readLead\n"
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Подписи нет (RPM v1.0)\n"
 
-#: lib/rpmchecksig.c:620
-msgid "========== Package RSA signature\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:645
-msgid "========== Package DSA signature\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:778
+#: lib/rpmchecksig.c:773
 msgid "NOT OK"
 msgstr "НЕ OК"
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 msgid " (MISSING KEYS:"
 msgstr " (ОТСУТСТВУЮТ КЛЮЧИ:"
 
-#: lib/rpmchecksig.c:781 lib/rpmchecksig.c:795
+#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:782 lib/rpmchecksig.c:796
+#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
 msgid " (UNTRUSTED KEYS:"
 msgstr " (НЕТ ДОВЕРИЯ К КЛЮЧАМ:"
 
-#: lib/rpmchecksig.c:784 lib/rpmchecksig.c:798
+#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:792
+#: lib/rpmchecksig.c:787
 msgid "OK"
 msgstr "OК"
 
@@ -2727,8 +2724,8 @@ msgstr ""
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Подпись: размер(%d)+заполнение(%d)\n"
 
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:675
-#: lib/signature.c:708
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
+#: lib/signature.c:710
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Невозможно вылнить %s: %s\n"
@@ -2779,57 +2776,57 @@ msgstr "Получено %d байт подписи GPG\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:713 lib/signature.c:768
+#: lib/signature.c:715 lib/signature.c:770
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "Неверная спецификация %%_signature в макрофайле\n"
 
-#: lib/signature.c:747
+#: lib/signature.c:749
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Вы должны установить \"%%_gpg_name\" в вашем макрофайле\n"
 
-#: lib/signature.c:760
+#: lib/signature.c:762
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Вы должны установить \"%%_pgp_name\" в вашем макрофайле\n"
 
-#: lib/signature.c:804
+#: lib/signature.c:806
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "Заголовок слишком велик"
 
-#: lib/signature.c:844
+#: lib/signature.c:846
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:901
+#: lib/signature.c:903
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1063
+#: lib/signature.c:1082
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "пропустить все MD5-подписи"
 
-#: lib/signature.c:1179
+#: lib/signature.c:1199
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1180
+#: lib/signature.c:1200
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "Подписи нет\n"
 
-#: lib/signature.c:1271
+#: lib/signature.c:1287
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1298
+#: lib/signature.c:1314
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1302
+#: lib/signature.c:1318
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Подпись: размер(%d)+заполнение(%d)\n"