Skip to content
Permalink
Browse files

start porting to openssl 1.1.0

Signed-off-by: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>
  • Loading branch information...
freemangordon committed Mar 6, 2018
1 parent 9e2db23 commit e8a71cd5f7b6787ee48ac2e7a0c0ed43ef4ebe55
Showing with 107 additions and 75 deletions.
  1. +1 −1 configure.ac
  2. +1 −1 debian/compat
  3. +1 −1 debian/control
  4. +2 −1 lib/certman/certman_main.cpp
  5. +1 −1 lib/security/maemosec_common.cpp
  6. +101 −70 lib/security/maemosec_storage.cpp
@@ -14,7 +14,7 @@ AC_SUBST(OPENSSL_LIBS)

dnl Scratchbox uses a different naming convention
dnl than the rest of the world
PKG_CHECK_MODULES(NSS, [ mozilla-nss >= 1.0.1 ])
PKG_CHECK_MODULES(NSS, [ nss ])
# NSS_CFLAGS=`echo $NSS_CFLAGS | sed 's/\/stable/\/nspr/'`
AC_SUBST(NSS_CFLAGS)
AC_SUBST(NSS_LIBS)
@@ -1 +1 @@
4
5
@@ -4,7 +4,7 @@ Priority: extra
Maintainer: Juhani Mäkelä <ext-juhani.3.makela@nokia.com>
Build-Depends: debhelper (>= 5), autotools-dev, fakeroot, libtool, pkg-config,
libssl-dev, libosso-dev (>= 1.0.2-1), libdbus-glib-1-2 (>= 0.60-1osso1),
libexpat1-dev, microb-engine-dev
libexpat1-dev, libnss3-dev
Standards-Version: 3.7.2

Package: libmaemosec0
@@ -121,7 +121,8 @@ verify_cert(X509_STORE* ctx, X509* cert, bool allow_unknown_issuer)

retval = (X509_verify_cert(csc) > 0);
if (allow_unknown_issuer &&
X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY == csc->error)
X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY ==
X509_STORE_CTX_get_error(csc))
/*
* TODO: Make sure that this does not make openssl to ignore
* other, more severe errors.
@@ -91,7 +91,7 @@ extern "C"
struct stat fs;
string dirname;
char cdirname [PATH_MAX];
char* dirsep = NULL;
const char* dirsep = NULL;
bool is_local = false;
char* tgtname = NULL;
size_t rv;

0 comments on commit e8a71cd

Please sign in to comment.
You can’t perform that action at this time.