Put my copyright on everything I've changed so far, put a more reasonable version number on version.py
diff --git a/doc/pyOpenSSL.ps b/doc/pyOpenSSL.ps
index 6511500..735886b 100644
--- a/doc/pyOpenSSL.ps
+++ b/doc/pyOpenSSL.ps
@@ -1,7 +1,7 @@
%!PS-Adobe-2.0
%%Creator: dvips(k) 5.96.1 Copyright 2007 Radical Eye Software
%%Title: pyOpenSSL.dvi
-%%CreationDate: Sun Mar 9 21:47:34 2008
+%%CreationDate: Fri Mar 21 18:29:32 2008
%%Pages: 15
%%PageOrder: Ascend
%%BoundingBox: 0 0 595 842
@@ -10,7 +10,7 @@
%DVIPSWebPage: (www.radicaleye.com)
%DVIPSCommandLine: dvips -N0 -o pyOpenSSL.ps pyOpenSSL
%DVIPSParameters: dpi=600
-%DVIPSSource: TeX output 2008.03.09:2147
+%DVIPSSource: TeX output 2008.03.21:1829
%%BeginProcSet: tex.pro 0 0
%!
/TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S
@@ -4559,8 +4559,8 @@
%%Page: 1 1
TeXDict begin 1 0 bop 0 83 3901 9 v 1890 451 a Fu(Python)64
b(Op)5 b(enSSL)64 b(Manual)3443 619 y Ft(Release)33 b(0.6)3189
-974 y Fs(Ma)m(rtin)k(Sj\366gren)3383 1328 y Fr(Marc)n(h)27
-b(9,)g(2008)3301 1475 y Fq(ma)n(rtin@strakt.com)1781
+974 y Fs(Ma)m(rtin)k(Sj\366gren)3342 1328 y Fr(Marc)n(h)26
+b(21,)h(2008)3301 1475 y Fq(ma)n(rtin@strakt.com)1781
1697 y Fp(Abstract)208 1841 y Fo(This)32 b(mo)r(dule)f(is)h(a)g(rather)
g(thin)f(wrapp)r(er)h(around)g(\(a)g(subset)f(of)6 b(\))32
b(the)g(Op)r(enSSL)e(library)-6 b(.)52 b(With)32 b(thin)f(wrapp)r(er)
diff --git a/examples/certgen.py b/examples/certgen.py
index ac6b8bf..b50dfdc 100644
--- a/examples/certgen.py
+++ b/examples/certgen.py
@@ -1,10 +1,8 @@
# -*- coding: latin-1 -*-
-# certgen.py
#
# Copyright (C) Martin Sjögren and AB Strakt 2001, All rights reserved
-#
-# $Id: certgen.py,v 1.2 2004/07/22 12:01:25 martin Exp $
-#
+# Copyright (C) Jean-Paul Calderone 2008, All rights reserved
+
"""
Certificate generation module.
"""
diff --git a/examples/simple/client.py b/examples/simple/client.py
index 6bae488..dcad3ba 100644
--- a/examples/simple/client.py
+++ b/examples/simple/client.py
@@ -1,10 +1,8 @@
# -*- coding: latin-1 -*-
-# client.py
#
# Copyright (C) 2001 Martin Sjögren and AB Strakt, All rights reserved
-#
-# $Id: client.py,v 1.7 2002/08/15 12:20:46 martin Exp $
-#
+# Copyright (C) Jean-Paul Calderone 2008, All rights reserved
+
"""
Simple SSL client, using blocking I/O
"""
diff --git a/examples/simple/server.py b/examples/simple/server.py
index 5591847..518f9e6 100644
--- a/examples/simple/server.py
+++ b/examples/simple/server.py
@@ -1,10 +1,8 @@
# -*- coding: latin-1 -*-
-# server.py
#
# Copyright (C) 2001 Martin Sjögren and AB Strakt, All rights reserved
-#
-# $Id: server.py,v 1.2 2002/07/25 08:26:34 martin Exp $
-#
+# Copyright (C) Jean-Paul Calderone 2008, All rights reserved
+
"""
Simple echo server, using nonblocking I/O
"""
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 */
diff --git a/test/__init__.py b/test/__init__.py
index e69de29..ab9c4cb 100644
--- a/test/__init__.py
+++ b/test/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) Jean-Paul Calderone 2008, All rights reserved
+
+"""
+Package containing unit tests for L{OpenSSL}.
+"""
diff --git a/test/test_crypto.py b/test/test_crypto.py
index b9a7b1b..0ab8666 100644
--- a/test/test_crypto.py
+++ b/test/test_crypto.py
@@ -1,3 +1,5 @@
+# Copyright (C) Jean-Paul Calderone 2008, All rights reserved
+
"""
Unit tests for L{OpenSSL.crypto}.
"""
diff --git a/test/test_ssl.py b/test/test_ssl.py
index 8166130..762aee5 100644
--- a/test/test_ssl.py
+++ b/test/test_ssl.py
@@ -1,3 +1,5 @@
+# Copyright (C) Jean-Paul Calderone 2008, All rights reserved
+
"""
Unit tests for L{OpenSSL.SSL}.
"""
@@ -33,4 +35,3 @@
ctx = Context(TLSv1_METHOD)
ctx.use_privatekey(key)
self.assertRaises(TypeError, ctx.use_privatekey, "")
-
diff --git a/version.py b/version.py
index 22369c8..152ac1a 100644
--- a/version.py
+++ b/version.py
@@ -1,11 +1,8 @@
-#
-# version.py
-#
# Copyright (C) AB Strakt 2001-2004, All rights reserved
-#
-# $Id: version.py,v 1.2 2004/08/13 18:46:04 martin Exp $
-#
+# Copyright (C) Jean-Paul Calderone 2008, All rights reserved
+
"""
pyOpenSSL - A simple wrapper around the OpenSSL library
"""
-__version__ = '0.7'
+
+__version__ = '0.7pre1'