--- a/libtomcrypt/src/pk/asn1/der/object_identifier/der_decode_object_identifier.c	Tue Feb 06 15:59:54 2007 +0000
+++ b/libtomcrypt/src/pk/asn1/der/object_identifier/der_decode_object_identifier.c	Tue Feb 06 16:00:18 2007 +0000
@@ -6,7 +6,7 @@
  * The library is free for all purposes without any express
  * guarantee it works.
  *
- * Tom St Denis, [email protected], http://libtomcrypt.org
+ * Tom St Denis, [email protected], http://libtomcrypt.com
  */
 #include "tomcrypt.h"
 
@@ -67,14 +67,8 @@
       return CRYPT_INVALID_PACKET;
    }
 
-   /* decode word1 and word2 */
-   --len;
-   t = in[x++];
-   words[0] = t/40;
-   words[1] = t%40;
-
-   /* decode rest */
-   y = 2;
+   /* decode words */
+   y = 0;
    t = 0;
    while (len--) {
        t = (t << 7) | (in[x] & 0x7F);
@@ -83,7 +77,13 @@
            if (y >= *outlen) {
               return CRYPT_BUFFER_OVERFLOW;
            }
-           words[y++] = t;
+      if (y == 0) {
+         words[0] = t / 40;
+         words[1] = t % 40;
+         y = 2;
+      } else {
+              words[y++] = t;
+      }
            t          = 0;
        }
    }
@@ -95,5 +95,5 @@
 #endif
 
 /* $Source: /cvs/libtom/libtomcrypt/src/pk/asn1/der/object_identifier/der_decode_object_identifier.c,v $ */
-/* $Revision: 1.1 $ */
-/* $Date: 2005/05/16 15:08:11 $ */
+/* $Revision: 1.5 $ */
+/* $Date: 2006/11/21 00:18:23 $ */