Changes for the nids and objects in the VC++ build from ilya

merged.
Errormessage on a wrong pkcs12 password more comprehensive

Makefile

@@ -35,9 +35,9 @@ distclean: clean
 dist: 
 	test ! -z "$(TVERSION)"
 	rm -rf $(TARGET) 
-	cvs export -r $(TAG) -d $(TARGET) xca && \
+	cvs export -r $(TAG) -d $(TARGET) xca && 
 	(cd $(TARGET) && \
-	./mkxcapro.sh && lrelease xca.pro && \
+	./mkxcapro.sh && lrelease xca.pro || echo 'lrelease not found !!' && \
 	cat rpm/xca.spec |sed s/VERSION/$(TVERSION)/g >rpm/$(TARGET)-1.spec && \
 	cat lib/base.h.in |sed s/MY_VERSION/$(TVERSION)/g >lib/base.h && \
 	cat misc/xca.nsi |sed s/VERSION/$(TVERSION)/g >misc/$(TARGET).nsi && \

lib/pki_base.cpp

@@ -53,6 +53,7 @@
 #include "pki_base.h"
 #include "exception.h"
 
+
 int pki_base::pki_counter = 0;
 
 pki_base::pki_base(const QString name)

lib/pki_pkcs12.cpp

@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Copyright (C) 2001 Christian Hohnstaedt.
  *
@@ -52,6 +53,8 @@
 #include "pki_pkcs12.h"
 #include "pass_info.h"
 #include "exception.h"
+#include <openssl/err.h>
+#include <qmessagebox.h>
 
 
 pki_pkcs12::pki_pkcs12(const QString d, pki_x509 *acert, pki_key *akey, pem_password_cb *cb):
@@ -88,6 +91,14 @@ pki_pkcs12::pki_pkcs12(const QString fname, pem_password_cb *cb)
 			throw errorEx("","");
 		}
 		PKCS12_parse(pkcs12, pass, &mykey, &mycert, &certstack);
+		if ( ERR_peek_error() != 0) {
+			ign_openssl_error();
+			//QMessageBox::warning(NULL, XCA_TITLE, 
+			//	tr(), tr("&OK"));
+			PKCS12_free(pkcs12);
+			throw errorEx(getClassName(),"The supplied password was wrong");
+		}
+
 		openssl_error();
 		if (mykey) {
 			key = new pki_key(mykey);
@@ -101,7 +112,6 @@ pki_pkcs12::pki_pkcs12(const QString fname, pem_password_cb *cb)
 	else fopen_error(fname);
 }	
 
-
 pki_pkcs12::~pki_pkcs12()
 {
 	if (sk_X509_num(certstack)>0) {

misc/xca.nsi

@@ -44,6 +44,9 @@ Section "xca (required)"
   SetOutPath $INSTDIR
   ; Put file there
   File "Release\xca.exe"
+  File "misc\dn.txt"
+  File "misc\eku.txt"
+  File "misc\oids.txt"
   File "img\bigcert.png"
   File "img\bigcrl.png"
   File "img\bigcsr.png"