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

OSSL 1.1 vs. 1.0: Purge BIO_QBA_mem_buf()

Browse Source
This commit is contained in:
Christian Hohnstaedt 2017-06-17 06:25:44 +02:00
parent 7f36322f0b
commit 9d2ed957dd
3 changed files with 6 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
lib/func.cpp
View File

@ -393,118 +393,6 @@ void inc_progress_bar(int, int, void *p)
}
}
static long mem_ctrl(BIO *b, int cmd, long num, void *ptr)
{
BUF_MEM *bm;
int flags;
long (*ctrl)(BIO *, int, long, void *);
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
BIO_get_mem_ptr(b, &bm);
flags = BIO_get_flags(b);
ctrl = BIO_meth_get_ctrl((BIO_METHOD *) BIO_s_mem());
#else
bm = (BUF_MEM *)b->ptr;
flags = b->flags;
ctrl = BIO_s_mem()->ctrl;
#endif
if (!bm->data || !(flags & BIO_FLAGS_MEM_RDONLY))
return ctrl(b, cmd, num, ptr);
switch (cmd) {
case BIO_C_FILE_SEEK:
if (num > (long)bm->max)
num = bm->max;
bm->data -= (bm->max - bm->length) - num;
bm->length = bm->max - num;
/* fallthrough */
case BIO_C_FILE_TELL:
return bm->max - bm->length;
}
return ctrl(b, cmd, num, ptr);
}
BIO_METHOD *BIO_METHOD_copy(const BIO_METHOD *src, BIO_METHOD *dst = NULL)
{
if (src)
return NULL;
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
if (!dst) {
// The only way to get the type and name of the source method is
// to bind it to a BIO.
BIO *bio = BIO_new(src);
if (!bio)
return NULL;
if (!(dst = BIO_meth_new(BIO_method_type(bio), BIO_method_name(bio)))) {
BIO_free(bio);
return NULL;
}
BIO_free(bio);
}
BIO_meth_set_write(dst, BIO_meth_get_write((BIO_METHOD *) src));
BIO_meth_set_read(dst, BIO_meth_get_read((BIO_METHOD *) src));
BIO_meth_set_puts(dst, BIO_meth_get_puts((BIO_METHOD *) src));
BIO_meth_set_gets(dst, BIO_meth_get_gets((BIO_METHOD *) src));
BIO_meth_set_ctrl(dst, BIO_meth_get_ctrl((BIO_METHOD *) src));
BIO_meth_set_create(dst, BIO_meth_get_create((BIO_METHOD *) src));
BIO_meth_set_destroy(dst, BIO_meth_get_destroy((BIO_METHOD *) src));
BIO_meth_set_callback_ctrl(dst,
BIO_meth_get_callback_ctrl((BIO_METHOD *) src));
#else
if (!dst)
if (!(dst = (BIO_METHOD *) OPENSSL_malloc(sizeof *dst)))
return NULL;
*dst = *src;
#endif
return dst;
}
BIO_METHOD *BIO_METHOD_seekable_romem()
{
static BIO_METHOD *mymeth = NULL;
if (!mymeth) {
mymeth = BIO_METHOD_copy(BIO_s_mem());
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
BIO_meth_set_ctrl(mymeth, mem_ctrl);
#else
mymeth->ctrl = mem_ctrl;
#endif
}
return mymeth;
}
BIO *BIO_QBA_mem_buf(QByteArray &a)
{
BIO *bio;
BIO_METHOD *meth = BIO_METHOD_seekable_romem();
if (!meth)
return NULL;
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
bio = BIO_new(meth);
if (bio) {
BUF_MEM bm;
bm.data = a.data();
bm.length = a.size();
bm.max = a.size();
BIO_set_mem_buf(bio, &bm, BIO_CLOSE);
BIO_set_flags(bio, BIO_get_flags(bio) | BIO_FLAGS_MEM_RDONLY);
}
#else
bio = BIO_new_mem_buf(a.data(), a.size());
if (bio)
bio->method = meth;
#endif
return bio;
}
bool translate_dn = false;
QMap<int, QString> dn_translations;

1
lib/func.h
View File

@ -51,7 +51,6 @@ bool _ign_openssl_error(const QString txt, const char *file, int line);
QByteArray i2d_bytearray(int(*i2d)(const void*, unsigned char**), const void*);
void *d2i_bytearray(void *(*d2i)(void*, unsigned char**, long),
QByteArray &ba);
BIO *BIO_QBA_mem_buf(QByteArray &a);
#define I2D_VOID(a) ((int (*)(const void *, unsigned char **))(a))
#define D2I_VOID(a) ((void *(*)(void *, unsigned char **, long))(a))

7
widgets/MainWindow.cpp
View File

@ -343,7 +343,12 @@ bool MainWindow::pastePem(QString text)
{
bool success = false;
QByteArray pemdata = text.toLatin1();
BIO *b = BIO_QBA_mem_buf(pemdata);
if (pemdata.size() == 0)
return false;
FILE *fp = fmemopen(pemdata.data(), pemdata.size(), "rb");
check_oom(fp);
BIO *b = BIO_new_fp(fp, BIO_CLOSE);
check_oom(b);
pki_multi *pem = NULL;
ImportMulti *dlgi = NULL;