luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of gitlab.com:gambas/gambas

Browse source
This commit is contained in:
gambas 2018-10-25 23:35:41 +02:00
commit 07e4113e83
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Makefile.am
View file

@ -41,8 +41,8 @@ install-exec-local:
fi
@echo "Installing the Gambas appdata file"
@$(INSTALL) -d $(DESTDIR)$(datarootdir)/appdata
@$(INSTALL) $(srcdir)/desktop/gambas3.appdata.xml $(DESTDIR)$(datarootdir)/appdata
@$(INSTALL) -d $(DESTDIR)$(datarootdir)/metainfo
@$(INSTALL) $(srcdir)/desktop/gambas3.appdata.xml $(DESTDIR)$(datarootdir)/metainfo
@echo "Installing the Gambas template projects"
$(INSTALL) -d $(DESTDIR)$(gbdatadir)/template;
@ -53,7 +53,7 @@ uninstall-local:
@rm -f $(DESTDIR)$(bindir)/gbs$(GAMBAS_VERSION)
@rm -f $(DESTDIR)$(bindir)/gbw$(GAMBAS_VERSION)
@(cd $(srcdir)/src; for p in `cat INSTALL`; do rm -f $(DESTDIR)$(bindir)/$$p.gambas; done)
@rm -rf $(DESTDIR)$(datarootdir)/appdata/gambas3.appdata.xml
@rm -rf $(DESTDIR)$(datarootdir)/metainfo/gambas3.appdata.xml
@rm -rf $(DESTDIR)$(gbdatadir)/template
dist-hook:

4
gb.openssl/src/c_cipher.c
View file

@ -321,7 +321,7 @@ BEGIN_METHOD(CipherMethod_EncryptSalted, GB_STRING plain; GB_STRING passwd;
bzero(salt, sizeof(salt));
if (MISSING(salt)) {
assert(RAND_pseudo_bytes(salt, sizeof(salt)));
assert(RAND_bytes(salt, sizeof(salt)));
} else {
bzero(salt, sizeof(salt));
memcpy(salt, STRING(salt), MIN(sizeof(salt), LENGTH(salt)));
@ -397,7 +397,7 @@ BEGIN_METHOD(CipherMethod_EncryptSalted, GB_STRING plain; GB_STRING passwd)
char key[EVP_CIPHER_key_length(_method)];
bzero(key, sizeof(key));
RAND_pseudo_bytes(salt, sizeof(salt));
RAND_bytes(salt, sizeof(salt));
PKCS5_PBKDF_HMAC_SHA1(STRING(passwd), LENGTH(passwd), salt,
sizeof(salt), ITER, sizeof(key), key);