comparison libtomcrypt/src/pk/asn1/der/ia5/der_decode_ia5_string.c @ 415:8b9aba1d5fa4 channel-fix

merge of '73fe066c5d9e2395354ba74756124d45c978a04d' and 'f5014cc84558f1e8eba42dbecf9f72f94bfe6134'
author Matt Johnston <matt@ucc.asn.au>
date Tue, 06 Feb 2007 16:00:18 +0000
parents 0cbe8f6dbf9e
children f849a5ca2efc
comparison
equal deleted inserted replaced
414:c53a26c430e5 415:8b9aba1d5fa4
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_ia5_string.c 14 @file der_decode_ia5_string.c
65 len = in[x++] & 0x7F; 65 len = in[x++] & 0x7F;
66 } 66 }
67 67
68 /* is it too long? */ 68 /* is it too long? */
69 if (len > *outlen) { 69 if (len > *outlen) {
70 *outlen = len;
70 return CRYPT_BUFFER_OVERFLOW; 71 return CRYPT_BUFFER_OVERFLOW;
71 } 72 }
72 73
73 if (len + x > inlen) { 74 if (len + x > inlen) {
74 return CRYPT_INVALID_PACKET; 75 return CRYPT_INVALID_PACKET;
89 } 90 }
90 91
91 #endif 92 #endif
92 93
93 /* $Source: /cvs/libtom/libtomcrypt/src/pk/asn1/der/ia5/der_decode_ia5_string.c,v $ */ 94 /* $Source: /cvs/libtom/libtomcrypt/src/pk/asn1/der/ia5/der_decode_ia5_string.c,v $ */
94 /* $Revision: 1.1 $ */ 95 /* $Revision: 1.3 $ */
95 /* $Date: 2005/05/16 15:08:11 $ */ 96 /* $Date: 2006/06/16 21:53:41 $ */