[rtems commit] cpukit/libcrypt/misc.c: Conditionally correct 16-bit unclean code

Joel Sherril joel at rtems.org
Mon Mar 9 21:14:31 UTC 2015


Module:    rtems
Branch:    master
Commit:    865f10d16ed177b579d627796a56cbbd4dea0f88
Changeset: http://git.rtems.org/rtems/commit/?id=865f10d16ed177b579d627796a56cbbd4dea0f88

Author:    Joel Sherrill <joel.sherrill at oarcorp.com>
Date:      Mon Mar  9 07:50:07 2015 -0500

cpukit/libcrypt/misc.c: Conditionally correct 16-bit unclean code

---

 cpukit/libcrypt/misc.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cpukit/libcrypt/misc.c b/cpukit/libcrypt/misc.c
index 9f2c13e..9ca26d4 100644
--- a/cpukit/libcrypt/misc.c
+++ b/cpukit/libcrypt/misc.c
@@ -52,7 +52,11 @@ b64_from_24bit(uint8_t B2, uint8_t B1, uint8_t B0, int n, int *buflen, char **cp
 	uint32_t w;
 	int i;
 
+#if defined(__rtems__)
 	w = (B2 << 16) | (B1 << 8) | B0;
+#else
+	w = ((uint32_t)B2 << 16) | ((uint32_t)B1 << 8) | B0;
+#endif
 	for (i = 0; i < n; i++) {
 		**cp = itoa64[w&0x3f];
 		(*cp)++;



More information about the vc mailing list