diff options
Diffstat (limited to 'crypto/heimdal/lib/wind')
-rw-r--r-- | crypto/heimdal/lib/wind/bidi_table.c | 2 | ||||
-rw-r--r-- | crypto/heimdal/lib/wind/bidi_table.h | 2 | ||||
-rw-r--r-- | crypto/heimdal/lib/wind/combining_table.c | 2 | ||||
-rw-r--r-- | crypto/heimdal/lib/wind/combining_table.h | 2 | ||||
-rw-r--r-- | crypto/heimdal/lib/wind/errorlist_table.c | 2 | ||||
-rw-r--r-- | crypto/heimdal/lib/wind/errorlist_table.h | 2 | ||||
-rw-r--r-- | crypto/heimdal/lib/wind/map_table.c | 2 | ||||
-rw-r--r-- | crypto/heimdal/lib/wind/map_table.h | 2 | ||||
-rw-r--r-- | crypto/heimdal/lib/wind/normalize_table.c | 2 | ||||
-rw-r--r-- | crypto/heimdal/lib/wind/normalize_table.h | 2 | ||||
-rw-r--r-- | crypto/heimdal/lib/wind/punycode_examples.c | 2 | ||||
-rw-r--r-- | crypto/heimdal/lib/wind/punycode_examples.h | 2 | ||||
-rw-r--r-- | crypto/heimdal/lib/wind/utf8.c | 18 | ||||
-rw-r--r-- | crypto/heimdal/lib/wind/version-script.map | 1 |
14 files changed, 22 insertions, 21 deletions
diff --git a/crypto/heimdal/lib/wind/bidi_table.c b/crypto/heimdal/lib/wind/bidi_table.c index 7d703f6..31de1ee 100644 --- a/crypto/heimdal/lib/wind/bidi_table.c +++ b/crypto/heimdal/lib/wind/bidi_table.c @@ -1,5 +1,5 @@ /* ./bidi_table.c */ -/* Automatically generated at 2011-09-30T15:24:58.936201 */ +/* Automatically generated at 2012-01-11T14:07:00.535499 */ #include <stdlib.h> diff --git a/crypto/heimdal/lib/wind/bidi_table.h b/crypto/heimdal/lib/wind/bidi_table.h index 45556a3..c317b4d 100644 --- a/crypto/heimdal/lib/wind/bidi_table.h +++ b/crypto/heimdal/lib/wind/bidi_table.h @@ -1,5 +1,5 @@ /* ./bidi_table.h */ -/* Automatically generated at 2011-09-30T15:24:58.927315 */ +/* Automatically generated at 2012-01-11T14:07:00.534628 */ #ifndef BIDI_TABLE_H #define BIDI_TABLE_H 1 diff --git a/crypto/heimdal/lib/wind/combining_table.c b/crypto/heimdal/lib/wind/combining_table.c index 814e39e..4a16772 100644 --- a/crypto/heimdal/lib/wind/combining_table.c +++ b/crypto/heimdal/lib/wind/combining_table.c @@ -1,5 +1,5 @@ /* ./combining_table.c */ -/* Automatically generated at 2011-09-30T15:24:59.280091 */ +/* Automatically generated at 2012-01-11T14:07:00.838826 */ #include <stdlib.h> diff --git a/crypto/heimdal/lib/wind/combining_table.h b/crypto/heimdal/lib/wind/combining_table.h index 05a790b..47599cc 100644 --- a/crypto/heimdal/lib/wind/combining_table.h +++ b/crypto/heimdal/lib/wind/combining_table.h @@ -1,5 +1,5 @@ /* ./combining_table.h */ -/* Automatically generated at 2011-09-30T15:24:59.272235 */ +/* Automatically generated at 2012-01-11T14:07:00.836450 */ #ifndef COMBINING_TABLE_H #define COMBINING_TABLE_H 1 diff --git a/crypto/heimdal/lib/wind/errorlist_table.c b/crypto/heimdal/lib/wind/errorlist_table.c index 7456cb4..d2d5718 100644 --- a/crypto/heimdal/lib/wind/errorlist_table.c +++ b/crypto/heimdal/lib/wind/errorlist_table.c @@ -1,5 +1,5 @@ /* ./errorlist_table.c */ -/* Automatically generated at 2011-09-30T15:24:59.470044 */ +/* Automatically generated at 2012-01-11T14:07:01.014764 */ #include <stdlib.h> diff --git a/crypto/heimdal/lib/wind/errorlist_table.h b/crypto/heimdal/lib/wind/errorlist_table.h index fc1739e..b822454 100644 --- a/crypto/heimdal/lib/wind/errorlist_table.h +++ b/crypto/heimdal/lib/wind/errorlist_table.h @@ -1,5 +1,5 @@ /* ./errorlist_table.h */ -/* Automatically generated at 2011-09-30T15:24:59.457950 */ +/* Automatically generated at 2012-01-11T14:07:01.014378 */ #ifndef ERRORLIST_TABLE_H #define ERRORLIST_TABLE_H 1 diff --git a/crypto/heimdal/lib/wind/map_table.c b/crypto/heimdal/lib/wind/map_table.c index 5491b7d..7363e54 100644 --- a/crypto/heimdal/lib/wind/map_table.c +++ b/crypto/heimdal/lib/wind/map_table.c @@ -1,5 +1,5 @@ /* ./map_table.c */ -/* Automatically generated at 2011-09-30T15:24:59.641639 */ +/* Automatically generated at 2012-01-11T14:07:01.097758 */ #include "map_table.h" diff --git a/crypto/heimdal/lib/wind/map_table.h b/crypto/heimdal/lib/wind/map_table.h index ac3d564..ebfa725 100644 --- a/crypto/heimdal/lib/wind/map_table.h +++ b/crypto/heimdal/lib/wind/map_table.h @@ -1,5 +1,5 @@ /* ./map_table.h */ -/* Automatically generated at 2011-09-30T15:24:59.631690 */ +/* Automatically generated at 2012-01-11T14:07:01.097337 */ #ifndef MAP_TABLE_H #define MAP_TABLE_H 1 diff --git a/crypto/heimdal/lib/wind/normalize_table.c b/crypto/heimdal/lib/wind/normalize_table.c index 7e0ec2e..a37e180 100644 --- a/crypto/heimdal/lib/wind/normalize_table.c +++ b/crypto/heimdal/lib/wind/normalize_table.c @@ -1,5 +1,5 @@ /* ./normalize_table.c */ -/* Automatically generated at 2011-09-30T15:25:00.420261 */ +/* Automatically generated at 2012-01-11T14:07:01.714581 */ #include <stdlib.h> diff --git a/crypto/heimdal/lib/wind/normalize_table.h b/crypto/heimdal/lib/wind/normalize_table.h index 8881630..b0d0d11 100644 --- a/crypto/heimdal/lib/wind/normalize_table.h +++ b/crypto/heimdal/lib/wind/normalize_table.h @@ -1,5 +1,5 @@ /* ./normalize_table.h */ -/* Automatically generated at 2011-09-30T15:25:00.412374 */ +/* Automatically generated at 2012-01-11T14:07:01.713967 */ #ifndef NORMALIZE_TABLE_H #define NORMALIZE_TABLE_H 1 diff --git a/crypto/heimdal/lib/wind/punycode_examples.c b/crypto/heimdal/lib/wind/punycode_examples.c index 50ccc48..d123680 100644 --- a/crypto/heimdal/lib/wind/punycode_examples.c +++ b/crypto/heimdal/lib/wind/punycode_examples.c @@ -1,5 +1,5 @@ /* ./punycode_examples.c */ -/* Automatically generated at 2011-09-30T15:25:05.829535 */ +/* Automatically generated at 2012-01-11T14:07:08.539522 */ #ifndef PUNYCODE_EXAMPLES_C #define PUNYCODE_EXAMPLES_C 1 diff --git a/crypto/heimdal/lib/wind/punycode_examples.h b/crypto/heimdal/lib/wind/punycode_examples.h index 832234d..3e90edc 100644 --- a/crypto/heimdal/lib/wind/punycode_examples.h +++ b/crypto/heimdal/lib/wind/punycode_examples.h @@ -1,5 +1,5 @@ /* ./punycode_examples.h */ -/* Automatically generated at 2011-09-30T15:25:05.815268 */ +/* Automatically generated at 2012-01-11T14:07:08.539140 */ #ifndef PUNYCODE_EXAMPLES_H #define PUNYCODE_EXAMPLES_H 1 diff --git a/crypto/heimdal/lib/wind/utf8.c b/crypto/heimdal/lib/wind/utf8.c index 6907b3c..e1a1eb7 100644 --- a/crypto/heimdal/lib/wind/utf8.c +++ b/crypto/heimdal/lib/wind/utf8.c @@ -204,13 +204,13 @@ wind_ucs4utf8(const uint32_t *in, size_t in_len, char *out, size_t *out_len) switch(len) { case 4: out[3] = (ch | 0x80) & 0xbf; - ch = ch << 6; + ch = ch >> 6; case 3: out[2] = (ch | 0x80) & 0xbf; - ch = ch << 6; + ch = ch >> 6; case 2: out[1] = (ch | 0x80) & 0xbf; - ch = ch << 6; + ch = ch >> 6; case 1: out[0] = ch | first_char[len - 1]; } @@ -346,8 +346,8 @@ wind_ucs2write(const uint16_t *in, size_t in_len, unsigned int *flags, return WIND_ERR_OVERRUN; if ((*flags) & WIND_RW_LE) { - p[0] = (bom >> 8) & 0xff; - p[1] = (bom ) & 0xff; + p[0] = (bom ) & 0xff; + p[1] = (bom >> 8) & 0xff; } else { p[1] = (bom ) & 0xff; p[0] = (bom >> 8) & 0xff; @@ -360,8 +360,8 @@ wind_ucs2write(const uint16_t *in, size_t in_len, unsigned int *flags, if (len < 2) return WIND_ERR_OVERRUN; if ((*flags) & WIND_RW_LE) { - p[0] = (in[0] >> 8) & 0xff; - p[1] = (in[0] ) & 0xff; + p[0] = (in[0] ) & 0xff; + p[1] = (in[0] >> 8) & 0xff; } else { p[1] = (in[0] ) & 0xff; p[0] = (in[0] >> 8) & 0xff; @@ -479,10 +479,10 @@ wind_ucs2utf8(const uint16_t *in, size_t in_len, char *out, size_t *out_len) switch(len) { case 3: out[2] = (ch | 0x80) & 0xbf; - ch = ch << 6; + ch = ch >> 6; case 2: out[1] = (ch | 0x80) & 0xbf; - ch = ch << 6; + ch = ch >> 6; case 1: out[0] = ch | first_char[len - 1]; } diff --git a/crypto/heimdal/lib/wind/version-script.map b/crypto/heimdal/lib/wind/version-script.map index a6ca3ae..6b5abb5 100644 --- a/crypto/heimdal/lib/wind/version-script.map +++ b/crypto/heimdal/lib/wind/version-script.map @@ -14,6 +14,7 @@ HEIMDAL_WIND_1.0 { wind_utf8ucs2_length; wind_ucs2utf8_length; wind_ucs2read; + wind_ucs2write; # testing _wind_combining_class; _wind_stringprep_testbidi; |