From 65871e1fea624ad7c78001cf0e0c3e8bc7352283 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 4 Jul 2008 11:11:20 +0200 Subject: update-po --- po/python-apt.pot | 100 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 55 insertions(+), 45 deletions(-) diff --git a/po/python-apt.pot b/po/python-apt.pot index cac3604f..4e53bbd4 100644 --- a/po/python-apt.pot +++ b/po/python-apt.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-18 16:50+0100\n" +"POT-Creation-Date: 2008-07-04 11:09+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -23,222 +23,232 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:8 +#: ../data/templates/Ubuntu.info.in:11 +msgid "Ubuntu 8.10 'Intrepid Ibex'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:66 msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:25 +#: ../data/templates/Ubuntu.info.in:83 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:60 +#: ../data/templates/Ubuntu.info.in:120 msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:77 +#: ../data/templates/Ubuntu.info.in:137 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:112 +#: ../data/templates/Ubuntu.info.in:172 msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:129 +#: ../data/templates/Ubuntu.info.in:189 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:163 +#: ../data/templates/Ubuntu.info.in:223 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:168 +#: ../data/templates/Ubuntu.info.in:228 msgid "Community-maintained" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:172 +#: ../data/templates/Ubuntu.info.in:232 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:174 +#: ../data/templates/Ubuntu.info.in:234 msgid "Restricted software" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:180 +#: ../data/templates/Ubuntu.info.in:240 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:214 +#: ../data/templates/Ubuntu.info.in:274 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:217 +#: ../data/templates/Ubuntu.info.in:277 msgid "Canonical-supported Open Source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:219 +#: ../data/templates/Ubuntu.info.in:279 msgid "Community-maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:220 +#: ../data/templates/Ubuntu.info.in:280 msgid "Community-maintained Open Source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:222 +#: ../data/templates/Ubuntu.info.in:282 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:223 +#: ../data/templates/Ubuntu.info.in:283 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:225 +#: ../data/templates/Ubuntu.info.in:285 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:226 +#: ../data/templates/Ubuntu.info.in:286 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:231 +#: ../data/templates/Ubuntu.info.in:291 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:243 +#: ../data/templates/Ubuntu.info.in:303 msgid "Important security updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:248 +#: ../data/templates/Ubuntu.info.in:308 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:253 +#: ../data/templates/Ubuntu.info.in:313 msgid "Pre-released updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:258 +#: ../data/templates/Ubuntu.info.in:318 msgid "Unsupported updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:265 +#: ../data/templates/Ubuntu.info.in:325 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:278 +#: ../data/templates/Ubuntu.info.in:338 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:290 +#: ../data/templates/Ubuntu.info.in:350 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:295 +#: ../data/templates/Ubuntu.info.in:355 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:300 +#: ../data/templates/Ubuntu.info.in:360 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:307 +#: ../data/templates/Ubuntu.info.in:367 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:320 +#: ../data/templates/Ubuntu.info.in:380 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94 +#: ../data/templates/Ubuntu.info.in:383 ../data/templates/Debian.info.in:94 msgid "Officially supported" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:332 +#: ../data/templates/Ubuntu.info.in:392 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:337 +#: ../data/templates/Ubuntu.info.in:397 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:342 +#: ../data/templates/Ubuntu.info.in:402 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:348 +#: ../data/templates/Ubuntu.info.in:408 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:354 +#: ../data/templates/Ubuntu.info.in:414 msgid "Community-maintained (Universe)" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:356 +#: ../data/templates/Ubuntu.info.in:416 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:361 +#: ../data/templates/Ubuntu.info.in:421 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:364 +#: ../data/templates/Ubuntu.info.in:424 msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:366 +#: ../data/templates/Ubuntu.info.in:426 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:373 +#: ../data/templates/Ubuntu.info.in:433 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:378 +#: ../data/templates/Ubuntu.info.in:438 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:383 +#: ../data/templates/Ubuntu.info.in:443 msgid "Ubuntu 4.10 Backports" msgstr "" -- cgit v1.2.3 From ccf689a426760a69b77394abbcddf7897cbd6488 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 4 Jul 2008 19:53:47 +0200 Subject: * python/apt_pkgmodule.cc: - fix bug in hashsum calculation when the original string contains \0 charackters (thanks to Celso Providelo and Ryan Hass for the test-case) LP: #243630 --- debian/changelog | 9 +++++++++ po/python-apt.pot | 2 +- python/apt_pkgmodule.cc | 14 +++++++++++--- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6fa68d7e..8d54596a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +python-apt (0.7.7) unstable; urgency=low + + * python/apt_pkgmodule.cc: + - fix bug in hashsum calculation when the original string + contains \0 charackters (thanks to Celso Providelo and + Ryan Hass for the test-case) LP: #243630 + + -- Michael Vogt Fri, 04 Jul 2008 19:53:28 +0200 + python-apt (0.7.6) unstable; urgency=low * apt/cache.py: diff --git a/po/python-apt.pot b/po/python-apt.pot index 4e53bbd4..71c9b4a7 100644 --- a/po/python-apt.pot +++ b/po/python-apt.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-07-04 11:09+0200\n" +"POT-Creation-Date: 2008-07-04 19:45+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/python/apt_pkgmodule.cc b/python/apt_pkgmodule.cc index ae1cf7be..dea34958 100644 --- a/python/apt_pkgmodule.cc +++ b/python/apt_pkgmodule.cc @@ -175,8 +175,11 @@ static PyObject *md5sum(PyObject *Self,PyObject *Args) // Digest of a string. if (PyString_Check(Obj) != 0) { + char *s; + Py_ssize_t len; MD5Summation Sum; - Sum.Add(PyString_AsString(Obj)); + PyString_AsStringAndSize(Obj, &s, &len); + Sum.Add((const unsigned char*)s, len); return CppPyString(Sum.Result().Value()); } @@ -212,8 +215,10 @@ static PyObject *sha1sum(PyObject *Self,PyObject *Args) // Digest of a string. if (PyString_Check(Obj) != 0) { + char *s; + Py_ssize_t len; SHA1Summation Sum; - Sum.Add(PyString_AsString(Obj)); + Sum.Add((const unsigned char*)s, len); return CppPyString(Sum.Result().Value()); } @@ -249,8 +254,11 @@ static PyObject *sha256sum(PyObject *Self,PyObject *Args) // Digest of a string. if (PyString_Check(Obj) != 0) { + char *s; + Py_ssize_t len; SHA256Summation Sum; - Sum.Add(PyString_AsString(Obj)); + PyString_AsStringAndSize(Obj, &s, &len); + Sum.Add((const unsigned char*)s, len); return CppPyString(Sum.Result().Value()); } -- cgit v1.2.3 From 7625577a6974aa580877cf5d5ed22a6e663843fb Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 4 Jul 2008 20:12:53 +0200 Subject: * tests/test_hashsums.py: - add tests for the hashsum code --- debian/changelog | 2 ++ po/python-apt.pot | 2 +- python/apt_pkgmodule.cc | 1 + tests/test_hashsums.py | 64 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 tests/test_hashsums.py diff --git a/debian/changelog b/debian/changelog index 8d54596a..e15a9a96 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ python-apt (0.7.7) unstable; urgency=low - fix bug in hashsum calculation when the original string contains \0 charackters (thanks to Celso Providelo and Ryan Hass for the test-case) LP: #243630 + * tests/test_hashsums.py: + - add tests for the hashsum code -- Michael Vogt Fri, 04 Jul 2008 19:53:28 +0200 diff --git a/po/python-apt.pot b/po/python-apt.pot index 71c9b4a7..c8c93668 100644 --- a/po/python-apt.pot +++ b/po/python-apt.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-07-04 19:45+0200\n" +"POT-Creation-Date: 2008-07-04 20:08+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/python/apt_pkgmodule.cc b/python/apt_pkgmodule.cc index dea34958..fd7a83cd 100644 --- a/python/apt_pkgmodule.cc +++ b/python/apt_pkgmodule.cc @@ -218,6 +218,7 @@ static PyObject *sha1sum(PyObject *Self,PyObject *Args) char *s; Py_ssize_t len; SHA1Summation Sum; + PyString_AsStringAndSize(Obj, &s, &len); Sum.Add((const unsigned char*)s, len); return CppPyString(Sum.Result().Value()); } diff --git a/tests/test_hashsums.py b/tests/test_hashsums.py new file mode 100644 index 00000000..7fa6eb60 --- /dev/null +++ b/tests/test_hashsums.py @@ -0,0 +1,64 @@ +#!/usr/bin/python + +import unittest +import apt_pkg + +class testHashes(unittest.TestCase): + " test the hashsum functions against strings and files " + + def testMD5(self): + # simple + s = "foo" + s_md5 = "acbd18db4cc2f85cedef654fccc4a4d8" + res = apt_pkg.md5sum(s) + self.assert_(res == s_md5) + # file + res = apt_pkg.md5sum(open("hashsum_test.data")) + self.assert_(res == s_md5) + # with zero (\0) in the string + s = "foo\0bar" + s_md5 = "f6f5f8cd0cb63668898ba29025ae824e" + res = apt_pkg.md5sum(s) + self.assert_(res == s_md5) + # file + res = apt_pkg.md5sum(open("hashsum_test_with_zero.data")) + self.assert_(res == s_md5) + + def testSHA1(self): + # simple + s = "foo" + s_hash = "0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33" + res = apt_pkg.sha1sum(s) + self.assert_(res == s_hash) + # file + res = apt_pkg.sha1sum(open("hashsum_test.data")) + self.assert_(res == s_hash) + # with zero (\0) in the string + s = "foo\0bar" + s_hash = "e2c300a39311a2dfcaff799528415cb74c19317f" + res = apt_pkg.sha1sum(s) + self.assert_(res == s_hash) + # file + res = apt_pkg.sha1sum(open("hashsum_test_with_zero.data")) + self.assert_(res == s_hash) + + def testSHA256(self): + # simple + s = "foo" + s_hash = "2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae" + res = apt_pkg.sha256sum(s) + self.assert_(res == s_hash) + # file + res = apt_pkg.sha256sum(open("hashsum_test.data")) + self.assert_(res == s_hash) + # with zero (\0) in the string + s = "foo\0bar" + s_hash = "d6b681bfce7155d44721afb79c296ef4f0fa80a9dd6b43c5cf74dd0f64c85512" + res = apt_pkg.sha256sum(s) + self.assert_(res == s_hash) + # file + res = apt_pkg.sha256sum(open("hashsum_test_with_zero.data")) + self.assert_(res == s_hash) + +if __name__ == "__main__": + unittest.main() -- cgit v1.2.3 From 844d8f7494027c9dc205d528cafcc4fb2a64f61b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 4 Jul 2008 20:15:35 +0200 Subject: add missing test-data --- tests/hashsum_test.data | 1 + tests/hashsum_test_with_zero.data | Bin 0 -> 7 bytes 2 files changed, 1 insertion(+) create mode 100644 tests/hashsum_test.data create mode 100644 tests/hashsum_test_with_zero.data diff --git a/tests/hashsum_test.data b/tests/hashsum_test.data new file mode 100644 index 00000000..19102815 --- /dev/null +++ b/tests/hashsum_test.data @@ -0,0 +1 @@ +foo \ No newline at end of file diff --git a/tests/hashsum_test_with_zero.data b/tests/hashsum_test_with_zero.data new file mode 100644 index 00000000..2ec9a6df Binary files /dev/null and b/tests/hashsum_test_with_zero.data differ -- cgit v1.2.3