Put my copyright on everything I've changed so far, put a more reasonable version number on version.py
diff --git a/src/crypto/crypto.c b/src/crypto/crypto.c
index 5326198..a4adacf 100644
--- a/src/crypto/crypto.c
+++ b/src/crypto/crypto.c
@@ -2,6 +2,7 @@
* crypto.c
*
* Copyright (C) AB Strakt 2001, All rights reserved
+ * Copyright (C) Jean-Paul Calderone 2008, All rights reserved
*
* Main file of crypto sub module.
* See the file RATIONALE for a short explanation of why this module was written.
@@ -17,8 +18,6 @@
See the file RATIONALE for a short explanation of why this module was written.\n\
";
-static char *CVSid = "@(#) $Id: crypto.c,v 1.28 2004/08/09 14:56:05 martin Exp $";
-
void **ssl_API;
PyObject *crypto_Error;
diff --git a/src/crypto/pkey.c b/src/crypto/pkey.c
index d06ff96..fee3e81 100644
--- a/src/crypto/pkey.c
+++ b/src/crypto/pkey.c
@@ -2,6 +2,7 @@
* pkey.c
*
* Copyright (C) AB Strakt 2001, All rights reserved
+ * Copyright (C) Jean-Paul Calderone 2008, All rights reserved
*
* Public/rivate key handling code, mostly thin wrappers around OpenSSL.
* See the file RATIONALE for a short explanation of why this module was written.
@@ -11,8 +12,6 @@
#define crypto_MODULE
#include "crypto.h"
-static char *CVSid = "@(#) $Id: pkey.c,v 1.9 2002/07/09 13:47:21 martin Exp $";
-
/*
* This is done every time something fails, so turning it into a macro is
* really nice.
diff --git a/src/crypto/pkey.h b/src/crypto/pkey.h
index 0227629..3ac7bde 100644
--- a/src/crypto/pkey.h
+++ b/src/crypto/pkey.h
@@ -2,6 +2,7 @@
* pkey.h
*
* Copyright (C) AB Strakt 2001, All rights reserved
+ * Copyright (C) Jean-Paul Calderone 2008, All rights reserved
*
* Export pkey functions and data structure.
* See the file RATIONALE for a short explanation of why this module was written.
diff --git a/src/crypto/x509.c b/src/crypto/x509.c
index a10c53a..61f86ec 100644
--- a/src/crypto/x509.c
+++ b/src/crypto/x509.c
@@ -2,6 +2,7 @@
* x509.c
*
* Copyright (C) AB Strakt 2001, All rights reserved
+ * Copyright (C) Jean-Paul Calderone 2008, All rights reserved
*
* Certificate (X.509) handling code, mostly thin wrappers around OpenSSL.
* See the file RATIONALE for a short explanation of why this module was written.
@@ -12,8 +13,6 @@
#define crypto_MODULE
#include "crypto.h"
-static char *CVSid = "@(#) $Id: x509.c,v 1.20 2004/08/10 10:37:31 martin Exp $";
-
/*
* X.509 is a standard for digital certificates. See e.g. the OpenSSL homepage
* http://www.openssl.org/ for more information
diff --git a/src/crypto/x509ext.c b/src/crypto/x509ext.c
index 1c87b88..a898842 100644
--- a/src/crypto/x509ext.c
+++ b/src/crypto/x509ext.c
@@ -1,6 +1,8 @@
/*
* x509ext.c
*
+ * Copyright (C) Jean-Paul Calderone 2008, All rights reserved
+ *
* Export X.509 extension functions and data structures.
* See the file RATIONALE for a short explanation of why this module was written.
*
@@ -11,8 +13,6 @@
#define crypto_MODULE
#include "crypto.h"
-static char *CVSid = "@(#) $Id: x509ext.c,v 1.1 2002/07/09 13:34:46 martin Exp $";
-
static char crypto_X509Extension_get_critical_doc[] = "\n\
Returns the critical field of the X509Extension\n\
\n\
diff --git a/src/crypto/x509name.c b/src/crypto/x509name.c
index 5255e0b..b81b912 100644
--- a/src/crypto/x509name.c
+++ b/src/crypto/x509name.c
@@ -2,6 +2,7 @@
* x509name.c
*
* Copyright (C) AB Strakt 2001, All rights reserved
+ * Copyright (C) Jean-Paul Calderone 2008, All rights reserved
*
* X.509 Name handling, mostly thin wrapping.
* See the file RATIONALE for a short explanation of why this module was written.
@@ -12,9 +13,6 @@
#define crypto_MODULE
#include "crypto.h"
-static char *CVSid = "@(#) $Id: x509name.c,v 1.16 2003/01/09 17:08:32 martin Exp $";
-
-
/*
* Constructor for X509Name, never called by Python code directly
*
diff --git a/src/crypto/x509req.c b/src/crypto/x509req.c
index 143e4aa..4c6acd2 100644
--- a/src/crypto/x509req.c
+++ b/src/crypto/x509req.c
@@ -2,6 +2,7 @@
* x509req.c
*
* Copyright (C) AB Strakt 2001, All rights reserved
+ * Copyright (C) Jean-Paul Calderone 2008, All rights reserved
*
* X.509 Request handling, mostly thin wrapping.
* See the file RATIONALE for a short explanation of why this module was written.
@@ -10,8 +11,6 @@
#define crypto_MODULE
#include "crypto.h"
-static char *CVSid = "@(#) $Id: x509req.c,v 1.15 2002/09/04 22:24:59 iko Exp $";
-
static char crypto_X509Req_get_subject_doc[] = "\n\
Create an X509Name object for the subject of the certificate request\n\
diff --git a/src/ssl/connection.c b/src/ssl/connection.c
index 6bf7f65..a9778de 100755
--- a/src/ssl/connection.c
+++ b/src/ssl/connection.c
@@ -2,6 +2,7 @@
* connection.c
*
* Copyright (C) AB Strakt 2001, All rights reserved
+ * Copyright (C) Jean-Paul Calderone 2008, All rights reserved
*
* SSL Connection objects and methods.
* See the file RATIONALE for a short explanation of why this module was written.
@@ -10,7 +11,6 @@
*/
#include <Python.h>
-
#ifndef MS_WINDOWS
# include <sys/socket.h>
# include <netinet/in.h>
@@ -25,12 +25,8 @@
#define SSL_MODULE
#include <openssl/err.h>
-
#include "ssl.h"
-static char *CVSid = "@(#) $Id: connection.c,v 1.28 2004/08/06 10:21:56 martin Exp $";
-
-
/**
* If we are on UNIX, fine, just use PyErr_SetFromErrno. If we are on Windows,
* apply some black winsock voodoo. This is basically just copied from Python's
diff --git a/src/ssl/context.c b/src/ssl/context.c
index da4402b..ceeb8fb 100644
--- a/src/ssl/context.c
+++ b/src/ssl/context.c
@@ -2,6 +2,7 @@
* context.c
*
* Copyright (C) AB Strakt 2001, All rights reserved
+ * Copyright (C) Jean-Paul Calderone 2008, All rights reserved
*
* SSL Context objects and their methods.
* See the file RATIONALE for a short explanation of why this module was written.
@@ -10,8 +11,6 @@
*/
#include <Python.h>
-
-
#ifndef MS_WINDOWS
# include <sys/socket.h>
# include <netinet/in.h>
@@ -26,8 +25,6 @@
#define SSL_MODULE
#include "ssl.h"
-static char *CVSid = "@(#) $Id: context.c,v 1.17 2004/08/06 10:21:56 martin Exp $";
-
/*
* CALLBACKS
*
diff --git a/src/ssl/ssl.c b/src/ssl/ssl.c
index 8434a07..7f58771 100644
--- a/src/ssl/ssl.c
+++ b/src/ssl/ssl.c
@@ -2,6 +2,7 @@
* ssl.c
*
* Copyright (C) AB Strakt 2001, All rights reserved
+ * Copyright (C) Jean-Paul Calderone 2008, All rights reserved
*
* Main file of the SSL sub module.
* See the file RATIONALE for a short explanation of why this module was written.
@@ -10,8 +11,6 @@
*/
#include <Python.h>
-
-
#ifndef MS_WINDOWS
# include <sys/socket.h>
# include <netinet/in.h>
@@ -31,8 +30,6 @@
See the file RATIONALE for a short explanation of why this module was written.\n\
";
-static char *CVSid = "@(#) $Id: ssl.c,v 1.12 2004/08/10 21:42:51 martin Exp $";
-
void **crypto_API;
/* Exceptions defined by the SSL submodule */