mirror of
https://github.com/QuasarApp/qca.git
synced 2025-04-27 20:14:32 +00:00
prepare for release
svn path=/trunk/kdesupport/qca/; revision=432303
This commit is contained in:
parent
0868bb084c
commit
ca201813fb
13
INSTALL
13
INSTALL
@ -10,14 +10,5 @@ NOTE: You may also need to run '/sbin/ldconfig' or a similar tool to
|
||||
get the new library files recognized by the system. If you are
|
||||
using Linux, just run it for good measure.
|
||||
|
||||
You then need to install any plugins that you want. For each
|
||||
subdirectory in the plugins/ directory, you do the same sequence
|
||||
of events:
|
||||
./configure
|
||||
make
|
||||
make install
|
||||
|
||||
If this causes any problems, please report them to:
|
||||
delta-affinix.com@lists.affinix.com
|
||||
|
||||
|
||||
Please report problems to:
|
||||
delta-affinix.com@lists.affinix.com
|
||||
|
26
qca.pro
26
qca.pro
@ -1,18 +1,20 @@
|
||||
TEMPLATE = subdirs
|
||||
SUBDIRS = src tools unittest examples
|
||||
|
||||
include(conf.pri)
|
||||
unix:{
|
||||
include(conf.pri)
|
||||
|
||||
# install
|
||||
pcfiles.path = $$PREFIX/lib/pkgconfig
|
||||
pcfiles.files = qca.pc
|
||||
INSTALLS += pcfiles
|
||||
# install
|
||||
pcfiles.path = $$PREFIX/lib/pkgconfig
|
||||
pcfiles.files = qca.pc
|
||||
INSTALLS += pcfiles
|
||||
|
||||
# API documentation
|
||||
#apidox.commands += doxygen && cd apidocs/html && ./installdox -lqt.tag@/home/bradh/build/qt-x11-opensource-4.0.0-rc1-snapshot/doc/html/ && cd ../..
|
||||
apidox.commands += doxygen && cd apidocs/html && ./installdox -lqt.tag@http://doc.trolltech.com/4.0 && cd ../..
|
||||
QMAKE_EXTRA_TARGETS += apidox
|
||||
# API documentation
|
||||
#apidox.commands += doxygen && cd apidocs/html && ./installdox -lqt.tag@/home/bradh/build/qt-x11-opensource-4.0.0-rc1-snapshot/doc/html/ && cd ../..
|
||||
apidox.commands += doxygen && cd apidocs/html && ./installdox -lqt.tag@http://doc.trolltech.com/4.0 && cd ../..
|
||||
QMAKE_EXTRA_TARGETS += apidox
|
||||
|
||||
# unittest
|
||||
check.commands += cd unittest; ./qca-unittest; cd ..
|
||||
QMAKE_EXTRA_TARGETS += check
|
||||
# unittest
|
||||
check.commands += cd unittest; ./qca-unittest; cd ..
|
||||
QMAKE_EXTRA_TARGETS += check
|
||||
}
|
||||
|
@ -20,7 +20,8 @@
|
||||
#include <QtCore>
|
||||
#include <QtCrypto>
|
||||
|
||||
Q_IMPORT_PLUGIN(opensslPlugin);
|
||||
//Q_IMPORT_PLUGIN(opensslPlugin);
|
||||
//Q_IMPORT_PLUGIN(gnupgPlugin);
|
||||
|
||||
class AnimatedKeyGen : public QObject
|
||||
{
|
||||
@ -132,10 +133,11 @@ private slots:
|
||||
void ks_needPassphrase()
|
||||
{
|
||||
QCA::KeyStore *ks = static_cast<QCA::KeyStore *>(sender());
|
||||
printf("Enter passphrase for %s: ", qPrintable(ks->name()));
|
||||
printf("Enter passphrase for %s (not hidden!) : ", qPrintable(ks->name()));
|
||||
fflush(stdout);
|
||||
QSecureArray result(256);
|
||||
fgets((char *)result.data(), result.size(), stdin);
|
||||
result.resize(qstrlen(result.data()));
|
||||
if(result[result.size() - 1] == '\n')
|
||||
result.resize(result.size() - 1);
|
||||
ks->submitPassphrase(result);
|
||||
@ -617,7 +619,7 @@ static void usage()
|
||||
printf(" --smime encrypt [cert.pem] [messagefile]\n");
|
||||
printf(" --smime decrypt [priv.pem] [messagefile] [cert.pem] (passphrase)\n");
|
||||
printf("\n");
|
||||
printf(" --pgp sign [S] [messagefile]\n");
|
||||
printf(" --pgp clearsign [S] [messagefile]\n");
|
||||
printf("\n");
|
||||
|
||||
/*printf("qcatool: simple qca utility\n");
|
||||
@ -667,7 +669,7 @@ int main(int argc, char **argv)
|
||||
|
||||
//QCA::scanForPlugins();
|
||||
|
||||
if(!QCA::isSupported("pkey") || !QCA::PKey::supportedTypes().contains(QCA::PKey::RSA) || !QCA::PKey::supportedIOTypes().contains(QCA::PKey::RSA))
|
||||
/*if(!QCA::isSupported("pkey") || !QCA::PKey::supportedTypes().contains(QCA::PKey::RSA) || !QCA::PKey::supportedIOTypes().contains(QCA::PKey::RSA))
|
||||
{
|
||||
printf("Error: no RSA support\n");
|
||||
return 1;
|
||||
@ -689,7 +691,7 @@ int main(int argc, char **argv)
|
||||
{
|
||||
printf("Error: no cert support\n");
|
||||
return 1;
|
||||
}
|
||||
}*/
|
||||
|
||||
QStringList args;
|
||||
for(int n = 1; n < argc; ++n)
|
||||
@ -1780,7 +1782,7 @@ int main(int argc, char **argv)
|
||||
return 1;
|
||||
}
|
||||
|
||||
if(args[1] == "sign")
|
||||
if(args[1] == "clearsign")
|
||||
{
|
||||
if(args.count() < 4)
|
||||
{
|
||||
@ -1820,7 +1822,7 @@ int main(int argc, char **argv)
|
||||
|
||||
QSecureArray result = msg.read();
|
||||
|
||||
printf("Result: [%s]\n", result.data());
|
||||
printf("Result:\n%s\n", result.data());
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -4,18 +4,13 @@ CONFIG -= app_bundle
|
||||
DESTDIR = ../../bin
|
||||
|
||||
INCLUDEPATH += ../../include/QtCrypto
|
||||
SOURCES = main.cpp
|
||||
|
||||
LIBS += -L../.. -lqca
|
||||
|
||||
include(../../conf.pri)
|
||||
SOURCES += main.cpp
|
||||
|
||||
target.path=$$BINDIR
|
||||
INSTALLS += target
|
||||
|
||||
# temporarily build directly against openssl
|
||||
DEFINES += QT_STATICPLUGIN
|
||||
SOURCES += ../../plugins/qca-openssl/qca-openssl.cpp
|
||||
DEFINES += OSSL_097
|
||||
LIBS += -lcrypto -lssl
|
||||
unix:{
|
||||
include(../../conf.pri)
|
||||
|
||||
target.path=$$BINDIR
|
||||
INSTALLS += target
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user