Update of /cvsroot/netrek/client/netrekxp/include
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16034/include
Modified Files:
cowapi.h data.h defs.h packets.h proto.h struct.h
Log Message:
Remove RSA code from source and makefiles,as it
is deprecated.
Keep reference in socket code to SP_RSA_KEY and
CP_RSA_KEY as these values are fixed server side.
Refer to RSA as deprecated in documentation.
Index: defs.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/defs.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- defs.h 16 Jul 2008 00:16:08 -0000 1.34
+++ defs.h 9 May 2009 21:21:43 -0000 1.35
@@ -125,17 +125,6 @@
#define TRACTCOST 20 /* fuel cost of activated
* tractor beam */
-
-#ifdef RSA
-/* RSA stuff */
-#define RSA_VERSION "RSA v2.0 CLIENT" /* string must begin with
- * characters "RSA" */
-#define KEY_SIZE 32
-#define RESERVED_SIZE 16
-#define NAME_LEN 16
-#define KEYMAP_LEN 96
-#endif
-
#define MSG_LEN 80
Index: packets.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/packets.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- packets.h 6 Mar 2009 04:09:27 -0000 1.19
+++ packets.h 9 May 2009 21:21:43 -0000 1.20
@@ -77,10 +77,8 @@
#define SP_SC_SEQUENCE 30 /* this trans is
* semi-critical info */
-#ifdef RSA
-#define SP_RSA_KEY 31 /* handles binary
- * verification */
-#endif
+#define SP_RSA_KEY 31 /* deprecated - handles binary verification */
+
// Note the conflicting defines for types 32 and 33
#define SP_MOTD_PIC 32 /* paradise - motd bitmap pictures */
@@ -187,10 +185,7 @@
#define CP_UDP_REQ 35 /* request UDP on/off */
#define CP_SEQUENCE 36 /* sequence # packet */
-#ifdef RSA
-#define CP_RSA_KEY 37 /* handles binary
- * verification */
-#endif
+#define CP_RSA_KEY 37 /* deprecated - handles binary verification */
/* Note the conflicting defines for packet type 38*/
#define CP_ASK_MOTD 38 /* paradise - request MOTD */
@@ -857,29 +852,6 @@
#endif
-#ifdef RSA
-struct rsa_key_spacket
-{
- char type; /* SP_RSA_KEY */
- char pad1;
- char pad2;
- char pad3;
- unsigned char data[KEY_SIZE];
-};
-
-struct rsa_key_cpacket
-{
- char type; /* CP_RSA_KEY */
- char pad1;
- char pad2;
- char pad3;
- unsigned char global[KEY_SIZE];
- unsigned char public[KEY_SIZE];
- unsigned char resp[KEY_SIZE];
-};
-
-#endif
-
struct ship_cap_spacket
{ /* Server configuration of
* client */
Index: cowapi.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/cowapi.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- cowapi.h 21 Jan 2003 21:27:54 -0000 1.1.1.1
+++ cowapi.h 9 May 2009 21:21:42 -0000 1.2
@@ -65,15 +65,4 @@
extern unsigned LONG netaddr;
#endif
-#ifdef RSA
-extern int useRsa;
-extern char key_name[];
-extern char client_type[];
-extern char client_arch[];
-extern char client_creator[];
-extern char client_comments[];
-extern char client_key_date[];
-
-#endif
-
#endif /* _h_cow */
Index: struct.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/struct.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- struct.h 9 Jan 2009 03:34:07 -0000 1.32
+++ struct.h 9 May 2009 21:21:43 -0000 1.33
@@ -521,17 +521,6 @@
};
-#ifdef RSA
-struct rsa_key
-{
- unsigned char client_type[KEY_SIZE];
- unsigned char architecture[KEY_SIZE];
- unsigned char global[KEY_SIZE];
- unsigned char public[KEY_SIZE];
-};
-
-#endif
-
/* An important note concerning planets: The game assumes that the planets
* are in a 'known' order. Ten planets per team, the first being the home
* planet. */
Index: proto.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- proto.h 16 Jul 2008 00:16:09 -0000 1.64
+++ proto.h 9 May 2009 21:21:43 -0000 1.65
@@ -979,28 +979,6 @@
int cy);
void rotateGalaxy (void);
-/******************************************************************************/
-/*** rsa_box.c
-/******************************************************************************/
-void rsa_black_box (unsigned char *out,
- unsigned char *in,
- unsigned char *public,
- unsigned char *global);
-void rsa_partial_box_0 (MP_INT * m,
- MP_INT * r,
- MP_INT * g);
-void rsa_partial_box_1 (MP_INT * m,
- MP_INT * r,
- MP_INT * g);
-void rsa_partial_box_2 (MP_INT * m,
- MP_INT * r,
- MP_INT * g);
-void rsa_partial_box_3 (MP_INT * m,
- MP_INT * r,
- MP_INT * g);
-void rsa_partial_box_4 (MP_INT * m,
- MP_INT * r,
- MP_INT * g);
/******************************************************************************/
/*** senddist.c
@@ -1155,8 +1133,6 @@
void handleGeneric32 (struct generic_32_spacket *packet);
struct flags_all_spacket;
void handleFlagsAll (struct flags_all_spacket *packet);
-struct rsa_key_spacket;
-void handleRSAKey (struct rsa_key_spacket *packet);
void initialize_players (void);
void initialize_plasmas (void);
void initialize_torps (void);
Index: data.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- data.h 15 Mar 2009 12:16:42 -0000 1.105
+++ data.h 9 May 2009 21:21:43 -0000 1.106
@@ -126,18 +126,6 @@
extern int messageon;
-#ifdef RSA
-extern char testdata[];
-extern int useRsa;
-extern char key_name[];
-extern char client_type[];
-extern char client_arch[];
-extern char client_creator[];
-extern char client_comments[];
-extern char client_key_date[];
-
-#endif
-
#ifdef META
extern char *metaServer;
extern int metaPort;