diff options
| author | Michael Vogt <egon@bottom> | 2006-05-16 21:34:04 +0200 |
|---|---|---|
| committer | Michael Vogt <egon@bottom> | 2006-05-16 21:34:04 +0200 |
| commit | 6479b9024082c3d3942e7741624ba8c9b6d60d35 (patch) | |
| tree | 242d30f3e881c4f0eb8006b54518884d230b0723 | |
| parent | ae6f2268b49710b5b153d6d28a80268f2f3df3da (diff) | |
| parent | 4bbffb86b668e067bf930ae8a57aebc4afa33de5 (diff) | |
* merged from the aj-ftparchive-improvements branch
| -rw-r--r-- | apt-pkg/contrib/sha256.cc | 5 | ||||
| -rw-r--r-- | debian/changelog | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/apt-pkg/contrib/sha256.cc b/apt-pkg/contrib/sha256.cc index a4d258d26..ad2ddb2d3 100644 --- a/apt-pkg/contrib/sha256.cc +++ b/apt-pkg/contrib/sha256.cc @@ -61,7 +61,10 @@ static inline u32 Maj(u32 x, u32 y, u32 z) static inline void LOAD_OP(int I, u32 *W, const u8 *input) { - W[I] = ntohl( ((u32*)(input))[I] ); + W[I] = ( ((u32) input[I + 0] << 24) + | ((u32) input[I + 1] << 16) + | ((u32) input[I + 2] << 8) + | ((u32) input[I + 3])); } static inline void BLEND_OP(int I, u32 *W) diff --git a/debian/changelog b/debian/changelog index 7862505f5..25ff4a744 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,9 @@ apt (0.6.44.1) unstable; urgency=low - po/LINGUAS: added "bg" Closes: #360262 - po/gl.po: Galician translation update. Closes: #366849 - po/hu.po: Hungarian translation update. Closes: #365448 + * apt-pkg/contrib/sha256.cc: + - applied patch to fix unaligned access problem. Closes: #367417 + (thanks to David Mosberger) -- |