rpms/cryptsetup-luks/devel luks-hmac-64bit-fix.patch,1.1,1.2

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Jun 16 17:23:12 UTC 2005


Author: notting

Update of /cvs/dist/rpms/cryptsetup-luks/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15035

Modified Files:
	luks-hmac-64bit-fix.patch 
Log Message:
wow, that was funny


luks-hmac-64bit-fix.patch:
 hmac.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Index: luks-hmac-64bit-fix.patch
===================================================================
RCS file: /cvs/dist/rpms/cryptsetup-luks/devel/luks-hmac-64bit-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- luks-hmac-64bit-fix.patch	16 Jun 2005 17:20:34 -0000	1.1
+++ luks-hmac-64bit-fix.patch	16 Jun 2005 17:23:09 -0000	1.2
@@ -1,196 +1,20 @@
-<!-- 1.0 at bugzilla.org -->
-
-
-
-
-
-
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-    <title>Invalid Attachment ID</title>
-    
-
-
-
-                                                                                                                                                               
-
-    <script type="text/javascript">
-  <!--
-  
-  function initHelp() {}
-  // -->
-  </script>
-    
-    
-  
-  <link rel="shortcut icon" href="images/favicon.ico">
-  <link rel="icon" href="images/favicon.ico">
-  <style type="text/css" media="screen">
-  <!--
-    @import url("https://www.redhat.com/s/master.css");
-    @import url("css/bugzilla.css"); 
-  -->
-  </style>
-
-  </head>
-  
-
-
-  <body id="mainend" bgcolor="#000000" onload=""
-   class="bugzilla-redhat-com-bugzilla" >
-
-  <div id="wrap">
-  <div id="innerWrap">
-
-
-<!--    <div id="redhat-banner">
-      <div id="redhat-banner-logo">
-        <a href="http://www.redhat.com"><img SRC="images/header_logo.gif" WIDTH="44" HEIGHT="41" ALT="redhat.com" BORDER="0">
-        <img SRC="images/header_redhat.gif" WIDTH="106" HEIGHT="41" ALT="REDHAT.COM" BORDER="0"></a>
-        <a href="index.cgi"><img SRC="images/bugzilla_new.png" width="156" height="25" ALT="bugzilla.redhat.com" BORDER="0"></a>
-      </div>
-      <div id="redhat-banner-items">
-        <span class="redhat-header-icon">
-          <a href="http://www.redhat.com/apps/redirect.apm/apps/download/?rhpage=/index.html/top_bar**">
-          <img src="images/homepg_download.gif" width="89" height="21" border="0" alt="download" /></a>
-          <a href="http://www.redhat.com/apps/redirect.apm/apps/commerce/?rhpage=/index.html/top_bar**">
-          <img src="images/homepg_store.gif" width="65" height="21" border="0" alt="store" /></a>
-          <a href="http://www.redhat.com/apps/redirect.apm/apps/commerce/cart.html?rhpage=/index.html/top_bar**">
-          <img src="images/homepg_cart.gif" width="18" height="21" border="0" alt="cart" />  </a>
-        </span>
-      </div>
-    </div>
-                                                                                                                                             
-<div id="redhat-nav"></div> -->
-
-<!-- HEADER -->
-<div id="header">
-<img src="https://www.redhat.com/g/chrome/logo_rh_home.png" alt="Red Hat Home" width="96" height="31" id="rhLogo" />
-<!--<img SRC="images/logo_rh_bugzilla_beta.png" width="96" height="31" ALT="bugzilla.redhat.com" BORDER="0" id="bzLogo">-->
-<p class="hide"><a href="#content">Skip the links</a></p>
-<div id="utilityLinks">
-<h4 class="hide">Useful Links:</h4>
-<ul>
-    <li><a href="http://www.redhat.com/apps/support/" id="sixth" title="Sign in to Red Hat Network"><span>Support</span></a></li>
-    <li><a href="http://www.redhat.com/apps/commerce/" id="seventh" title="Buy subscription services online in the Red Hat Store"><span>Store</span></a></li>
-    <li><a href="http://www.redhat.com/apps/download/" id="eighth" title="Download our bits"><span>Download</span></a></li>
-</ul>
-</div><!-- end utilityLinks -->
-<form action="show_bug.cgi" method="get" id="goto">
-<div id="goto-bug">
-  Goto bug # <input type="text" name="id" size="7" />
-  <input type="submit" id="submit" value="Go" />
-</div>
-</form>
-</div><!-- end header -->
-
-<!-- MAIN NAVIGATION -->
-<div id="mainNavOuter">
-<div id="mainNav">
-<div id="mainNavInner">
-<h4 class="hide">Main Site Links:</h4>
-<ul>
-    <li id="mainFirst"><a href="http://www.redhat.com/" id="mainFirstLink">Home</a></li>
-    <li id="mainSecond"><a href="http://www.redhat.com/software/rhel/">Enterprise Linux</a></li>
-    <li id="mainThird"><a href="http://www.redhat.com/training/">Training</a></li>
-    <li id="mainFourth"><a href="http://www.redhat.com/software/rhn/">Red Hat Network</a></li>
-    <li id="mainFifth"><a href="http://www.redhat.com/opensourcenow/">Open Source Now</a></li>
-    <li id="mainSixth"><a href="http://www.redhat.com/fedora/">Fedora</a></li>
-    <li id="mainLast"><a href="http://bugzilla.redhat.com/bugzilla/" id="mainLastLink">Bugzilla</a></li>
-</ul>
-<div id="worldwide">
-  <ul>
-    <li>
-    <a href="http://www.redhat.com/apps/redirect.apm/about/corporate/wwoffices/?rhpage=/index.html/home_mainnav**" class="wwLevelOne"><span>Worldwide</span></a>
-    </li>
-  </ul>
-</div>
-</div><!-- end mainNavInner -->
-</div><!-- end mainNav -->
-</div><!-- end mainNavOuter -->
-<!-- SECONDARY NAVIGATION -->
-<div id="secNavOuter">
-<div id="secNav">
-<div id="secNavInner">
-<h4 class="hide">Links for this section:</h4>
-<ul id="secone">
-    <li id="secFirst"><a href="index.cgi" id="secFirstLink" title="Bugzilla Home">Home</a></li>
-    <li id="secSecond"><a href="easy_enter_bug.cgi" title="Create New Report">New</a></li>
-    <li id="secThird"><a href="show_bug.cgi" title="Show Current Report">Show</a></li>
-    <li id="secFourth"><a href="query.cgi?format=simple" title="Search Current Reports">Query</a></li>
-    <li id="secFifth"><a href="query.cgi?format=report-table" title="Chart Current Reports">Reports</a></li>
-    <li id="secSixth"><a href="request.cgi" title="Current Flag Requests">Requests</a></li>
-      <li id="secSeventh"><a href="userprefs.cgi" title="Manage Account Information">Account</a></li>
-        <li id="secEighth"><a href="editusers.cgi" title="Manage Bugzilla Parameters/Members">Admin</a></li>
-    <li id="secLast"><a href="page.cgi?id=redhatfaq.html" id="secLastLink" title="Bugzilla Help">Help</a></li>
-</ul>
-</div><!-- end secNavInner -->
-</div><!-- end secNav -->
-</div><!-- end secNavOuter -->
-
-<span id="login-info">
-    <span id="login-label">Logged In</span> notting@redhat.com |
-    <a href="https://bugzilla.redhat.com/bugzilla/frontpage.cgi">My Front Page</a> |
-    <a href="https://bugzilla.redhat.com/bugzilla/relogin.cgi">Log Out</a>
-</span>
-
-<!-- MAIN CONTENT AREA -->
-<div id="contentWrap">
-
-  <!-- CONTENT COLUMN -->
-  <div id="content1Col">
-  <div id="contentIndent">
-
-    <h1>Invalid Attachment ID</h1>
- <div class="content-nav">
-
-
-
-
-
-</div>
-
-<table cellpadding="20">
-  <tr>
-    <td bgcolor="#ff0000">
-      <font size="+2">
-    The attachment id  is invalid.
-
-      </font>
-    </td>
-  </tr>
-</table>
-
-<p>
-  Please press <b>Back</b> and try again.
-</p>
-
-
-
-            
-</div><!-- contentIndent -->
-</div><!-- content1Col --> 
-</div><!-- contentWrap -->
-                                                                                                                                    
-
-
-
-  <div id="preset-queries">
-  <span id="preset-queries-label">Preset Queries</span>
-      <a href="buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&email1=notting%40redhat.com&emailtype1=exact&emailassigned_to1=1&emailreporter1=1&emailcc1=1">My Bugs</a>
-  </div>
-                                                                                                                                             
-<p id="footer">Bugzilla Version 2.18 : 
-  Copyright © 2004 Red Hat, Inc. All rights reserved.<br />
-  <a href="http://www.redhat.com/legal/privacy_statement.html"><strong>Privacy Policy</strong></a> : 
-  <a href="http://www.redhat.com/legal/legal_statement.html">Terms of Use</a> : 
-  <a href="http://www.redhat.com/legal/patent_policy.html">Patent promise</a> : 
-  <a href="http://www.redhat.com/about/">Company</a> : <a href="mailto:bugzilla-owner at redhat.com">Contact</a><br />
-</p>
-
-</div> <!-- end innerWrap -->
-</div> <!-- end wrap -->
\ No newline at end of file
+--- cryptsetup-luks-1.0/luks/sha/hmac.c.orig	2005-03-29 17:54:46.000000000 +0200
++++ cryptsetup-luks-1.0/luks/sha/hmac.c	2005-03-29 17:54:56.000000000 +0200
+@@ -86,7 +86,7 @@
+ 
+         /* xor ipad into key value  */
+         for(i = 0; i < (HASH_INPUT_SIZE >> 2); ++i)
+-            ((unsigned long*)cx->key)[i] ^= 0x36363636;
++            ((uint32_t*)cx->key)[i] ^= 0x36363636;
+ 
+         /* and start hash operation */
+         sha_begin(cx->ctx);
+@@ -114,7 +114,7 @@
+ 
+     /* set outer key value using opad and removing ipad */
+     for(i = 0; i < (HASH_INPUT_SIZE >> 2); ++i)
+-        ((unsigned long*)cx->key)[i] ^= 0x36363636 ^ 0x5c5c5c5c;
++        ((uint32_t*)cx->key)[i] ^= 0x36363636 ^ 0x5c5c5c5c;
+ 
+     /* perform the outer hash operation */
+     sha_begin(cx->ctx);




More information about the fedora-cvs-commits mailing list