From 230dcbd54c8b9db1178cc0bc9f167562cd5209df Mon Sep 17 00:00:00 2001
From: chris2511 <chris2511>
Date: Tue, 25 Nov 2003 13:13:57 +0000
Subject: [PATCH] Version++

---
 Makefile            |  6 +++---
 Rules.mak           |  4 ++--
 debian/changelog    | 17 +++++++++++++++++
 lib/base.h          |  2 +-
 lib/pki_x509req.cpp |  4 ----
 5 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index c5c7d527..4fe45726 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ TAG=$(shell echo "V.$(TVERSION)" |sed "s/\./_/g" )
 TARGET=xca-$(TVERSION)
 
 SUBDIRS=ui lib widgets view
-OBJECTS=$(patsubst %, %/t.obj, $(SUBDIRS))
+OBJECTS=$(patsubst %, %/target.obj, $(SUBDIRS))
 
 all: headers xca
 re: clean all
@@ -19,8 +19,8 @@ xca: $(OBJECTS)
 headers:
 	$(MAKE) -C ui $@
 
-%/t.obj: headers
-	$(MAKE) -C $* t.obj
+%/target.obj: headers
+	$(MAKE) -C $* target.obj
 
 clean:
 	for x in $(SUBDIRS); do \
diff --git a/Rules.mak b/Rules.mak
index 800e6495..21e5c27c 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -1,6 +1,6 @@
 include ../Local.mak
 
-all: t.obj
+all: target.obj
 
 CFLAGS+= -DPREFIX=\"$(prefix)\"
 
@@ -24,7 +24,7 @@ moc_%.cpp: %.h %.cpp
 	$(CC) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -c $< -o $@
 
 # partial linking of objects in one directory
-t.obj: $(OBJS)
+target.obj: $(OBJS)
 	$(LD) -r -o $@ $(OBJS)
 
 # delete the crap
diff --git a/debian/changelog b/debian/changelog
index 0b762fc2..b23a5de6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+xca (0.4.6) unstable; urgency=low
+
+  * Netscape SPKAC support added
+  * Country is State or Province
+  * xca.dsp: WIN32 changes from Ilya
+  * New configure added, Makefile.in's purged and one configuration:
+    "Local.mak" for flags and compilers.
+  * SmartCard Logon OID added
+  * Fixed bugs:
+  * [ 846052 ] Tab order in Certificate Netscape extensions is wrong
+  * [ 845800 ] CRL Generation problem for Netscape
+  * [ 836967 ] Unable to specify alternate database
+  * [ 843725 ] xca dies when opened with a pem key as argument
+  * [ 789374 ] Bad encoding in misc/xca.desktop
+  
+ -- Christian Hohnstaedt <chohnstaedt@innominate.com>  Tue, 25 Nov 2003 11:58:07 +0100
+
 xca (0.4.5) unstable; urgency=low
 
   * more german translations
diff --git a/lib/base.h b/lib/base.h
index 2ad77f8c..460ffd53 100644
--- a/lib/base.h
+++ b/lib/base.h
@@ -3,7 +3,7 @@
 #ifndef BASE_H
 #define BASE_H
 
-#define VER "0.4.5-nc"
+#define VER "0.4.6"
 
 #if QT_VERSION >= 0x030000
 #define qt3 1
diff --git a/lib/pki_x509req.cpp b/lib/pki_x509req.cpp
index 8fc8116e..78432192 100644
--- a/lib/pki_x509req.cpp
+++ b/lib/pki_x509req.cpp
@@ -135,7 +135,6 @@ void pki_x509req::fromData(unsigned char *p, int size)
 	unsigned char *ps = p;
 	privkey = NULL;
 	request = d2i_X509_REQ(&request, &ps, size);
-	printf("SPKAC %p - %p = %d <-> %d\n",ps, p, ps - p, size);
 	if (ps - p < size)
 		spki = d2i_NETSCAPE_SPKI(NULL, &ps , size + p - ps); 
 	openssl_error();
@@ -165,7 +164,6 @@ unsigned char *pki_x509req::toData(int *size)
 	p1 = p;
 	i2d_X509_REQ(request, &p1);
 	if (spki) {
-		printf("Writing SPKAC");
 		i2d_NETSCAPE_SPKI(spki, &p1);
 	}
 	openssl_error();
@@ -207,9 +205,7 @@ int pki_x509req::verify()
 {
 	 EVP_PKEY *pkey = X509_REQ_get_pubkey(request);
 	 bool x = (X509_REQ_verify(request,pkey) >= 0);
-	 printf("x: %d, spki: %p\n",x, spki);
 	 if ( !x  && spki != NULL) {
-		printf("SPKAC\n");
  		ign_openssl_error();
 		x = NETSCAPE_SPKI_verify(spki, pkey) >= 0;
 	 }