diff options
Diffstat (limited to 'Modules/binascii.c')
| -rw-r--r-- | Modules/binascii.c | 2286 |
1 files changed, 1143 insertions, 1143 deletions
diff --git a/Modules/binascii.c b/Modules/binascii.c index 38d22abcd1..d21404b78f 100644 --- a/Modules/binascii.c +++ b/Modules/binascii.c @@ -3,40 +3,40 @@ ** ** This module currently supports the following encodings: ** uuencode: -** each line encodes 45 bytes (except possibly the last) -** First char encodes (binary) length, rest data -** each char encodes 6 bits, as follows: -** binary: 01234567 abcdefgh ijklmnop -** ascii: 012345 67abcd efghij klmnop -** ASCII encoding method is "excess-space": 000000 is encoded as ' ', etc. -** short binary data is zero-extended (so the bits are always in the -** right place), this does *not* reflect in the length. +** each line encodes 45 bytes (except possibly the last) +** First char encodes (binary) length, rest data +** each char encodes 6 bits, as follows: +** binary: 01234567 abcdefgh ijklmnop +** ascii: 012345 67abcd efghij klmnop +** ASCII encoding method is "excess-space": 000000 is encoded as ' ', etc. +** short binary data is zero-extended (so the bits are always in the +** right place), this does *not* reflect in the length. ** base64: ** Line breaks are insignificant, but lines are at most 76 chars ** each char encodes 6 bits, in similar order as uucode/hqx. Encoding ** is done via a table. ** Short binary data is filled (in ASCII) with '='. ** hqx: -** File starts with introductory text, real data starts and ends -** with colons. -** Data consists of three similar parts: info, datafork, resourcefork. -** Each part is protected (at the end) with a 16-bit crc -** The binary data is run-length encoded, and then ascii-fied: -** binary: 01234567 abcdefgh ijklmnop -** ascii: 012345 67abcd efghij klmnop -** ASCII encoding is table-driven, see the code. -** Short binary data results in the runt ascii-byte being output with -** the bits in the right place. +** File starts with introductory text, real data starts and ends +** with colons. +** Data consists of three similar parts: info, datafork, resourcefork. +** Each part is protected (at the end) with a 16-bit crc +** The binary data is run-length encoded, and then ascii-fied: +** binary: 01234567 abcdefgh ijklmnop +** ascii: 012345 67abcd efghij klmnop +** ASCII encoding is table-driven, see the code. +** Short binary data results in the runt ascii-byte being output with +** the bits in the right place. ** ** While I was reading dozens of programs that encode or decode the formats ** here (documentation? hihi:-) I have formulated Jansen's Observation: ** -** Programs that encode binary data in ASCII are written in -** such a style that they are as unreadable as possible. Devices used -** include unnecessary global variables, burying important tables -** in unrelated sourcefiles, putting functions in include files, -** using seemingly-descriptive variable names for different purposes, -** calls to empty subroutines and a host of others. +** Programs that encode binary data in ASCII are written in +** such a style that they are as unreadable as possible. Devices used +** include unnecessary global variables, burying important tables +** in unrelated sourcefiles, putting functions in include files, +** using seemingly-descriptive variable names for different purposes, +** calls to empty subroutines and a host of others. ** ** I have attempted to break with this tradition, but I guess that that ** does make the performance sub-optimal. Oh well, too bad... @@ -75,67 +75,67 @@ static PyObject *Incomplete; static unsigned char table_a2b_hqx[256] = { /* ^@ ^A ^B ^C ^D ^E ^F ^G */ -/* 0*/ FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, +/* 0*/ FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, /* \b \t \n ^K ^L \r ^N ^O */ -/* 1*/ FAIL, FAIL, SKIP, FAIL, FAIL, SKIP, FAIL, FAIL, +/* 1*/ FAIL, FAIL, SKIP, FAIL, FAIL, SKIP, FAIL, FAIL, /* ^P ^Q ^R ^S ^T ^U ^V ^W */ -/* 2*/ FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, +/* 2*/ FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, /* ^X ^Y ^Z ^[ ^\ ^] ^^ ^_ */ -/* 3*/ FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, +/* 3*/ FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, /* ! " # $ % & ' */ -/* 4*/ FAIL, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, +/* 4*/ FAIL, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, /* ( ) * + , - . / */ -/* 5*/ 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, FAIL, FAIL, +/* 5*/ 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, FAIL, FAIL, /* 0 1 2 3 4 5 6 7 */ -/* 6*/ 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, FAIL, +/* 6*/ 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, FAIL, /* 8 9 : ; < = > ? */ -/* 7*/ 0x14, 0x15, DONE, FAIL, FAIL, FAIL, FAIL, FAIL, +/* 7*/ 0x14, 0x15, DONE, FAIL, FAIL, FAIL, FAIL, FAIL, /* @ A B C D E F G */ -/* 8*/ 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, +/* 8*/ 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, /* H I J K L M N O */ -/* 9*/ 0x1E, 0x1F, 0x20, 0x21, 0x22, 0x23, 0x24, FAIL, +/* 9*/ 0x1E, 0x1F, 0x20, 0x21, 0x22, 0x23, 0x24, FAIL, /* P Q R S T U V W */ -/*10*/ 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, FAIL, +/*10*/ 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, FAIL, /* X Y Z [ \ ] ^ _ */ -/*11*/ 0x2C, 0x2D, 0x2E, 0x2F, FAIL, FAIL, FAIL, FAIL, +/*11*/ 0x2C, 0x2D, 0x2E, 0x2F, FAIL, FAIL, FAIL, FAIL, /* ` a b c d e f g */ -/*12*/ 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, FAIL, +/*12*/ 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, FAIL, /* h i j k l m n o */ -/*13*/ 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, FAIL, FAIL, +/*13*/ 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, FAIL, FAIL, /* p q r s t u v w */ -/*14*/ 0x3D, 0x3E, 0x3F, FAIL, FAIL, FAIL, FAIL, FAIL, +/*14*/ 0x3D, 0x3E, 0x3F, FAIL, FAIL, FAIL, FAIL, FAIL, /* x y z { | } ~ ^? */ -/*15*/ FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, -/*16*/ FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, - FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, - FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, - FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, - FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, - FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, - FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, - FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, - FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, - FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, - FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, - FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, - FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, - FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, - FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, - FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, +/*15*/ FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, +/*16*/ FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, + FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, + FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, + FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, + FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, + FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, + FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, + FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, + FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, + FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, + FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, + FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, + FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, + FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, + FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, + FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, }; static unsigned char table_b2a_hqx[] = "!\"#$%&'()*+,-012345689@ABCDEFGHIJKLMNPQRSTUVXYZ[`abcdefhijklmpqr"; static char table_a2b_base64[] = { - -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, - -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, - -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,62, -1,-1,-1,63, - 52,53,54,55, 56,57,58,59, 60,61,-1,-1, -1, 0,-1,-1, /* Note PAD->0 */ - -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10, 11,12,13,14, - 15,16,17,18, 19,20,21,22, 23,24,25,-1, -1,-1,-1,-1, - -1,26,27,28, 29,30,31,32, 33,34,35,36, 37,38,39,40, - 41,42,43,44, 45,46,47,48, 49,50,51,-1, -1,-1,-1,-1 + -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, + -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, + -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,62, -1,-1,-1,63, + 52,53,54,55, 56,57,58,59, 60,61,-1,-1, -1, 0,-1,-1, /* Note PAD->0 */ + -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10, 11,12,13,14, + 15,16,17,18, 19,20,21,22, 23,24,25,-1, -1,-1,-1,-1, + -1,26,27,28, 29,30,31,32, 33,34,35,36, 37,38,39,40, + 41,42,43,44, 45,46,47,48, 49,50,51,-1, -1,-1,-1,-1 }; #define BASE64_PAD '=' @@ -149,38 +149,38 @@ static unsigned char table_b2a_base64[] = static unsigned short crctab_hqx[256] = { - 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7, - 0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef, - 0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6, - 0x9339, 0x8318, 0xb37b, 0xa35a, 0xd3bd, 0xc39c, 0xf3ff, 0xe3de, - 0x2462, 0x3443, 0x0420, 0x1401, 0x64e6, 0x74c7, 0x44a4, 0x5485, - 0xa56a, 0xb54b, 0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d, - 0x3653, 0x2672, 0x1611, 0x0630, 0x76d7, 0x66f6, 0x5695, 0x46b4, - 0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc, - 0x48c4, 0x58e5, 0x6886, 0x78a7, 0x0840, 0x1861, 0x2802, 0x3823, - 0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, 0xa90a, 0xb92b, - 0x5af5, 0x4ad4, 0x7ab7, 0x6a96, 0x1a71, 0x0a50, 0x3a33, 0x2a12, - 0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a, - 0x6ca6, 0x7c87, 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0x0c60, 0x1c41, - 0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49, - 0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, 0x2e32, 0x1e51, 0x0e70, - 0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, 0x9f59, 0x8f78, - 0x9188, 0x81a9, 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f, - 0x1080, 0x00a1, 0x30c2, 0x20e3, 0x5004, 0x4025, 0x7046, 0x6067, - 0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e, - 0x02b1, 0x1290, 0x22f3, 0x32d2, 0x4235, 0x5214, 0x6277, 0x7256, - 0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d, - 0x34e2, 0x24c3, 0x14a0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405, - 0xa7db, 0xb7fa, 0x8799, 0x97b8, 0xe75f, 0xf77e, 0xc71d, 0xd73c, - 0x26d3, 0x36f2, 0x0691, 0x16b0, 0x6657, 0x7676, 0x4615, 0x5634, - 0xd94c, 0xc96d, 0xf90e, 0xe92f, 0x99c8, 0x89e9, 0xb98a, 0xa9ab, - 0x5844, 0x4865, 0x7806, 0x6827, 0x18c0, 0x08e1, 0x3882, 0x28a3, - 0xcb7d, 0xdb5c, 0xeb3f, 0xfb1e, 0x8bf9, 0x9bd8, 0xabbb, 0xbb9a, - 0x4a75, 0x5a54, 0x6a37, 0x7a16, 0x0af1, 0x1ad0, 0x2ab3, 0x3a92, - 0xfd2e, 0xed0f, 0xdd6c, 0xcd4d, 0xbdaa, 0xad8b, 0x9de8, 0x8dc9, - 0x7c26, 0x6c07, 0x5c64, 0x4c45, 0x3ca2, 0x2c83, 0x1ce0, 0x0cc1, - 0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, 0x9ff8, - 0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0, + 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7, + 0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef, + 0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6, + 0x9339, 0x8318, 0xb37b, 0xa35a, 0xd3bd, 0xc39c, 0xf3ff, 0xe3de, + 0x2462, 0x3443, 0x0420, 0x1401, 0x64e6, 0x74c7, 0x44a4, 0x5485, + 0xa56a, 0xb54b, 0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d, + 0x3653, 0x2672, 0x1611, 0x0630, 0x76d7, 0x66f6, 0x5695, 0x46b4, + 0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc, + 0x48c4, 0x58e5, 0x6886, 0x78a7, 0x0840, 0x1861, 0x2802, 0x3823, + 0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, 0xa90a, 0xb92b, + 0x5af5, 0x4ad4, 0x7ab7, 0x6a96, 0x1a71, 0x0a50, 0x3a33, 0x2a12, + 0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a, + 0x6ca6, 0x7c87, 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0x0c60, 0x1c41, + 0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49, + 0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, 0x2e32, 0x1e51, 0x0e70, + 0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, 0x9f59, 0x8f78, + 0x9188, 0x81a9, 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f, + 0x1080, 0x00a1, 0x30c2, 0x20e3, 0x5004, 0x4025, 0x7046, 0x6067, + 0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e, + 0x02b1, 0x1290, 0x22f3, 0x32d2, 0x4235, 0x5214, 0x6277, 0x7256, + 0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d, + 0x34e2, 0x24c3, 0x14a0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405, + 0xa7db, 0xb7fa, 0x8799, 0x97b8, 0xe75f, 0xf77e, 0xc71d, 0xd73c, + 0x26d3, 0x36f2, 0x0691, 0x16b0, 0x6657, 0x7676, 0x4615, 0x5634, + 0xd94c, 0xc96d, 0xf90e, 0xe92f, 0x99c8, 0x89e9, 0xb98a, 0xa9ab, + 0x5844, 0x4865, 0x7806, 0x6827, 0x18c0, 0x08e1, 0x3882, 0x28a3, + 0xcb7d, 0xdb5c, 0xeb3f, 0xfb1e, 0x8bf9, 0x9bd8, 0xabbb, 0xbb9a, + 0x4a75, 0x5a54, 0x6a37, 0x7a16, 0x0af1, 0x1ad0, 0x2ab3, 0x3a92, + 0xfd2e, 0xed0f, 0xdd6c, 0xcd4d, 0xbdaa, 0xad8b, 0x9de8, 0x8dc9, + 0x7c26, 0x6c07, 0x5c64, 0x4c45, 0x3ca2, 0x2c83, 0x1ce0, 0x0cc1, + 0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, 0x9ff8, + 0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0, }; PyDoc_STRVAR(doc_a2b_uu, "(ascii) -> bin. Decode a line of uuencoded data"); @@ -188,85 +188,85 @@ PyDoc_STRVAR(doc_a2b_uu, "(ascii) -> bin. Decode a line of uuencoded data"); static PyObject * binascii_a2b_uu(PyObject *self, PyObject *args) { - Py_buffer pascii; - unsigned char *ascii_data, *bin_data; - int leftbits = 0; - unsigned char this_ch; - unsigned int leftchar = 0; - PyObject *rv; - Py_ssize_t ascii_len, bin_len; - - if ( !PyArg_ParseTuple(args, "y*:a2b_uu", &pascii) ) - return NULL; - ascii_data = pascii.buf; - ascii_len = pascii.len; - - assert(ascii_len >= 0); - - /* First byte: binary data length (in bytes) */ - bin_len = (*ascii_data++ - ' ') & 077; - ascii_len--; - - /* Allocate the buffer */ - if ( (rv=PyBytes_FromStringAndSize(NULL, bin_len)) == NULL ) { - PyBuffer_Release(&pascii); - return NULL; - } - bin_data = (unsigned char *)PyBytes_AS_STRING(rv); - - for( ; bin_len > 0 ; ascii_len--, ascii_data++ ) { - /* XXX is it really best to add NULs if there's no more data */ - this_ch = (ascii_len > 0) ? *ascii_data : 0; - if ( this_ch == '\n' || this_ch == '\r' || ascii_len <= 0) { - /* - ** Whitespace. Assume some spaces got eaten at - ** end-of-line. (We check this later) - */ - this_ch = 0; - } else { - /* Check the character for legality - ** The 64 in stead of the expected 63 is because - ** there are a few uuencodes out there that use - ** '`' as zero instead of space. - */ - if ( this_ch < ' ' || this_ch > (' ' + 64)) { - PyErr_SetString(Error, "Illegal char"); - PyBuffer_Release(&pascii); - Py_DECREF(rv); - return NULL; - } - this_ch = (this_ch - ' ') & 077; - } - /* - ** Shift it in on the low end, and see if there's - ** a byte ready for output. - */ - leftchar = (leftchar << 6) | (this_ch); - leftbits += 6; - if ( leftbits >= 8 ) { - leftbits -= 8; - *bin_data++ = (leftchar >> leftbits) & 0xff; - leftchar &= ((1 << leftbits) - 1); - bin_len--; - } - } - /* - ** Finally, check that if there's anything left on the line - ** that it's whitespace only. - */ - while( ascii_len-- > 0 ) { - this_ch = *ascii_data++; - /* Extra '`' may be written as padding in some cases */ - if ( this_ch != ' ' && this_ch != ' '+64 && - this_ch != '\n' && this_ch != '\r' ) { - PyErr_SetString(Error, "Trailing garbage"); - PyBuffer_Release(&pascii); - Py_DECREF(rv); - return NULL; - } - } - PyBuffer_Release(&pascii); - return rv; + Py_buffer pascii; + unsigned char *ascii_data, *bin_data; + int leftbits = 0; + unsigned char this_ch; + unsigned int leftchar = 0; + PyObject *rv; + Py_ssize_t ascii_len, bin_len; + + if ( !PyArg_ParseTuple(args, "y*:a2b_uu", &pascii) ) + return NULL; + ascii_data = pascii.buf; + ascii_len = pascii.len; + + assert(ascii_len >= 0); + + /* First byte: binary data length (in bytes) */ + bin_len = (*ascii_data++ - ' ') & 077; + ascii_len--; + + /* Allocate the buffer */ + if ( (rv=PyBytes_FromStringAndSize(NULL, bin_len)) == NULL ) { + PyBuffer_Release(&pascii); + return NULL; + } + bin_data = (unsigned char *)PyBytes_AS_STRING(rv); + + for( ; bin_len > 0 ; ascii_len--, ascii_data++ ) { + /* XXX is it really best to add NULs if there's no more data */ + this_ch = (ascii_len > 0) ? *ascii_data : 0; + if ( this_ch == '\n' || this_ch == '\r' || ascii_len <= 0) { + /* + ** Whitespace. Assume some spaces got eaten at + ** end-of-line. (We check this later) + */ + this_ch = 0; + } else { + /* Check the character for legality + ** The 64 in stead of the expected 63 is because + ** there are a few uuencodes out there that use + ** '`' as zero instead of space. + */ + if ( this_ch < ' ' || this_ch > (' ' + 64)) { + PyErr_SetString(Error, "Illegal char"); + PyBuffer_Release(&pascii); + Py_DECREF(rv); + return NULL; + } + this_ch = (this_ch - ' ') & 077; + } + /* + ** Shift it in on the low end, and see if there's + ** a byte ready for output. + */ + leftchar = (leftchar << 6) | (this_ch); + leftbits += 6; + if ( leftbits >= 8 ) { + leftbits -= 8; + *bin_data++ = (leftchar >> leftbits) & 0xff; + leftchar &= ((1 << leftbits) - 1); + bin_len--; + } + } + /* + ** Finally, check that if there's anything left on the line + ** that it's whitespace only. + */ + while( ascii_len-- > 0 ) { + this_ch = *ascii_data++; + /* Extra '`' may be written as padding in some cases */ + if ( this_ch != ' ' && this_ch != ' '+64 && + this_ch != '\n' && this_ch != '\r' ) { + PyErr_SetString(Error, "Trailing garbage"); + PyBuffer_Release(&pascii); + Py_DECREF(rv); + return NULL; + } + } + PyBuffer_Release(&pascii); + return rv; } PyDoc_STRVAR(doc_b2a_uu, "(bin) -> ascii. Uuencode line of data"); @@ -274,86 +274,86 @@ PyDoc_STRVAR(doc_b2a_uu, "(bin) -> ascii. Uuencode line of data"); static PyObject * binascii_b2a_uu(PyObject *self, PyObject *args) { - Py_buffer pbin; - unsigned char *ascii_data, *bin_data; - int leftbits = 0; - unsigned char this_ch; - unsigned int leftchar = 0; - PyObject *rv; - Py_ssize_t bin_len; - - if ( !PyArg_ParseTuple(args, "y*:b2a_uu", &pbin) ) - return NULL; - bin_data = pbin.buf; - bin_len = pbin.len; - if ( bin_len > 45 ) { - /* The 45 is a limit that appears in all uuencode's */ - PyErr_SetString(Error, "At most 45 bytes at once"); - PyBuffer_Release(&pbin); - return NULL; - } - - /* We're lazy and allocate to much (fixed up later) */ - if ( (rv=PyBytes_FromStringAndSize(NULL, 2 + (bin_len+2)/3*4)) == NULL ) { - PyBuffer_Release(&pbin); - return NULL; - } - ascii_data = (unsigned char *)PyBytes_AS_STRING(rv); - - /* Store the length */ - *ascii_data++ = ' ' + (bin_len & 077); - - for( ; bin_len > 0 || leftbits != 0 ; bin_len--, bin_data++ ) { - /* Shift the data (or padding) into our buffer */ - if ( bin_len > 0 ) /* Data */ - leftchar = (leftchar << 8) | *bin_data; - else /* Padding */ - leftchar <<= 8; - leftbits += 8; - - /* See if there are 6-bit groups ready */ - while ( leftbits >= 6 ) { - this_ch = (leftchar >> (leftbits-6)) & 0x3f; - leftbits -= 6; - *ascii_data++ = this_ch + ' '; - } - } - *ascii_data++ = '\n'; /* Append a courtesy newline */ - - if (_PyBytes_Resize(&rv, - (ascii_data - - (unsigned char *)PyBytes_AS_STRING(rv))) < 0) { - Py_DECREF(rv); - rv = NULL; - } - PyBuffer_Release(&pbin); - return rv; + Py_buffer pbin; + unsigned char *ascii_data, *bin_data; + int leftbits = 0; + unsigned char this_ch; + unsigned int leftchar = 0; + PyObject *rv; + Py_ssize_t bin_len; + + if ( !PyArg_ParseTuple(args, "y*:b2a_uu", &pbin) ) + return NULL; + bin_data = pbin.buf; + bin_len = pbin.len; + if ( bin_len > 45 ) { + /* The 45 is a limit that appears in all uuencode's */ + PyErr_SetString(Error, "At most 45 bytes at once"); + PyBuffer_Release(&pbin); + return NULL; + } + + /* We're lazy and allocate to much (fixed up later) */ + if ( (rv=PyBytes_FromStringAndSize(NULL, 2 + (bin_len+2)/3*4)) == NULL ) { + PyBuffer_Release(&pbin); + return NULL; + } + ascii_data = (unsigned char *)PyBytes_AS_STRING(rv); + + /* Store the length */ + *ascii_data++ = ' ' + (bin_len & 077); + + for( ; bin_len > 0 || leftbits != 0 ; bin_len--, bin_data++ ) { + /* Shift the data (or padding) into our buffer */ + if ( bin_len > 0 ) /* Data */ + leftchar = (leftchar << 8) | *bin_data; + else /* Padding */ + leftchar <<= 8; + leftbits += 8; + + /* See if there are 6-bit groups ready */ + while ( leftbits >= 6 ) { + this_ch = (leftchar >> (leftbits-6)) & 0x3f; + leftbits -= 6; + *ascii_data++ = this_ch + ' '; + } + } + *ascii_data++ = '\n'; /* Append a courtesy newline */ + + if (_PyBytes_Resize(&rv, + (ascii_data - + (unsigned char *)PyBytes_AS_STRING(rv))) < 0) { + Py_DECREF(rv); + rv = NULL; + } + PyBuffer_Release(&pbin); + return rv; } static int binascii_find_valid(unsigned char *s, Py_ssize_t slen, int num) { - /* Finds & returns the (num+1)th - ** valid character for base64, or -1 if none. - */ - - int ret = -1; - unsigned char c, b64val; - - while ((slen > 0) && (ret == -1)) { - c = *s; - b64val = table_a2b_base64[c & 0x7f]; - if ( ((c <= 0x7f) && (b64val != (unsigned char)-1)) ) { - if (num == 0) - ret = *s; - num--; - } - - s++; - slen--; - } - return ret; + /* Finds & returns the (num+1)th + ** valid character for base64, or -1 if none. + */ + + int ret = -1; + unsigned char c, b64val; + + while ((slen > 0) && (ret == -1)) { + c = *s; + b64val = table_a2b_base64[c & 0x7f]; + if ( ((c <= 0x7f) && (b64val != (unsigned char)-1)) ) { + if (num == 0) + ret = *s; + num--; + } + + s++; + slen--; + } + return ret; } PyDoc_STRVAR(doc_a2b_base64, "(ascii) -> bin. Decode a line of base64 data"); @@ -361,108 +361,108 @@ PyDoc_STRVAR(doc_a2b_base64, "(ascii) -> bin. Decode a line of base64 data"); static PyObject * binascii_a2b_base64(PyObject *self, PyObject *args) { - Py_buffer pascii; - unsigned char *ascii_data, *bin_data; - int leftbits = 0; - unsigned char this_ch; - unsigned int leftchar = 0; - PyObject *rv; - Py_ssize_t ascii_len, bin_len; - int quad_pos = 0; - - if ( !PyArg_ParseTuple(args, "y*:a2b_base64", &pascii) ) - return NULL; - ascii_data = pascii.buf; - ascii_len = pascii.len; - - assert(ascii_len >= 0); - - if (ascii_len > PY_SSIZE_T_MAX - 3) { - PyBuffer_Release(&pascii); - return PyErr_NoMemory(); - } - - bin_len = ((ascii_len+3)/4)*3; /* Upper bound, corrected later */ - - /* Allocate the buffer */ - if ( (rv=PyBytes_FromStringAndSize(NULL, bin_len)) == NULL ) { - PyBuffer_Release(&pascii); - return NULL; - } - bin_data = (unsigned char *)PyBytes_AS_STRING(rv); - bin_len = 0; - - for( ; ascii_len > 0; ascii_len--, ascii_data++) { - this_ch = *ascii_data; - - if (this_ch > 0x7f || - this_ch == '\r' || this_ch == '\n' || this_ch == ' ') - continue; - - /* Check for pad sequences and ignore - ** the invalid ones. - */ - if (this_ch == BASE64_PAD) { - if ( (quad_pos < 2) || - ((quad_pos == 2) && - (binascii_find_valid(ascii_data, ascii_len, 1) - != BASE64_PAD)) ) - { - continue; - } - else { - /* A pad sequence means no more input. - ** We've already interpreted the data - ** from the quad at this point. - */ - leftbits = 0; - break; - } - } - - this_ch = table_a2b_base64[*ascii_data]; - if ( this_ch == (unsigned char) -1 ) - continue; - - /* - ** Shift it in on the low end, and see if there's - ** a byte ready for output. - */ - quad_pos = (quad_pos + 1) & 0x03; - leftchar = (leftchar << 6) | (this_ch); - leftbits += 6; - - if ( leftbits >= 8 ) { - leftbits -= 8; - *bin_data++ = (leftchar >> leftbits) & 0xff; - bin_len++; - leftchar &= ((1 << leftbits) - 1); - } - } - - if (leftbits != 0) { - PyBuffer_Release(&pascii); - PyErr_SetString(Error, "Incorrect padding"); - Py_DECREF(rv); - return NULL; - } - - /* And set string size correctly. If the result string is empty - ** (because the input was all invalid) return the shared empty - ** string instead; _PyBytes_Resize() won't do this for us. - */ - if (bin_len > 0) { - if (_PyBytes_Resize(&rv, bin_len) < 0) { - Py_DECREF(rv); - rv = NULL; - } - } - else { - Py_DECREF(rv); - rv = PyBytes_FromStringAndSize("", 0); - } - PyBuffer_Release(&pascii); - return rv; + Py_buffer pascii; + unsigned char *ascii_data, *bin_data; + int leftbits = 0; + unsigned char this_ch; + unsigned int leftchar = 0; + PyObject *rv; + Py_ssize_t ascii_len, bin_len; + int quad_pos = 0; + + if ( !PyArg_ParseTuple(args, "y*:a2b_base64", &pascii) ) + return NULL; + ascii_data = pascii.buf; + ascii_len = pascii.len; + + assert(ascii_len >= 0); + + if (ascii_len > PY_SSIZE_T_MAX - 3) { + PyBuffer_Release(&pascii); + return PyErr_NoMemory(); + } + + bin_len = ((ascii_len+3)/4)*3; /* Upper bound, corrected later */ + + /* Allocate the buffer */ + if ( (rv=PyBytes_FromStringAndSize(NULL, bin_len)) == NULL ) { + PyBuffer_Release(&pascii); + return NULL; + } + bin_data = (unsigned char *)PyBytes_AS_STRING(rv); + bin_len = 0; + + for( ; ascii_len > 0; ascii_len--, ascii_data++) { + this_ch = *ascii_data; + + if (this_ch > 0x7f || + this_ch == '\r' || this_ch == '\n' || this_ch == ' ') + continue; + + /* Check for pad sequences and ignore + ** the invalid ones. + */ + if (this_ch == BASE64_PAD) { + if ( (quad_pos < 2) || + ((quad_pos == 2) && + (binascii_find_valid(ascii_data, ascii_len, 1) + != BASE64_PAD)) ) + { + continue; + } + else { + /* A pad sequence means no more input. + ** We've already interpreted the data + ** from the quad at this point. + */ + leftbits = 0; + break; + } + } + + this_ch = table_a2b_base64[*ascii_data]; + if ( this_ch == (unsigned char) -1 ) + continue; + + /* + ** Shift it in on the low end, and see if there's + ** a byte ready for output. + */ + quad_pos = (quad_pos + 1) & 0x03; + leftchar = (leftchar << 6) | (this_ch); + leftbits += 6; + + if ( leftbits >= 8 ) { + leftbits -= 8; + *bin_data++ = (leftchar >> leftbits) & 0xff; + bin_len++; + leftchar &= ((1 << leftbits) - 1); + } + } + + if (leftbits != 0) { + PyBuffer_Release(&pascii); + PyErr_SetString(Error, "Incorrect padding"); + Py_DECREF(rv); + return NULL; + } + + /* And set string size correctly. If the result string is empty + ** (because the input was all invalid) return the shared empty + ** string instead; _PyBytes_Resize() won't do this for us. + */ + if (bin_len > 0) { + if (_PyBytes_Resize(&rv, bin_len) < 0) { + Py_DECREF(rv); + rv = NULL; + } + } + else { + Py_DECREF(rv); + rv = PyBytes_FromStringAndSize("", 0); + } + PyBuffer_Release(&pascii); + return rv; } PyDoc_STRVAR(doc_b2a_base64, "(bin) -> ascii. Base64-code line of data"); @@ -470,66 +470,66 @@ PyDoc_STRVAR(doc_b2a_base64, "(bin) -> ascii. Base64-code line of data"); static PyObject * binascii_b2a_base64(PyObject *self, PyObject *args) { - Py_buffer pbuf; - unsigned char *ascii_data, *bin_data; - int leftbits = 0; - unsigned char this_ch; - unsigned int leftchar = 0; - PyObject *rv; - Py_ssize_t bin_len; - - if ( !PyArg_ParseTuple(args, "y*:b2a_base64", &pbuf) ) - return NULL; - bin_data = pbuf.buf; - bin_len = pbuf.len; - - assert(bin_len >= 0); - - if ( bin_len > BASE64_MAXBIN ) { - PyErr_SetString(Error, "Too much data for base64 line"); - PyBuffer_Release(&pbuf); - return NULL; - } - - /* We're lazy and allocate too much (fixed up later). - "+3" leaves room for up to two pad characters and a trailing - newline. Note that 'b' gets encoded as 'Yg==\n' (1 in, 5 out). */ - if ( (rv=PyBytes_FromStringAndSize(NULL, bin_len*2 + 3)) == NULL ) { - PyBuffer_Release(&pbuf); - return NULL; - } - ascii_data = (unsigned char *)PyBytes_AS_STRING(rv); - - for( ; bin_len > 0 ; bin_len--, bin_data++ ) { - /* Shift the data into our buffer */ - leftchar = (leftchar << 8) | *bin_data; - leftbits += 8; - - /* See if there are 6-bit groups ready */ - while ( leftbits >= 6 ) { - this_ch = (leftchar >> (leftbits-6)) & 0x3f; - leftbits -= 6; - *ascii_data++ = table_b2a_base64[this_ch]; - } - } - if ( leftbits == 2 ) { - *ascii_data++ = table_b2a_base64[(leftchar&3) << 4]; - *ascii_data++ = BASE64_PAD; - *ascii_data++ = BASE64_PAD; - } else if ( leftbits == 4 ) { - *ascii_data++ = table_b2a_base64[(leftchar&0xf) << 2]; - *ascii_data++ = BASE64_PAD; - } - *ascii_data++ = '\n'; /* Append a courtesy newline */ - - if (_PyBytes_Resize(&rv, - (ascii_data - - (unsigned char *)PyBytes_AS_STRING(rv))) < 0) { - Py_DECREF(rv); - rv = NULL; - } - PyBuffer_Release(&pbuf); - return rv; + Py_buffer pbuf; + unsigned char *ascii_data, *bin_data; + int leftbits = 0; + unsigned char this_ch; + unsigned int leftchar = 0; + PyObject *rv; + Py_ssize_t bin_len; + + if ( !PyArg_ParseTuple(args, "y*:b2a_base64", &pbuf) ) + return NULL; + bin_data = pbuf.buf; + bin_len = pbuf.len; + + assert(bin_len >= 0); + + if ( bin_len > BASE64_MAXBIN ) { + PyErr_SetString(Error, "Too much data for base64 line"); + PyBuffer_Release(&pbuf); + return NULL; + } + + /* We're lazy and allocate too much (fixed up later). + "+3" leaves room for up to two pad characters and a trailing + newline. Note that 'b' gets encoded as 'Yg==\n' (1 in, 5 out). */ + if ( (rv=PyBytes_FromStringAndSize(NULL, bin_len*2 + 3)) == NULL ) { + PyBuffer_Release(&pbuf); + return NULL; + } + ascii_data = (unsigned char *)PyBytes_AS_STRING(rv); + + for( ; bin_len > 0 ; bin_len--, bin_data++ ) { + /* Shift the data into our buffer */ + leftchar = (leftchar << 8) | *bin_data; + leftbits += 8; + + /* See if there are 6-bit groups ready */ + while ( leftbits >= 6 ) { + this_ch = (leftchar >> (leftbits-6)) & 0x3f; + leftbits -= 6; + *ascii_data++ = table_b2a_base64[this_ch]; + } + } + if ( leftbits == 2 ) { + *ascii_data++ = table_b2a_base64[(leftchar&3) << 4]; + *ascii_data++ = BASE64_PAD; + *ascii_data++ = BASE64_PAD; + } else if ( leftbits == 4 ) { + *ascii_data++ = table_b2a_base64[(leftchar&0xf) << 2]; + *ascii_data++ = BASE64_PAD; + } + *ascii_data++ = '\n'; /* Append a courtesy newline */ + + if (_PyBytes_Resize(&rv, + (ascii_data - + (unsigned char *)PyBytes_AS_STRING(rv))) < 0) { + Py_DECREF(rv); + rv = NULL; + } + PyBuffer_Release(&pbuf); + return rv; } PyDoc_STRVAR(doc_a2b_hqx, "ascii -> bin, done. Decode .hqx coding"); @@ -537,85 +537,85 @@ PyDoc_STRVAR(doc_a2b_hqx, "ascii -> bin, done. Decode .hqx coding"); static PyObject * binascii_a2b_hqx(PyObject *self, PyObject *args) { - Py_buffer pascii; - unsigned char *ascii_data, *bin_data; - int leftbits = 0; - unsigned char this_ch; - unsigned int leftchar = 0; - PyObject *rv; - Py_ssize_t len; - int done = 0; - - if ( !PyArg_ParseTuple(args, "s*:a2b_hqx", &pascii) ) - return NULL; - ascii_data = pascii.buf; - len = pascii.len; - - assert(len >= 0); - - if (len > PY_SSIZE_T_MAX - 2) { - PyBuffer_Release(&pascii); - return PyErr_NoMemory(); - } - - /* Allocate a string that is too big (fixed later) - Add two to the initial length to prevent interning which - would preclude subsequent resizing. */ - if ( (rv=PyBytes_FromStringAndSize(NULL, len+2)) == NULL ) { - PyBuffer_Release(&pascii); - return NULL; - } - bin_data = (unsigned char *)PyBytes_AS_STRING(rv); - - for( ; len > 0 ; len--, ascii_data++ ) { - /* Get the byte and look it up */ - this_ch = table_a2b_hqx[*ascii_data]; - if ( this_ch == SKIP ) - continue; - if ( this_ch == FAIL ) { - PyErr_SetString(Error, "Illegal char"); - PyBuffer_Release(&pascii); - Py_DECREF(rv); - return NULL; - } - if ( this_ch == DONE ) { - /* The terminating colon */ - done = 1; - break; - } - - /* Shift it into the buffer and see if any bytes are ready */ - leftchar = (leftchar << 6) | (this_ch); - leftbits += 6; - if ( leftbits >= 8 ) { - leftbits -= 8; - *bin_data++ = (leftchar >> leftbits) & 0xff; - leftchar &= ((1 << leftbits) - 1); - } - } - - if ( leftbits && !done ) { - PyErr_SetString(Incomplete, - "String has incomplete number of bytes"); - PyBuffer_Release(&pascii); - Py_DECREF(rv); - return NULL; - } - if (_PyBytes_Resize(&rv, - (bin_data - - (unsigned char *)PyBytes_AS_STRING(rv))) < 0) { - Py_DECREF(rv); - rv = NULL; - } - if (rv) { - PyObject *rrv = Py_BuildValue("Oi", rv, done); - PyBuffer_Release(&pascii); - Py_DECREF(rv); - return rrv; - } - - PyBuffer_Release(&pascii); - return NULL; + Py_buffer pascii; + unsigned char *ascii_data, *bin_data; + int leftbits = 0; + unsigned char this_ch; + unsigned int leftchar = 0; + PyObject *rv; + Py_ssize_t len; + int done = 0; + + if ( !PyArg_ParseTuple(args, "s*:a2b_hqx", &pascii) ) + return NULL; + ascii_data = pascii.buf; + len = pascii.len; + + assert(len >= 0); + + if (len > PY_SSIZE_T_MAX - 2) { + PyBuffer_Release(&pascii); + return PyErr_NoMemory(); + } + + /* Allocate a string that is too big (fixed later) + Add two to the initial length to prevent interning which + would preclude subsequent resizing. */ + if ( (rv=PyBytes_FromStringAndSize(NULL, len+2)) == NULL ) { + PyBuffer_Release(&pascii); + return NULL; + } + bin_data = (unsigned char *)PyBytes_AS_STRING(rv); + + for( ; len > 0 ; len--, ascii_data++ ) { + /* Get the byte and look it up */ + this_ch = table_a2b_hqx[*ascii_data]; + if ( this_ch == SKIP ) + continue; + if ( this_ch == FAIL ) { + PyErr_SetString(Error, "Illegal char"); + PyBuffer_Release(&pascii); + Py_DECREF(rv); + return NULL; + } + if ( this_ch == DONE ) { + /* The terminating colon */ + done = 1; + break; + } + + /* Shift it into the buffer and see if any bytes are ready */ + leftchar = (leftchar << 6) | (this_ch); + leftbits += 6; + if ( leftbits >= 8 ) { + leftbits -= 8; + *bin_data++ = (leftchar >> leftbits) & 0xff; + leftchar &= ((1 << leftbits) - 1); + } + } + + if ( leftbits && !done ) { + PyErr_SetString(Incomplete, + "String has incomplete number of bytes"); + PyBuffer_Release(&pascii); + Py_DECREF(rv); + return NULL; + } + if (_PyBytes_Resize(&rv, + (bin_data - + (unsigned char *)PyBytes_AS_STRING(rv))) < 0) { + Py_DECREF(rv); + rv = NULL; + } + if (rv) { + PyObject *rrv = Py_BuildValue("Oi", rv, done); + PyBuffer_Release(&pascii); + Py_DECREF(rv); + return rrv; + } + + PyBuffer_Release(&pascii); + return NULL; } PyDoc_STRVAR(doc_rlecode_hqx, "Binhex RLE-code binary data"); @@ -623,63 +623,63 @@ PyDoc_STRVAR(doc_rlecode_hqx, "Binhex RLE-code binary data"); static PyObject * binascii_rlecode_hqx(PyObject *self, PyObject *args) { - Py_buffer pbuf; - unsigned char *in_data, *out_data; - PyObject *rv; - unsigned char ch; - Py_ssize_t in, inend, len; - - if ( !PyArg_ParseTuple(args, "y*:rlecode_hqx", &pbuf) ) - return NULL; - in_data = pbuf.buf; - len = pbuf.len; - - assert(len >= 0); - - if (len > PY_SSIZE_T_MAX / 2 - 2) { - PyBuffer_Release(&pbuf); - return PyErr_NoMemory(); - } - - /* Worst case: output is twice as big as input (fixed later) */ - if ( (rv=PyBytes_FromStringAndSize(NULL, len*2+2)) == NULL ) { - PyBuffer_Release(&pbuf); - return NULL; - } - out_data = (unsigned char *)PyBytes_AS_STRING(rv); - - for( in=0; in<len; in++) { - ch = in_data[in]; - if ( ch == RUNCHAR ) { - /* RUNCHAR. Escape it. */ - *out_data++ = RUNCHAR; - *out_data++ = 0; - } else { - /* Check how many following are the same */ - for(inend=in+1; - inend<len && in_data[inend] == ch && - inend < in+255; - inend++) ; - if ( inend - in > 3 ) { - /* More than 3 in a row. Output RLE. */ - *out_data++ = ch; - *out_data++ = RUNCHAR; - *out_data++ = inend-in; - in = inend-1; - } else { - /* Less than 3. Output the byte itself */ - *out_data++ = ch; - } - } - } - if (_PyBytes_Resize(&rv, - (out_data - - (unsigned char *)PyBytes_AS_STRING(rv))) < 0) { - Py_DECREF(rv); - rv = NULL; - } - PyBuffer_Release(&pbuf); - return rv; + Py_buffer pbuf; + unsigned char *in_data, *out_data; + PyObject *rv; + unsigned char ch; + Py_ssize_t in, inend, len; + + if ( !PyArg_ParseTuple(args, "y*:rlecode_hqx", &pbuf) ) + return NULL; + in_data = pbuf.buf; + len = pbuf.len; + + assert(len >= 0); + + if (len > PY_SSIZE_T_MAX / 2 - 2) { + PyBuffer_Release(&pbuf); + return PyErr_NoMemory(); + } + + /* Worst case: output is twice as big as input (fixed later) */ + if ( (rv=PyBytes_FromStringAndSize(NULL, len*2+2)) == NULL ) { + PyBuffer_Release(&pbuf); + return NULL; + } + out_data = (unsigned char *)PyBytes_AS_STRING(rv); + + for( in=0; in<len; in++) { + ch = in_data[in]; + if ( ch == RUNCHAR ) { + /* RUNCHAR. Escape it. */ + *out_data++ = RUNCHAR; + *out_data++ = 0; + } else { + /* Check how many following are the same */ + for(inend=in+1; + inend<len && in_data[inend] == ch && + inend < in+255; + inend++) ; + if ( inend - in > 3 ) { + /* More than 3 in a row. Output RLE. */ + *out_data++ = ch; + *out_data++ = RUNCHAR; + *out_data++ = inend-in; + in = inend-1; + } else { + /* Less than 3. Output the byte itself */ + *out_data++ = ch; + } + } + } + if (_PyBytes_Resize(&rv, + (out_data - + (unsigned char *)PyBytes_AS_STRING(rv))) < 0) { + Py_DECREF(rv); + rv = NULL; + } + PyBuffer_Release(&pbuf); + return rv; } PyDoc_STRVAR(doc_b2a_hqx, "Encode .hqx data"); @@ -687,56 +687,56 @@ PyDoc_STRVAR(doc_b2a_hqx, "Encode .hqx data"); static PyObject * binascii_b2a_hqx(PyObject *self, PyObject *args) { - Py_buffer pbin; - unsigned char *ascii_data, *bin_data; - int leftbits = 0; - unsigned char this_ch; - unsigned int leftchar = 0; - PyObject *rv; - Py_ssize_t len; - - if ( !PyArg_ParseTuple(args, "y*:b2a_hqx", &pbin) ) - return NULL; - bin_data = pbin.buf; - len = pbin.len; - - assert(len >= 0); - - if (len > PY_SSIZE_T_MAX / 2 - 2) { - PyBuffer_Release(&pbin); - return PyErr_NoMemory(); - } - - /* Allocate a buffer that is at least large enough */ - if ( (rv=PyBytes_FromStringAndSize(NULL, len*2+2)) == NULL ) { - PyBuffer_Release(&pbin); - return NULL; - } - ascii_data = (unsigned char *)PyBytes_AS_STRING(rv); - - for( ; len > 0 ; len--, bin_data++ ) { - /* Shift into our buffer, and output any 6bits ready */ - leftchar = (leftchar << 8) | *bin_data; - leftbits += 8; - while ( leftbits >= 6 ) { - this_ch = (leftchar >> (leftbits-6)) & 0x3f; - leftbits -= 6; - *ascii_data++ = table_b2a_hqx[this_ch]; - } - } - /* Output a possible runt byte */ - if ( leftbits ) { - leftchar <<= (6-leftbits); - *ascii_data++ = table_b2a_hqx[leftchar & 0x3f]; - } - if (_PyBytes_Resize(&rv, - (ascii_data - - (unsigned char *)PyBytes_AS_STRING(rv))) < 0) { - Py_DECREF(rv); - rv = NULL; - } - PyBuffer_Release(&pbin); - return rv; + Py_buffer pbin; + unsigned char *ascii_data, *bin_data; + int leftbits = 0; + unsigned char this_ch; + unsigned int leftchar = 0; + PyObject *rv; + Py_ssize_t len; + + if ( !PyArg_ParseTuple(args, "y*:b2a_hqx", &pbin) ) + return NULL; + bin_data = pbin.buf; + len = pbin.len; + + assert(len >= 0); + + if (len > PY_SSIZE_T_MAX / 2 - 2) { + PyBuffer_Release(&pbin); + return PyErr_NoMemory(); + } + + /* Allocate a buffer that is at least large enough */ + if ( (rv=PyBytes_FromStringAndSize(NULL, len*2+2)) == NULL ) { + PyBuffer_Release(&pbin); + return NULL; + } + ascii_data = (unsigned char *)PyBytes_AS_STRING(rv); + + for( ; len > 0 ; len--, bin_data++ ) { + /* Shift into our buffer, and output any 6bits ready */ + leftchar = (leftchar << 8) | *bin_data; + leftbits += 8; + while ( leftbits >= 6 ) { + this_ch = (leftchar >> (leftbits-6)) & 0x3f; + leftbits -= 6; + *ascii_data++ = table_b2a_hqx[this_ch]; + } + } + /* Output a possible runt byte */ + if ( leftbits ) { + leftchar <<= (6-leftbits); + *ascii_data++ = table_b2a_hqx[leftchar & 0x3f]; + } + if (_PyBytes_Resize(&rv, + (ascii_data - + (unsigned char *)PyBytes_AS_STRING(rv))) < 0) { + Py_DECREF(rv); + rv = NULL; + } + PyBuffer_Release(&pbin); + return rv; } PyDoc_STRVAR(doc_rledecode_hqx, "Decode hexbin RLE-coded string"); @@ -744,116 +744,116 @@ PyDoc_STRVAR(doc_rledecode_hqx, "Decode hexbin RLE-coded string"); static PyObject * binascii_rledecode_hqx(PyObject *self, PyObject *args) { - Py_buffer pin; - unsigned char *in_data, *out_data; - unsigned char in_byte, in_repeat; - PyObject *rv; - Py_ssize_t in_len, out_len, out_len_left; - - if ( !PyArg_ParseTuple(args, "s*:rledecode_hqx", &pin) ) - return NULL; - in_data = pin.buf; - in_len = pin.len; - - assert(in_len >= 0); - - /* Empty string is a special case */ - if ( in_len == 0 ) { - PyBuffer_Release(&pin); - return PyBytes_FromStringAndSize("", 0); - } - else if (in_len > PY_SSIZE_T_MAX / 2) { - PyBuffer_Release(&pin); - return PyErr_NoMemory(); - } - - /* Allocate a buffer of reasonable size. Resized when needed */ - out_len = in_len*2; - if ( (rv=PyBytes_FromStringAndSize(NULL, out_len)) == NULL ) { - PyBuffer_Release(&pin); - return NULL; - } - out_len_left = out_len; - out_data = (unsigned char *)PyBytes_AS_STRING(rv); - - /* - ** We need two macros here to get/put bytes and handle - ** end-of-buffer for input and output strings. - */ + Py_buffer pin; + unsigned char *in_data, *out_data; + unsigned char in_byte, in_repeat; + PyObject *rv; + Py_ssize_t in_len, out_len, out_len_left; + + if ( !PyArg_ParseTuple(args, "s*:rledecode_hqx", &pin) ) + return NULL; + in_data = pin.buf; + in_len = pin.len; + + assert(in_len >= 0); + + /* Empty string is a special case */ + if ( in_len == 0 ) { + PyBuffer_Release(&pin); + return PyBytes_FromStringAndSize("", 0); + } + else if (in_len > PY_SSIZE_T_MAX / 2) { + PyBuffer_Release(&pin); + return PyErr_NoMemory(); + } + + /* Allocate a buffer of reasonable size. Resized when needed */ + out_len = in_len*2; + if ( (rv=PyBytes_FromStringAndSize(NULL, out_len)) == NULL ) { + PyBuffer_Release(&pin); + return NULL; + } + out_len_left = out_len; + out_data = (unsigned char *)PyBytes_AS_STRING(rv); + + /* + ** We need two macros here to get/put bytes and handle + ** end-of-buffer for input and output strings. + */ #define INBYTE(b) \ - do { \ - if ( --in_len < 0 ) { \ - PyErr_SetString(Incomplete, ""); \ - Py_DECREF(rv); \ - PyBuffer_Release(&pin); \ - return NULL; \ - } \ - b = *in_data++; \ - } while(0) + do { \ + if ( --in_len < 0 ) { \ + PyErr_SetString(Incomplete, ""); \ + Py_DECREF(rv); \ + PyBuffer_Release(&pin); \ + return NULL; \ + } \ + b = *in_data++; \ + } while(0) #define OUTBYTE(b) \ - do { \ - if ( --out_len_left < 0 ) { \ - if ( out_len > PY_SSIZE_T_MAX / 2) return PyErr_NoMemory(); \ - if (_PyBytes_Resize(&rv, 2*out_len) < 0) \ - { Py_DECREF(rv); PyBuffer_Release(&pin); return NULL; } \ - out_data = (unsigned char *)PyBytes_AS_STRING(rv) \ - + out_len; \ - out_len_left = out_len-1; \ - out_len = out_len * 2; \ - } \ - *out_data++ = b; \ - } while(0) - - /* - ** Handle first byte separately (since we have to get angry - ** in case of an orphaned RLE code). - */ - INBYTE(in_byte); - - if (in_byte == RUNCHAR) { - INBYTE(in_repeat); - if (in_repeat != 0) { - /* Note Error, not Incomplete (which is at the end - ** of the string only). This is a programmer error. - */ - PyErr_SetString(Error, "Orphaned RLE code at start"); - PyBuffer_Release(&pin); - Py_DECREF(rv); - return NULL; - } - OUTBYTE(RUNCHAR); - } else { - OUTBYTE(in_byte); - } - - while( in_len > 0 ) { - INBYTE(in_byte); - - if (in_byte == RUNCHAR) { - INBYTE(in_repeat); - if ( in_repeat == 0 ) { - /* Just an escaped RUNCHAR value */ - OUTBYTE(RUNCHAR); - } else { - /* Pick up value and output a sequence of it */ - in_byte = out_data[-1]; - while ( --in_repeat > 0 ) - OUTBYTE(in_byte); - } - } else { - /* Normal byte */ - OUTBYTE(in_byte); - } - } - if (_PyBytes_Resize(&rv, - (out_data - - (unsigned char *)PyBytes_AS_STRING(rv))) < 0) { - Py_DECREF(rv); - rv = NULL; - } - PyBuffer_Release(&pin); - return rv; + do { \ + if ( --out_len_left < 0 ) { \ + if ( out_len > PY_SSIZE_T_MAX / 2) return PyErr_NoMemory(); \ + if (_PyBytes_Resize(&rv, 2*out_len) < 0) \ + { Py_DECREF(rv); PyBuffer_Release(&pin); return NULL; } \ + out_data = (unsigned char *)PyBytes_AS_STRING(rv) \ + + out_len; \ + out_len_left = out_len-1; \ + out_len = out_len * 2; \ + } \ + *out_data++ = b; \ + } while(0) + + /* + ** Handle first byte separately (since we have to get angry + ** in case of an orphaned RLE code). + */ + INBYTE(in_byte); + + if (in_byte == RUNCHAR) { + INBYTE(in_repeat); + if (in_repeat != 0) { + /* Note Error, not Incomplete (which is at the end + ** of the string only). This is a programmer error. + */ + PyErr_SetString(Error, "Orphaned RLE code at start"); + PyBuffer_Release(&pin); + Py_DECREF(rv); + return NULL; + } + OUTBYTE(RUNCHAR); + } else { + OUTBYTE(in_byte); + } + + while( in_len > 0 ) { + INBYTE(in_byte); + + if (in_byte == RUNCHAR) { + INBYTE(in_repeat); + if ( in_repeat == 0 ) { + /* Just an escaped RUNCHAR value */ + OUTBYTE(RUNCHAR); + } else { + /* Pick up value and output a sequence of it */ + in_byte = out_data[-1]; + while ( --in_repeat > 0 ) + OUTBYTE(in_byte); + } + } else { + /* Normal byte */ + OUTBYTE(in_byte); + } + } + if (_PyBytes_Resize(&rv, + (out_data - + (unsigned char *)PyBytes_AS_STRING(rv))) < 0) { + Py_DECREF(rv); + rv = NULL; + } + PyBuffer_Release(&pin); + return rv; } PyDoc_STRVAR(doc_crc_hqx, @@ -862,22 +862,22 @@ PyDoc_STRVAR(doc_crc_hqx, static PyObject * binascii_crc_hqx(PyObject *self, PyObject *args) { - Py_buffer pin; - unsigned char *bin_data; - unsigned int crc; - Py_ssize_t len; - - if ( !PyArg_ParseTuple(args, "y*i:crc_hqx", &pin, &crc) ) - return NULL; - bin_data = pin.buf; - len = pin.len; - - while(len-- > 0) { - crc=((crc<<8)&0xff00)^crctab_hqx[((crc>>8)&0xff)^*bin_data++]; - } - - PyBuffer_Release(&pin); - return Py_BuildValue("i", crc); + Py_buffer pin; + unsigned char *bin_data; + unsigned int crc; + Py_ssize_t len; + + if ( !PyArg_ParseTuple(args, "y*i:crc_hqx", &pin, &crc) ) + return NULL; + bin_data = pin.buf; + len = pin.len; + + while(len-- > 0) { + crc=((crc<<8)&0xff00)^crctab_hqx[((crc>>8)&0xff)^*bin_data++]; + } + + PyBuffer_Release(&pin); + return Py_BuildValue("i", crc); } PyDoc_STRVAR(doc_crc32, @@ -895,7 +895,7 @@ binascii_crc32(PyObject *self, PyObject *args) int signed_val; if (!PyArg_ParseTuple(args, "y*|I:crc32", &pbuf, &crc32val)) - return NULL; + return NULL; buf = (Byte*)pbuf.buf; len = pbuf.len; signed_val = crc32(crc32val, buf, len); @@ -1024,26 +1024,26 @@ static unsigned int crc_32_tab[256] = { static PyObject * binascii_crc32(PyObject *self, PyObject *args) { /* By Jim Ahlstrom; All rights transferred to CNRI */ - Py_buffer pbin; - unsigned char *bin_data; - unsigned int crc = 0; /* initial value of CRC */ - Py_ssize_t len; - unsigned int result; - - if ( !PyArg_ParseTuple(args, "y*|I:crc32", &pbin, &crc) ) - return NULL; - bin_data = pbin.buf; - len = pbin.len; - - crc = ~ crc; - while (len-- > 0) { - crc = crc_32_tab[(crc ^ *bin_data++) & 0xff] ^ (crc >> 8); - /* Note: (crc >> 8) MUST zero fill on left */ - } - - result = (crc ^ 0xFFFFFFFF); - PyBuffer_Release(&pbin); - return PyLong_FromUnsignedLong(result & 0xffffffff); + Py_buffer pbin; + unsigned char *bin_data; + unsigned int crc = 0; /* initial value of CRC */ + Py_ssize_t len; + unsigned int result; + + if ( !PyArg_ParseTuple(args, "y*|I:crc32", &pbin, &crc) ) + return NULL; + bin_data = pbin.buf; + len = pbin.len; + + crc = ~ crc; + while (len-- > 0) { + crc = crc_32_tab[(crc ^ *bin_data++) & 0xff] ^ (crc >> 8); + /* Note: (crc >> 8) MUST zero fill on left */ + } + + result = (crc ^ 0xFFFFFFFF); + PyBuffer_Release(&pbin); + return PyLong_FromUnsignedLong(result & 0xffffffff); } #endif /* USE_ZLIB_CRC32 */ @@ -1051,43 +1051,43 @@ binascii_crc32(PyObject *self, PyObject *args) static PyObject * binascii_hexlify(PyObject *self, PyObject *args) { - Py_buffer parg; - char* argbuf; - Py_ssize_t arglen; - PyObject *retval; - char* retbuf; - Py_ssize_t i, j; - - if (!PyArg_ParseTuple(args, "y*:b2a_hex", &parg)) - return NULL; - argbuf = parg.buf; - arglen = parg.len; - - assert(arglen >= 0); - if (arglen > PY_SSIZE_T_MAX / 2) { - PyBuffer_Release(&parg); - return PyErr_NoMemory(); - } - - retval = PyBytes_FromStringAndSize(NULL, arglen*2); - if (!retval) { - PyBuffer_Release(&parg); - return NULL; - } - retbuf = PyBytes_AS_STRING(retval); - - /* make hex version of string, taken from shamodule.c */ - for (i=j=0; i < arglen; i++) { - char c; - c = (argbuf[i] >> 4) & 0xf; - c = (c>9) ? c+'a'-10 : c + '0'; - retbuf[j++] = c; - c = argbuf[i] & 0xf; - c = (c>9) ? c+'a'-10 : c + '0'; - retbuf[j++] = c; - } - PyBuffer_Release(&parg); - return retval; + Py_buffer parg; + char* argbuf; + Py_ssize_t arglen; + PyObject *retval; + char* retbuf; + Py_ssize_t i, j; + + if (!PyArg_ParseTuple(args, "y*:b2a_hex", &parg)) + return NULL; + argbuf = parg.buf; + arglen = parg.len; + + assert(arglen >= 0); + if (arglen > PY_SSIZE_T_MAX / 2) { + PyBuffer_Release(&parg); + return PyErr_NoMemory(); + } + + retval = PyBytes_FromStringAndSize(NULL, arglen*2); + if (!retval) { + PyBuffer_Release(&parg); + return NULL; + } + retbuf = PyBytes_AS_STRING(retval); + + /* make hex version of string, taken from shamodule.c */ + for (i=j=0; i < arglen; i++) { + char c; + c = (argbuf[i] >> 4) & 0xf; + c = (c>9) ? c+'a'-10 : c + '0'; + retbuf[j++] = c; + c = argbuf[i] & 0xf; + c = (c>9) ? c+'a'-10 : c + '0'; + retbuf[j++] = c; + } + PyBuffer_Release(&parg); + return retval; } PyDoc_STRVAR(doc_hexlify, @@ -1099,69 +1099,69 @@ This function is also available as \"hexlify()\"."); static int to_int(int c) { - if (isdigit(c)) - return c - '0'; - else { - if (isupper(c)) - c = tolower(c); - if (c >= 'a' && c <= 'f') - return c - 'a' + 10; - } - return -1; + if (isdigit(c)) + return c - '0'; + else { + if (isupper(c)) + c = tolower(c); + if (c >= 'a' && c <= 'f') + return c - 'a' + 10; + } + return -1; } static PyObject * binascii_unhexlify(PyObject *self, PyObject *args) { - Py_buffer parg; - char* argbuf; - Py_ssize_t arglen; - PyObject *retval; - char* retbuf; - Py_ssize_t i, j; - - if (!PyArg_ParseTuple(args, "s*:a2b_hex", &parg)) - return NULL; - argbuf = parg.buf; - arglen = parg.len; - - assert(arglen >= 0); - - /* XXX What should we do about strings with an odd length? Should - * we add an implicit leading zero, or a trailing zero? For now, - * raise an exception. - */ - if (arglen % 2) { - PyBuffer_Release(&parg); - PyErr_SetString(Error, "Odd-length string"); - return NULL; - } - - retval = PyBytes_FromStringAndSize(NULL, (arglen/2)); - if (!retval) { - PyBuffer_Release(&parg); - return NULL; - } - retbuf = PyBytes_AS_STRING(retval); - - for (i=j=0; i < arglen; i += 2) { - int top = to_int(Py_CHARMASK(argbuf[i])); - int bot = to_int(Py_CHARMASK(argbuf[i+1])); - if (top == -1 || bot == -1) { - PyErr_SetString(Error, - "Non-hexadecimal digit found"); - goto finally; - } - retbuf[j++] = (top << 4) + bot; - } - PyBuffer_Release(&parg); - return retval; + Py_buffer parg; + char* argbuf; + Py_ssize_t arglen; + PyObject *retval; + char* retbuf; + Py_ssize_t i, j; + + if (!PyArg_ParseTuple(args, "s*:a2b_hex", &parg)) + return NULL; + argbuf = parg.buf; + arglen = parg.len; + + assert(arglen >= 0); + + /* XXX What should we do about strings with an odd length? Should + * we add an implicit leading zero, or a trailing zero? For now, + * raise an exception. + */ + if (arglen % 2) { + PyBuffer_Release(&parg); + PyErr_SetString(Error, "Odd-length string"); + return NULL; + } + + retval = PyBytes_FromStringAndSize(NULL, (arglen/2)); + if (!retval) { + PyBuffer_Release(&parg); + return NULL; + } + retbuf = PyBytes_AS_STRING(retval); + + for (i=j=0; i < arglen; i += 2) { + int top = to_int(Py_CHARMASK(argbuf[i])); + int bot = to_int(Py_CHARMASK(argbuf[i+1])); + if (top == -1 || bot == -1) { + PyErr_SetString(Error, + "Non-hexadecimal digit found"); + goto finally; + } + retbuf[j++] = (top << 4) + bot; + } + PyBuffer_Release(&parg); + return retval; finally: - PyBuffer_Release(&parg); - Py_DECREF(retval); - return NULL; + PyBuffer_Release(&parg); + Py_DECREF(retval); + return NULL; } PyDoc_STRVAR(doc_unhexlify, @@ -1190,96 +1190,96 @@ PyDoc_STRVAR(doc_a2b_qp, "Decode a string of qp-encoded data"); static PyObject* binascii_a2b_qp(PyObject *self, PyObject *args, PyObject *kwargs) { - Py_ssize_t in, out; - char ch; - Py_buffer pdata; - unsigned char *data, *odata; - Py_ssize_t datalen = 0; - PyObject *rv; - static char *kwlist[] = {"data", "header", NULL}; - int header = 0; - - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s*|i", kwlist, &pdata, - &header)) - return NULL; - data = pdata.buf; - datalen = pdata.len; - - /* We allocate the output same size as input, this is overkill. - * The previous implementation used calloc() so we'll zero out the - * memory here too, since PyMem_Malloc() does not guarantee that. - */ - odata = (unsigned char *) PyMem_Malloc(datalen); - if (odata == NULL) { - PyBuffer_Release(&pdata); - PyErr_NoMemory(); - return NULL; - } - memset(odata, 0, datalen); - - in = out = 0; - while (in < datalen) { - if (data[in] == '=') { - in++; - if (in >= datalen) break; - /* Soft line breaks */ - if ((data[in] == '\n') || (data[in] == '\r')) { - if (data[in] != '\n') { - while (in < datalen && data[in] != '\n') in++; - } - if (in < datalen) in++; - } - else if (data[in] == '=') { - /* broken case from broken python qp */ - odata[out++] = '='; - in++; - } - else if (((data[in] >= 'A' && data[in] <= 'F') || - (data[in] >= 'a' && data[in] <= 'f') || - (data[in] >= '0' && data[in] <= '9')) && - ((data[in+1] >= 'A' && data[in+1] <= 'F') || - (data[in+1] >= 'a' && data[in+1] <= 'f') || - (data[in+1] >= '0' && data[in+1] <= '9'))) { - /* hexval */ - ch = hexval(data[in]) << 4; - in++; - ch |= hexval(data[in]); - in++; - odata[out++] = ch; - } - else { - odata[out++] = '='; - } - } - else if (header && data[in] == '_') { - odata[out++] = ' '; - in++; - } - else { - odata[out] = data[in]; - in++; - out++; - } - } - if ((rv = PyBytes_FromStringAndSize((char *)odata, out)) == NULL) { - PyBuffer_Release(&pdata); - PyMem_Free(odata); - return NULL; - } - PyBuffer_Release(&pdata); - PyMem_Free(odata); - return rv; + Py_ssize_t in, out; + char ch; + Py_buffer pdata; + unsigned char *data, *odata; + Py_ssize_t datalen = 0; + PyObject *rv; + static char *kwlist[] = {"data", "header", NULL}; + int header = 0; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s*|i", kwlist, &pdata, + &header)) + return NULL; + data = pdata.buf; + datalen = pdata.len; + + /* We allocate the output same size as input, this is overkill. + * The previous implementation used calloc() so we'll zero out the + * memory here too, since PyMem_Malloc() does not guarantee that. + */ + odata = (unsigned char *) PyMem_Malloc(datalen); + if (odata == NULL) { + PyBuffer_Release(&pdata); + PyErr_NoMemory(); + return NULL; + } + memset(odata, 0, datalen); + + in = out = 0; + while (in < datalen) { + if (data[in] == '=') { + in++; + if (in >= datalen) break; + /* Soft line breaks */ + if ((data[in] == '\n') || (data[in] == '\r')) { + if (data[in] != '\n') { + while (in < datalen && data[in] != '\n') in++; + } + if (in < datalen) in++; + } + else if (data[in] == '=') { + /* broken case from broken python qp */ + odata[out++] = '='; + in++; + } + else if (((data[in] >= 'A' && data[in] <= 'F') || + (data[in] >= 'a' && data[in] <= 'f') || + (data[in] >= '0' && data[in] <= '9')) && + ((data[in+1] >= 'A' && data[in+1] <= 'F') || + (data[in+1] >= 'a' && data[in+1] <= 'f') || + (data[in+1] >= '0' && data[in+1] <= '9'))) { + /* hexval */ + ch = hexval(data[in]) << 4; + in++; + ch |= hexval(data[in]); + in++; + odata[out++] = ch; + } + else { + odata[out++] = '='; + } + } + else if (header && data[in] == '_') { + odata[out++] = ' '; + in++; + } + else { + odata[out] = data[in]; + in++; + out++; + } + } + if ((rv = PyBytes_FromStringAndSize((char *)odata, out)) == NULL) { + PyBuffer_Release(&pdata); + PyMem_Free(odata); + return NULL; + } + PyBuffer_Release(&pdata); + PyMem_Free(odata); + return rv; } static int to_hex (unsigned char ch, unsigned char *s) { - unsigned int uvalue = ch; + unsigned int uvalue = ch; - s[1] = "0123456789ABCDEF"[uvalue % 16]; - uvalue = (uvalue / 16); - s[0] = "0123456789ABCDEF"[uvalue % 16]; - return 0; + s[1] = "0123456789ABCDEF"[uvalue % 16]; + uvalue = (uvalue / 16); + s[0] = "0123456789ABCDEF"[uvalue % 16]; + return 0; } PyDoc_STRVAR(doc_b2a_qp, @@ -1296,210 +1296,210 @@ both encoded. When quotetabs is set, space and tabs are encoded."); static PyObject* binascii_b2a_qp (PyObject *self, PyObject *args, PyObject *kwargs) { - Py_ssize_t in, out; - Py_buffer pdata; - unsigned char *data, *odata; - Py_ssize_t datalen = 0, odatalen = 0; - PyObject *rv; - unsigned int linelen = 0; - static char *kwlist[] = {"data", "quotetabs", "istext", - "header", NULL}; - int istext = 1; - int quotetabs = 0; - int header = 0; - unsigned char ch; - int crlf = 0; - unsigned char *p; - - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "y*|iii", kwlist, &pdata, - "etabs, &istext, &header)) - return NULL; - data = pdata.buf; - datalen = pdata.len; - - /* See if this string is using CRLF line ends */ - /* XXX: this function has the side effect of converting all of - * the end of lines to be the same depending on this detection - * here */ - p = (unsigned char *) memchr(data, '\n', datalen); - if ((p != NULL) && (p > data) && (*(p-1) == '\r')) - crlf = 1; - - /* First, scan to see how many characters need to be encoded */ - in = 0; - while (in < datalen) { - if ((data[in] > 126) || - (data[in] == '=') || - (header && data[in] == '_') || - ((data[in] == '.') && (linelen == 0) && - (data[in+1] == '\n' || data[in+1] == '\r' || data[in+1] == 0)) || - (!istext && ((data[in] == '\r') || (data[in] == '\n'))) || - ((data[in] == '\t' || data[in] == ' ') && (in + 1 == datalen)) || - ((data[in] < 33) && - (data[in] != '\r') && (data[in] != '\n') && - (quotetabs || - (!quotetabs && ((data[in] != '\t') && (data[in] != ' ')))))) - { - if ((linelen + 3) >= MAXLINESIZE) { - linelen = 0; - if (crlf) - odatalen += 3; - else - odatalen += 2; - } - linelen += 3; - odatalen += 3; - in++; - } - else { - if (istext && - ((data[in] == '\n') || - ((in+1 < datalen) && (data[in] == '\r') && - (data[in+1] == '\n')))) - { - linelen = 0; - /* Protect against whitespace on end of line */ - if (in && ((data[in-1] == ' ') || (data[in-1] == '\t'))) - odatalen += 2; - if (crlf) - odatalen += 2; - else - odatalen += 1; - if (data[in] == '\r') - in += 2; - else - in++; - } - else { - if ((in + 1 != datalen) && - (data[in+1] != '\n') && - (linelen + 1) >= MAXLINESIZE) { - linelen = 0; - if (crlf) - odatalen += 3; - else - odatalen += 2; - } - linelen++; - odatalen++; - in++; - } - } - } - - /* We allocate the output same size as input, this is overkill. - * The previous implementation used calloc() so we'll zero out the - * memory here too, since PyMem_Malloc() does not guarantee that. - */ - odata = (unsigned char *) PyMem_Malloc(odatalen); - if (odata == NULL) { - PyBuffer_Release(&pdata); - PyErr_NoMemory(); - return NULL; - } - memset(odata, 0, odatalen); - - in = out = linelen = 0; - while (in < datalen) { - if ((data[in] > 126) || - (data[in] == '=') || - (header && data[in] == '_') || - ((data[in] == '.') && (linelen == 0) && - (data[in+1] == '\n' || data[in+1] == '\r' || data[in+1] == 0)) || - (!istext && ((data[in] == '\r') || (data[in] == '\n'))) || - ((data[in] == '\t' || data[in] == ' ') && (in + 1 == datalen)) || - ((data[in] < 33) && - (data[in] != '\r') && (data[in] != '\n') && - (quotetabs || - (!quotetabs && ((data[in] != '\t') && (data[in] != ' ')))))) - { - if ((linelen + 3 )>= MAXLINESIZE) { - odata[out++] = '='; - if (crlf) odata[out++] = '\r'; - odata[out++] = '\n'; - linelen = 0; - } - odata[out++] = '='; - to_hex(data[in], &odata[out]); - out += 2; - in++; - linelen += 3; - } - else { - if (istext && - ((data[in] == '\n') || - ((in+1 < datalen) && (data[in] == '\r') && - (data[in+1] == '\n')))) - { - linelen = 0; - /* Protect against whitespace on end of line */ - if (out && ((odata[out-1] == ' ') || (odata[out-1] == '\t'))) { - ch = odata[out-1]; - odata[out-1] = '='; - to_hex(ch, &odata[out]); - out += 2; - } - - if (crlf) odata[out++] = '\r'; - odata[out++] = '\n'; - if (data[in] == '\r') - in += 2; - else - in++; - } - else { - if ((in + 1 != datalen) && - (data[in+1] != '\n') && - (linelen + 1) >= MAXLINESIZE) { - odata[out++] = '='; - if (crlf) odata[out++] = '\r'; - odata[out++] = '\n'; - linelen = 0; - } - linelen++; - if (header && data[in] == ' ') { - odata[out++] = '_'; - in++; - } - else { - odata[out++] = data[in++]; - } - } - } - } - if ((rv = PyBytes_FromStringAndSize((char *)odata, out)) == NULL) { - PyBuffer_Release(&pdata); - PyMem_Free(odata); - return NULL; - } - PyBuffer_Release(&pdata); - PyMem_Free(odata); - return rv; + Py_ssize_t in, out; + Py_buffer pdata; + unsigned char *data, *odata; + Py_ssize_t datalen = 0, odatalen = 0; + PyObject *rv; + unsigned int linelen = 0; + static char *kwlist[] = {"data", "quotetabs", "istext", + "header", NULL}; + int istext = 1; + int quotetabs = 0; + int header = 0; + unsigned char ch; + int crlf = 0; + unsigned char *p; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "y*|iii", kwlist, &pdata, + "etabs, &istext, &header)) + return NULL; + data = pdata.buf; + datalen = pdata.len; + + /* See if this string is using CRLF line ends */ + /* XXX: this function has the side effect of converting all of + * the end of lines to be the same depending on this detection + * here */ + p = (unsigned char *) memchr(data, '\n', datalen); + if ((p != NULL) && (p > data) && (*(p-1) == '\r')) + crlf = 1; + + /* First, scan to see how many characters need to be encoded */ + in = 0; + while (in < datalen) { + if ((data[in] > 126) || + (data[in] == '=') || + (header && data[in] == '_') || + ((data[in] == '.') && (linelen == 0) && + (data[in+1] == '\n' || data[in+1] == '\r' || data[in+1] == 0)) || + (!istext && ((data[in] == '\r') || (data[in] == '\n'))) || + ((data[in] == '\t' || data[in] == ' ') && (in + 1 == datalen)) || + ((data[in] < 33) && + (data[in] != '\r') && (data[in] != '\n') && + (quotetabs || + (!quotetabs && ((data[in] != '\t') && (data[in] != ' ')))))) + { + if ((linelen + 3) >= MAXLINESIZE) { + linelen = 0; + if (crlf) + odatalen += 3; + else + odatalen += 2; + } + linelen += 3; + odatalen += 3; + in++; + } + else { + if (istext && + ((data[in] == '\n') || + ((in+1 < datalen) && (data[in] == '\r') && + (data[in+1] == '\n')))) + { + linelen = 0; + /* Protect against whitespace on end of line */ + if (in && ((data[in-1] == ' ') || (data[in-1] == '\t'))) + odatalen += 2; + if (crlf) + odatalen += 2; + else + odatalen += 1; + if (data[in] == '\r') + in += 2; + else + in++; + } + else { + if ((in + 1 != datalen) && + (data[in+1] != '\n') && + (linelen + 1) >= MAXLINESIZE) { + linelen = 0; + if (crlf) + odatalen += 3; + else + odatalen += 2; + } + linelen++; + odatalen++; + in++; + } + } + } + + /* We allocate the output same size as input, this is overkill. + * The previous implementation used calloc() so we'll zero out the + * memory here too, since PyMem_Malloc() does not guarantee that. + */ + odata = (unsigned char *) PyMem_Malloc(odatalen); + if (odata == NULL) { + PyBuffer_Release(&pdata); + PyErr_NoMemory(); + return NULL; + } + memset(odata, 0, odatalen); + + in = out = linelen = 0; + while (in < datalen) { + if ((data[in] > 126) || + (data[in] == '=') || + (header && data[in] == '_') || + ((data[in] == '.') && (linelen == 0) && + (data[in+1] == '\n' || data[in+1] == '\r' || data[in+1] == 0)) || + (!istext && ((data[in] == '\r') || (data[in] == '\n'))) || + ((data[in] == '\t' || data[in] == ' ') && (in + 1 == datalen)) || + ((data[in] < 33) && + (data[in] != '\r') && (data[in] != '\n') && + (quotetabs || + (!quotetabs && ((data[in] != '\t') && (data[in] != ' ')))))) + { + if ((linelen + 3 )>= MAXLINESIZE) { + odata[out++] = '='; + if (crlf) odata[out++] = '\r'; + odata[out++] = '\n'; + linelen = 0; + } + odata[out++] = '='; + to_hex(data[in], &odata[out]); + out += 2; + in++; + linelen += 3; + } + else { + if (istext && + ((data[in] == '\n') || + ((in+1 < datalen) && (data[in] == '\r') && + (data[in+1] == '\n')))) + { + linelen = 0; + /* Protect against whitespace on end of line */ + if (out && ((odata[out-1] == ' ') || (odata[out-1] == '\t'))) { + ch = odata[out-1]; + odata[out-1] = '='; + to_hex(ch, &odata[out]); + out += 2; + } + + if (crlf) odata[out++] = '\r'; + odata[out++] = '\n'; + if (data[in] == '\r') + in += 2; + else + in++; + } + else { + if ((in + 1 != datalen) && + (data[in+1] != '\n') && + (linelen + 1) >= MAXLINESIZE) { + odata[out++] = '='; + if (crlf) odata[out++] = '\r'; + odata[out++] = '\n'; + linelen = 0; + } + linelen++; + if (header && data[in] == ' ') { + odata[out++] = '_'; + in++; + } + else { + odata[out++] = data[in++]; + } + } + } + } + if ((rv = PyBytes_FromStringAndSize((char *)odata, out)) == NULL) { + PyBuffer_Release(&pdata); + PyMem_Free(odata); + return NULL; + } + PyBuffer_Release(&pdata); + PyMem_Free(odata); + return rv; } /* List of functions defined in the module */ static struct PyMethodDef binascii_module_methods[] = { - {"a2b_uu", binascii_a2b_uu, METH_VARARGS, doc_a2b_uu}, - {"b2a_uu", binascii_b2a_uu, METH_VARARGS, doc_b2a_uu}, - {"a2b_base64", binascii_a2b_base64, METH_VARARGS, doc_a2b_base64}, - {"b2a_base64", binascii_b2a_base64, METH_VARARGS, doc_b2a_base64}, - {"a2b_hqx", binascii_a2b_hqx, METH_VARARGS, doc_a2b_hqx}, - {"b2a_hqx", binascii_b2a_hqx, METH_VARARGS, doc_b2a_hqx}, - {"b2a_hex", binascii_hexlify, METH_VARARGS, doc_hexlify}, - {"a2b_hex", binascii_unhexlify, METH_VARARGS, doc_unhexlify}, - {"hexlify", binascii_hexlify, METH_VARARGS, doc_hexlify}, - {"unhexlify", binascii_unhexlify, METH_VARARGS, doc_unhexlify}, - {"rlecode_hqx", binascii_rlecode_hqx, METH_VARARGS, doc_rlecode_hqx}, - {"rledecode_hqx", binascii_rledecode_hqx, METH_VARARGS, - doc_rledecode_hqx}, - {"crc_hqx", binascii_crc_hqx, METH_VARARGS, doc_crc_hqx}, - {"crc32", binascii_crc32, METH_VARARGS, doc_crc32}, - {"a2b_qp", (PyCFunction)binascii_a2b_qp, METH_VARARGS | METH_KEYWORDS, - doc_a2b_qp}, - {"b2a_qp", (PyCFunction)binascii_b2a_qp, METH_VARARGS | METH_KEYWORDS, - doc_b2a_qp}, - {NULL, NULL} /* sentinel */ + {"a2b_uu", binascii_a2b_uu, METH_VARARGS, doc_a2b_uu}, + {"b2a_uu", binascii_b2a_uu, METH_VARARGS, doc_b2a_uu}, + {"a2b_base64", binascii_a2b_base64, METH_VARARGS, doc_a2b_base64}, + {"b2a_base64", binascii_b2a_base64, METH_VARARGS, doc_b2a_base64}, + {"a2b_hqx", binascii_a2b_hqx, METH_VARARGS, doc_a2b_hqx}, + {"b2a_hqx", binascii_b2a_hqx, METH_VARARGS, doc_b2a_hqx}, + {"b2a_hex", binascii_hexlify, METH_VARARGS, doc_hexlify}, + {"a2b_hex", binascii_unhexlify, METH_VARARGS, doc_unhexlify}, + {"hexlify", binascii_hexlify, METH_VARARGS, doc_hexlify}, + {"unhexlify", binascii_unhexlify, METH_VARARGS, doc_unhexlify}, + {"rlecode_hqx", binascii_rlecode_hqx, METH_VARARGS, doc_rlecode_hqx}, + {"rledecode_hqx", binascii_rledecode_hqx, METH_VARARGS, + doc_rledecode_hqx}, + {"crc_hqx", binascii_crc_hqx, METH_VARARGS, doc_crc_hqx}, + {"crc32", binascii_crc32, METH_VARARGS, doc_crc32}, + {"a2b_qp", (PyCFunction)binascii_a2b_qp, METH_VARARGS | METH_KEYWORDS, + doc_a2b_qp}, + {"b2a_qp", (PyCFunction)binascii_b2a_qp, METH_VARARGS | METH_KEYWORDS, + doc_b2a_qp}, + {NULL, NULL} /* sentinel */ }; @@ -1508,36 +1508,36 @@ PyDoc_STRVAR(doc_binascii, "Conversion between binary data and ASCII"); static struct PyModuleDef binasciimodule = { - PyModuleDef_HEAD_INIT, - "binascii", - doc_binascii, - -1, - binascii_module_methods, - NULL, - NULL, - NULL, - NULL + PyModuleDef_HEAD_INIT, + "binascii", + doc_binascii, + -1, + binascii_module_methods, + NULL, + NULL, + NULL, + NULL }; PyMODINIT_FUNC PyInit_binascii(void) { - PyObject *m, *d; - - /* Create the module and add the functions */ - m = PyModule_Create(&binasciimodule); - if (m == NULL) - return NULL; - - d = PyModule_GetDict(m); - - Error = PyErr_NewException("binascii.Error", PyExc_ValueError, NULL); - PyDict_SetItemString(d, "Error", Error); - Incomplete = PyErr_NewException("binascii.Incomplete", NULL, NULL); - PyDict_SetItemString(d, "Incomplete", Incomplete); - if (PyErr_Occurred()) { - Py_DECREF(m); - m = NULL; - } - return m; + PyObject *m, *d; + + /* Create the module and add the functions */ + m = PyModule_Create(&binasciimodule); + if (m == NULL) + return NULL; + + d = PyModule_GetDict(m); + + Error = PyErr_NewException("binascii.Error", PyExc_ValueError, NULL); + PyDict_SetItemString(d, "Error", Error); + Incomplete = PyErr_NewException("binascii.Incomplete", NULL, NULL); + PyDict_SetItemString(d, "Incomplete", Incomplete); + if (PyErr_Occurred()) { + Py_DECREF(m); + m = NULL; + } + return m; } |