The_Great_Archive/xca
1
0
Fork 0
mirror of https://github.com/chris2511/xca.git synced 2026-09-12 19:51:05 +05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Version++

Browse Source
This commit is contained in:
chris2511 2003-11-25 13:13:57 +00:00
parent 8005cf0433
commit 230dcbd54c
5 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -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 \

4
Rules.mak
View File

@ -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

17
debian/changelog vendored
View File

@ -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

2
lib/base.h
View File

@ -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

4
lib/pki_x509req.cpp
View File

@ -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;
}