Below is the list of changes that have just been committed into a local
5.0 repository of kent. When kent does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2008-02-17 10:40:43+01:00, kent@stripped +11 -0
Many files:
Use old C style comments
extra/cyassl/ctaocrypt/benchmark/benchmark.c@stripped, 2008-02-17 10:40:33+01:00, kent@stripped +1 -1
Use old C style comments
extra/cyassl/ctaocrypt/src/asn.c@stripped, 2008-02-17 10:40:33+01:00, kent@stripped +1 -1
Use old C style comments
extra/cyassl/ctaocrypt/src/coding.c@stripped, 2008-02-17 10:40:33+01:00, kent@stripped +2 -2
Use old C style comments
extra/cyassl/ctaocrypt/src/des3.c@stripped, 2008-02-17 10:40:33+01:00, kent@stripped +1 -1
Use old C style comments
extra/cyassl/ctaocrypt/src/md5.c@stripped, 2008-02-17 10:40:33+01:00, kent@stripped +1 -1
Use old C style comments
extra/cyassl/ctaocrypt/src/random.c@stripped, 2008-02-17 10:40:33+01:00, kent@stripped +2 -2
Use old C style comments
extra/cyassl/ctaocrypt/src/sha.c@stripped, 2008-02-17 10:40:33+01:00, kent@stripped +1 -1
Use old C style comments
extra/cyassl/ctaocrypt/test/test.c@stripped, 2008-02-17 10:40:33+01:00, kent@stripped +4 -4
Use old C style comments
extra/cyassl/examples/test.h@stripped, 2008-02-17 10:40:33+01:00, kent@stripped +3 -3
Use old C style comments
extra/cyassl/include/cyassl_int.h@stripped, 2008-02-17 10:40:33+01:00, kent@stripped +1 -1
Use old C style comments
extra/cyassl/src/cyassl_int.c@stripped, 2008-02-17 10:40:33+01:00, kent@stripped +2 -2
Use old C style comments
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: kent
# Host: kent-amd64.(none)
# Root: /home/kent/bk/cyassl/my50-cyassl
--- 1.2/extra/cyassl/ctaocrypt/benchmark/benchmark.c 2008-02-17 10:40:47 +01:00
+++ 1.3/extra/cyassl/ctaocrypt/benchmark/benchmark.c 2008-02-17 10:40:47 +01:00
@@ -20,7 +20,7 @@
#define NO_DH /* remove for now */
#ifdef _MSC_VER
- // 4996 warning to use MS extensions e.g., strcpy_s instead of strncpy
+ /* 4996 warning to use MS extensions e.g., strcpy_s instead of strncpy */
#pragma warning(disable: 4996)
#endif
--- 1.2/extra/cyassl/ctaocrypt/src/asn.c 2008-02-17 10:40:47 +01:00
+++ 1.3/extra/cyassl/ctaocrypt/src/asn.c 2008-02-17 10:40:47 +01:00
@@ -25,7 +25,7 @@
#include <assert.h>
#ifdef _MSC_VER
- // 4996 warning to use MS extensions e.g., strcpy_s instead of strncpy
+ /* 4996 warning to use MS extensions e.g., strcpy_s instead of strncpy */
#pragma warning(disable: 4996)
#endif
--- 1.2/extra/cyassl/ctaocrypt/src/coding.c 2008-02-17 10:40:47 +01:00
+++ 1.3/extra/cyassl/ctaocrypt/src/coding.c 2008-02-17 10:40:47 +01:00
@@ -139,13 +139,13 @@
byte b2 = in[j++];
byte b3 = in[j++];
- // encoded idx
+ /* encoded idx */
byte e1 = b1 >> 2;
byte e2 = ((b1 & 0x3) << 4) | (b2 >> 4);
byte e3 = ((b2 & 0xF) << 2) | (b3 >> 6);
byte e4 = b3 & 0x3F;
- // store
+ /* store */
out[i++] = base64Encode[e1];
out[i++] = base64Encode[e2];
out[i++] = base64Encode[e3];
--- 1.2/extra/cyassl/ctaocrypt/src/des3.c 2008-02-17 10:40:47 +01:00
+++ 1.3/extra/cyassl/ctaocrypt/src/des3.c 2008-02-17 10:40:47 +01:00
@@ -296,7 +296,7 @@
| ((word32)ks[7]);
}
- // reverse key schedule order
+ /* reverse key schedule order */
if (dir == DES_DECRYPTION)
for (i = 0; i < 16; i += 2) {
word32 swap = out[i];
--- 1.2/extra/cyassl/ctaocrypt/src/md5.c 2008-02-17 10:40:47 +01:00
+++ 1.3/extra/cyassl/ctaocrypt/src/md5.c 2008-02-17 10:40:47 +01:00
@@ -169,7 +169,7 @@
AddLength(md5, md5->buffLen); /* before adding pads */
- local[md5->buffLen++] = 0x80; // add 1
+ local[md5->buffLen++] = 0x80; /* add 1 */
/* pad with zeros */
if (md5->buffLen > MD5_PAD_SIZE) {
--- 1.2/extra/cyassl/ctaocrypt/src/random.c 2008-02-17 10:40:47 +01:00
+++ 1.3/extra/cyassl/ctaocrypt/src/random.c 2008-02-17 10:40:47 +01:00
@@ -39,7 +39,7 @@
-// Get seed and key cipher
+/* Get seed and key cipher */
int InitRng(RNG* rng)
{
byte key[32];
@@ -54,7 +54,7 @@
}
-// place a generated block in output
+/* place a generated block in output */
void RNG_GenerateBlock(RNG* rng, byte* output, word32 sz)
{
memset(output, 0, sz);
--- 1.2/extra/cyassl/ctaocrypt/src/sha.c 2008-02-17 10:40:47 +01:00
+++ 1.3/extra/cyassl/ctaocrypt/src/sha.c 2008-02-17 10:40:47 +01:00
@@ -154,7 +154,7 @@
AddLength(sha, sha->buffLen); /* before adding pads */
- local[sha->buffLen++] = 0x80; // add 1
+ local[sha->buffLen++] = 0x80; /* add 1 */
/* pad with zeros */
if (sha->buffLen > SHA_PAD_SIZE) {
--- 1.2/extra/cyassl/ctaocrypt/test/test.c 2008-02-17 10:40:47 +01:00
+++ 1.3/extra/cyassl/ctaocrypt/test/test.c 2008-02-17 10:40:47 +01:00
@@ -19,7 +19,7 @@
#include "dsa.h"
#ifdef _MSC_VER
- // 4996 warning to use MS extensions e.g., strcpy_s instead of strncpy
+ /* 4996 warning to use MS extensions e.g., strcpy_s instead of strncpy */
#pragma warning(disable: 4996)
#endif
@@ -568,7 +568,7 @@
Aes enc;
Aes dec;
- const byte msg[] = { // "Now is the time for all " w/o trailing 0
+ const byte msg[] = { /* "Now is the time for all " w/o trailing 0 */
0x6e,0x6f,0x77,0x20,0x69,0x73,0x20,0x74,
0x68,0x65,0x20,0x74,0x69,0x6d,0x65,0x20,
0x66,0x6f,0x72,0x20,0x61,0x6c,0x6c,0x20
@@ -580,8 +580,8 @@
0x2c,0xcc,0x9d,0x46,0x77,0xa2,0x33,0xcb
};
- byte key[] = "0123456789abcdef "; // align
- byte iv[] = "1234567890abcdef "; // align
+ byte key[] = "0123456789abcdef "; /* align */
+ byte iv[] = "1234567890abcdef "; /* align */
byte cipher[AES_BLOCK_SIZE];
byte plain [AES_BLOCK_SIZE];
--- 1.2/extra/cyassl/examples/test.h 2008-02-17 10:40:47 +01:00
+++ 1.3/extra/cyassl/examples/test.h 2008-02-17 10:40:47 +01:00
@@ -12,7 +12,7 @@
#ifdef _WIN32
#include <winsock2.h>
#include <process.h>
- #ifdef TEST_IPV6 // don't require newer SDK for IPV4
+ #ifdef TEST_IPV6 /* don't require newer SDK for IPV4 */
#include <ws2tcpip.h>
#include <wspiapi.h>
#endif
@@ -38,8 +38,8 @@
#endif /* _WIN32 */
#ifdef _MSC_VER
- // disable conversion warning
- // 4996 warning to use MS extensions e.g., strcpy_s instead of strncpy
+ /* disable conversion warning */
+ /* 4996 warning to use MS extensions e.g., strcpy_s instead of strncpy */
#pragma warning(disable:4244 4996)
#endif
--- 1.3/extra/cyassl/include/cyassl_int.h 2008-02-17 10:40:47 +01:00
+++ 1.4/extra/cyassl/include/cyassl_int.h 2008-02-17 10:40:47 +01:00
@@ -39,7 +39,7 @@
#endif
#ifdef _MSC_VER
- // 4996 warning to use MS extensions e.g., strcpy_s instead of strncpy
+ /* 4996 warning to use MS extensions e.g., strcpy_s instead of strncpy */
#pragma warning(disable: 4996)
#endif
--- 1.3/extra/cyassl/src/cyassl_int.c 2008-02-17 10:40:47 +01:00
+++ 1.4/extra/cyassl/src/cyassl_int.c 2008-02-17 10:40:47 +01:00
@@ -37,7 +37,7 @@
#include <netinet/in.h>
#include <sys/ioctl.h>
#include <fcntl.h>
-#endif // _WIN32
+#endif /* _WIN32 */
#ifdef __sun
#include <sys/filio.h>
@@ -61,7 +61,7 @@
const int SOCKET_EINTR = EINTR;
SOCKET_T INVALID_SOCKET = -1;
-#endif // _WIN32
+#endif /* _WIN32 */
#ifndef NO_CYASSL_CLIENT
| Thread |
|---|
| • bk commit into 5.0 tree (kent:1.2466) | kent | 17 Feb |
