comparison libtomcrypt/src/pk/asn1/der/octet/der_decode_octet_string.c @ 435:337c45621e81

merge of 'a9b0496634cdd25647b65e585cc3240f3fa699ee' and 'c22be8b8f570b48e9662dac32c7b3e7148a42206'
author Matt Johnston <matt@ucc.asn.au>
date Thu, 22 Feb 2007 14:53:49 +0000
parents 0cbe8f6dbf9e
children f849a5ca2efc
comparison
equal deleted inserted replaced
434:0aaaf68e97dc 435:337c45621e81
4 * algorithms in a highly modular and flexible manner. 4 * algorithms in a highly modular and flexible manner.
5 * 5 *
6 * The library is free for all purposes without any express 6 * The library is free for all purposes without any express
7 * guarantee it works. 7 * guarantee it works.
8 * 8 *
9 * Tom St Denis, [email protected], http://libtomcrypt.org 9 * Tom St Denis, [email protected], http://libtomcrypt.com
10 */ 10 */
11 #include "tomcrypt.h" 11 #include "tomcrypt.h"
12 12
13 /** 13 /**
14 @file der_decode_octet_string.c 14 @file der_decode_octet_string.c
64 len = in[x++] & 0x7F; 64 len = in[x++] & 0x7F;
65 } 65 }
66 66
67 /* is it too long? */ 67 /* is it too long? */
68 if (len > *outlen) { 68 if (len > *outlen) {
69 *outlen = len;
69 return CRYPT_BUFFER_OVERFLOW; 70 return CRYPT_BUFFER_OVERFLOW;
70 } 71 }
71 72
72 if (len + x > inlen) { 73 if (len + x > inlen) {
73 return CRYPT_INVALID_PACKET; 74 return CRYPT_INVALID_PACKET;
84 } 85 }
85 86
86 #endif 87 #endif
87 88
88 /* $Source: /cvs/libtom/libtomcrypt/src/pk/asn1/der/octet/der_decode_octet_string.c,v $ */ 89 /* $Source: /cvs/libtom/libtomcrypt/src/pk/asn1/der/octet/der_decode_octet_string.c,v $ */
89 /* $Revision: 1.1 $ */ 90 /* $Revision: 1.3 $ */
90 /* $Date: 2005/05/16 15:08:11 $ */ 91 /* $Date: 2006/06/16 21:53:41 $ */