QuasarApp/qca
4
0
Fork 0
mirror of https://github.com/QuasarApp/qca.git synced 2025-05-12 18:49:34 +00:00
Code Issues Projects Releases Wiki Activity

Drop RSA PEM

Browse Source 
svn path=/trunk/kdesupport/qca/; revision=668919
This commit is contained in:
Alon Bar-Lev 2007-05-28 05:14:09 +00:00
parent c07ea597de
commit 9c3c90139a
2 changed files with 12 additions and 12 deletions
plugins/qca-softstore
READMEqca-softstore.cpp

8
plugins/qca-softstore/README

@ -49,11 +49,11 @@ CONFIGURATION
pkcs8
entry_##_private is base64 encoded PKCS#8 format.
rsa-file-pem
entry_##_private is PEM RSA key file name.
pkcs8-file-pem
entry_##_private is PEM RSA key file name or PKCS#8 PEM encoded.
pkcs8-file
entry_##_private is PKCS#8 format.
pkcs8-file-der
entry_##_private is PKCS#8 DER format.
entry_##_private (String)
By entry_##_private_type.

16
plugins/qca-softstore/qca-softstore.cpp

@ -36,8 +36,8 @@ enum KeyType {
keyTypeInvalid,
keyTypePKCS12,
keyTypePKCS8Inline,
keyTypeRSAFilePEM,
keyTypePKCS8File
keyTypePKCS8FilePEM,
keyTypePKCS8FileDER
};
enum PublicType {
@ -385,8 +385,8 @@ public:
case keyTypePKCS8Inline:
break;
case keyTypePKCS12:
case keyTypeRSAFilePEM:
case keyTypePKCS8File:
case keyTypePKCS8FilePEM:
case keyTypePKCS8FileDER:
{
QFile file (_entry.keyReference);
while (!file.open (QIODevice::ReadOnly)) {
@ -449,7 +449,7 @@ public:
}
}
break;
case keyTypeRSAFilePEM:
case keyTypePKCS8FilePEM:
{
PrivateKey k = PrivateKey::fromPEMFile (
_entry.keyReference,
@ -462,7 +462,7 @@ public:
}
}
break;
case keyTypePKCS8File:
case keyTypePKCS8FileDER:
{
QFile file (_entry.keyReference);
if (file.open (QIODevice::ReadOnly)) {
@ -1097,8 +1097,8 @@ public:
QMap<QString, KeyType> keyTypeMap;
keyTypeMap["pkcs12"] = keyTypePKCS12;
keyTypeMap["pkcs8"] = keyTypePKCS8Inline;
keyTypeMap["rsa-file-pem"] = keyTypeRSAFilePEM;
keyTypeMap["pkcs8-file"] = keyTypePKCS8File;
keyTypeMap["pkcs8-file-pem"] = keyTypePKCS8FilePEM;
keyTypeMap["pkcs8-file-der"] = keyTypePKCS8FileDER;
QMap<QString, PublicType> publicTypeMap;
publicTypeMap["x509chain"] = publicTypeX509Chain;