Skip to content

Commit f88f3f1

Browse files
author
runrevali
committed
Merge branch 'develop' of https://github.com/runrev/livecode into refactor-syntax_unicode_6.6_merge
Conflicts: Makefile engine/Android.mk engine/engine-mobile.xcodeproj/project.pbxproj engine/engine.vcproj engine/engine.xcodeproj/project.pbxproj engine/hash_strings.rev engine/src/cmds.cpp engine/src/cmdsf.cpp engine/src/debug.cpp engine/src/debug.h engine/src/deploy_sign.cpp engine/src/globals.cpp engine/src/handler.cpp engine/src/keywords.cpp engine/src/lnxdc.cpp engine/src/lnxdc.h engine/src/lnxdcs.cpp engine/src/mblandroiddc.cpp engine/src/mbldc.h engine/src/mbliphonedc.mm engine/src/mblmain.cpp engine/src/mcssl.cpp engine/src/mcssl.h engine/src/mode_development.cpp engine/src/opensslsocket.cpp engine/src/operator.cpp engine/src/osxdc.h engine/src/osxsnapshot.mm engine/src/parseerrors.h engine/src/property.cpp engine/src/socket.h engine/src/srvscript.cpp engine/src/statemnt.cpp engine/src/sysdefs.h engine/src/sysspec.cpp engine/src/uidc.cpp engine/src/uidc.h engine/src/util.cpp engine/src/w32dc.h engine/src/w32dcs.cpp engine/src/w32stack.cpp engine/src/w32theme.cpp ide libgraphics/src/mblandroidtext.cpp prebuilt rules/Global Mobile.xcconfig rules/Global.vsprops rules/Global.xcconfig rules/application.linux.makefile rules/common.linux.makefile rules/library.linux.makefile thirdparty version
2 parents 0896787 + cb5ff90 commit f88f3f1

File tree

202 files changed

+5548
-2205
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

202 files changed

+5548
-2205
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ installer: libz libgif libjpeg libpcre libpng libopenssl libexternal libfoundati
7070

7171
$(MAKE) -C ./engine -f Makefile.installer installer
7272

73-
server: libz libgif libjpeg libpcre libpng libopenssl libexternal libfoundation kernel-server revsecurity libgraphics
73+
server: libz libgif libjpeg libpcre libpng libopenssl libexternal libfoundation libgraphics kernel-server revsecurity
7474
$(MAKE) -C ./engine -f Makefile.server server-community
7575

7676
###############################################################################

docs/dictionary/command/decrypt-using-rsa.xml

Lines changed: 1 addition & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1 @@
1-
<doc>
2-
<legacy_id></legacy_id>
3-
<name>decrypt using rsa</name>
4-
<type>command</type>
5-
6-
<syntax>
7-
<example>decrypt <i>source</i> using rsa with {public | private} key <i>key</i> [and passphrase <i>passphrase </i>]</example>
8-
</syntax>
9-
10-
<synonyms>
11-
</synonyms>
12-
13-
<summary></summary>
14-
15-
<examples>
16-
<example>decrypt tMessage with public key tPublicKey</example>
17-
<example>decrypt field 1 with private key tPrivateKey</example>
18-
</examples>
19-
20-
<history>
21-
<introduced version="4.6">Added.</introduced>
22-
<deprecated version=""></deprecated>
23-
<removed version=""></removed>
24-
25-
<experimental version=""></experimental>
26-
<nonexperimental version=""></nonexperimental>
27-
</history>
28-
29-
<objects>
30-
</objects>
31-
32-
<platforms>
33-
<mac/>
34-
<windows/>
35-
<linux/>
36-
</platforms>
37-
38-
<classes>
39-
<desktop/>
40-
<server/>
41-
<web/>
42-
</classes>
43-
44-
<security>
45-
<network/>
46-
</security>
47-
48-
49-
<classification>
50-
</classification>
51-
52-
<references>
53-
<command tag="encrypt">encrypt Command</command>
54-
<command tag="decrypt">descrypt Command</command>
55-
<command tag="encrypt using rsa">encrypt using rsa Command</command>
56-
</references>
57-
58-
<description>
59-
<overview>Use the <b>decrypt using rsa</b> command to decrypt a message using RSA public key encryption.</overview>
60-
61-
<parameters>
62-
<parameter>The <i>message</i> is the message to be decrypted</parameter>
63-
<parameter>The <i>key</i> is the key to be used for the decryption, in PEM format</parameter>
64-
<parameter>The <i>passphrase </i>is an optional passphrase</parameter> </parameters>
65-
66-
<value></value>
67-
<comments>Use the form<p>&#9;decrypt <i>message</i> with private key <i>key</i></p><p>to decode a message that a sender has encrypted with its corresponding public key.</p><p></p><p>Use the form</p><p>&#9;decrypt <i>message</i> with public key <i>key</i></p><p>to verify that a message has been encoded with the corresponding private key, and there has come from one of its holders (this is a verify operation).</p><p></p><p><b>Generating key pairs</b></p><p>Public-private key pairs can be generated using the OpenSSL suite of command-line tools. For example:</p><p>&#9;openssl genrsa -out private_key.pem 512</p><p>&#9;openssl rsa -pubout -in private_key.pem -out public_key.pem</p><p>Will generate a key pair of size 512-bits, placing the private key in private_key.pem and the public key in public_key.pem.</p><p></p><p>For more information on these utilities see http://www.openssl.org/docs/apps/rsa.html and http://www.openssl.org/docs/apps/genrsa.html.</p></comments>
68-
</description>
69-
</doc>
1+
<doc> <legacy_id></legacy_id> <name>decrypt using rsa</name> <type>command</type> <syntax> <example>decrypt <i>source</i> using rsa with {public | private} key <i>key</i> [and passphrase <i>passphrase </i>]</example> </syntax> <synonyms> </synonyms> <summary></summary> <examples><example>decrypt tMessage with public key tPublicKey</example><example>decrypt field 1 with private key tPrivateKey</example> </examples> <history> <introduced version="4.6">Added.</introduced> <deprecated version=""></deprecated> <removed version=""></removed> <experimental version=""></experimental> <nonexperimental version=""></nonexperimental> </history> <objects> </objects> <platforms> <mac/> <windows/> <linux/> <ios/> <android/> </platforms> <classes> <desktop/> <server/> <web/> <mobile/> </classes> <security> <network/> </security> <classification> </classification> <references> <command tag="encrypt">encrypt Command</command> <command tag="decrypt">decrypt Command</command> <command tag="encrypt using rsa">encrypt using rsa Command</command> </references> <description> <overview>Use the <b>decrypt using rsa</b> command to decrypt a message using RSA public key encryption.</overview> <parameters> <parameter>The <i>message</i> is the message to be decrypted</parameter> <parameter>The <i>key</i> is the key to be used for the decryption, in PEM format</parameter> <parameter>The <i>passphrase </i>is an optional passphrase</parameter> </parameters> <value></value> <comments>Use the form<p>&#9;decrypt <i>message</i> with private key <i>key</i></p><p>to decode a message that a sender has encrypted with its corresponding public key.</p><p></p><p>Use the form</p><p>&#9;decrypt <i>message</i> with public key <i>key</i></p><p>to verify that a message has been encoded with the corresponding private key, and there has come from one of its holders (this is a verify operation).</p><p></p><p><b>Generating key pairs</b></p><p>Public-private key pairs can be generated using the OpenSSL suite of command-line tools. For example:</p><p>&#9;openssl genrsa -out private_key.pem 512</p><p>&#9;openssl rsa -pubout -in private_key.pem -out public_key.pem</p><p>Will generate a key pair of size 512-bits, placing the private key in private_key.pem and the public key in public_key.pem.</p><p></p><p>For more information on these utilities see http://www.openssl.org/docs/apps/rsa.html and http://www.openssl.org/docs/apps/genrsa.html.</p></comments> </description></doc>

docs/dictionary/command/decrypt.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<doc> <legacy_id>1559</legacy_id> <name>decrypt</name> <type>command</type> <syntax> <example>decrypt <i>source</i> using <i>cipher</i> with [password|key] <i>passorkey </i>[and salt saltvalue] [and IV <i>IVvalue</i>] [at <i>bitvalue</i> bit]</example> </syntax> <synonyms> </synonyms> <summary></summary> <examples> </examples> <history> <introduced version="2.5">Added.</introduced> <deprecated version=""></deprecated> <removed version=""></removed> </history> <objects> </objects> <platforms> <mac/> <windows/> <linux/> </platforms> <classes> <desktop/> <server/> <web/> </classes> <security> <network/> </security> <classification> </classification> <references> <command tag="encrypt">encrypt Command</command> </references> <description> <overview></overview> <parameters> </parameters> <value>On failure encrypt/decrypt set <b>the result</b> to the appropriate ssl error message. On success the variable <i>it</i> will contain the encrypted or decrypted data.</value> <comments>The encrypt and decrypt commands accept the source data that will be encrypted or decrypted. The cipher is the name of the cipher obtained using the ciphernames function. The passorkey specifies the password or key that will be use for encryption or decryption as determined by the keyword before it. If you specify key then the key needs to be the same size (in bits, eight per byte) as the specified cipher key length. The key may optionally be accompanied by the IVvalue used by some ciphers. If you specify password or don't specify a key mode, then a password, tyically text, will be used. The password may optionally be accompanied by a saltvalue. The bits specifies the key length in bits (for example, 64, 128, 192 or 256) and may be zero or empty for the default length (that listed with the cipherNames function). Some ciphers have fixed key lengths and using an unsupported value will result in an error.<p></p><p>The key and IV value are the fundamental determiner in block ciphers. The IV value is typically the width (in bits) of the block associated with the cipher. The default value is zero. Its use is beyond the scope of this documentation.</p><p></p><p>The password and salt value are combined and scrambled to form the key and IV which are used as described above. The key derivation process is the same as that used in the openSSL utility. A 16-byte salt prefix is prepended to the encrypted data, based on the salt value. This is used in decryption. If no salt value is specified for a password, one is randomly generated. The use of a randomized salt value is a protection against dictionary attacks.</p><p></p><p>Some modes of block ciphers will pad data to be a multiple of block size. The padding method is that used by the openSSL utility and is a minimum of one byte.</p><p></p><p>To use OpenSSL functionality with LiveCode, make sure that the openssl shared library is installed, and in a place where LiveCode can find it. It is pre-installed with OSX. You can download and build OpenSSL at www.openssl.org and sitribute with your apps. LiveCode includes a prebuilt openssl dll which is required to use OpenSSL for windows (libeay32.dll) which needs to be in the application, current, or system directory. If LiveCode cannot load SSL, it will return the error in the result &quot;ssl library not found&quot;.</p><p></p><p></p><important>The decryptcommand is part of the SSL &amp; Encryption library. To ensure that the command works in a standalone application, you must include this custom library when you create your standalone. In the Inclusions section on the General screen of the Standalone Application Settings window, make sure &quot;SSL &amp; Encryption&quot; is selected in the list of script libraries.</important></comments> </description></doc>
1+
<doc> <legacy_id>1559</legacy_id> <name>decrypt</name> <type>command</type> <syntax> <example>decrypt <i>source</i> using <i>cipher</i> with [password|key] <i>passorkey </i>[and salt saltvalue] [and IV <i>IVvalue</i>] [at <i>bitvalue</i> bit]</example> </syntax> <synonyms> </synonyms> <summary></summary> <examples> </examples> <history> <introduced version="2.5">Added.</introduced> <deprecated version=""></deprecated> <removed version=""></removed> <experimental version=""></experimental> <nonexperimental version=""></nonexperimental> </history> <objects> </objects> <platforms> <mac/> <windows/> <linux/> <ios/> <android/> </platforms> <classes> <desktop/> <server/> <web/> <mobile/> </classes> <security> <network/> </security> <classification> </classification> <references> <command tag="encrypt">encrypt Command</command> </references> <description> <overview></overview> <parameters> </parameters> <value>On failure encrypt/decrypt set <b>the result</b> to the appropriate ssl error message. On success the variable <i>it</i> will contain the encrypted or decrypted data.</value> <comments>The encrypt and decrypt commands accept the source data that will be encrypted or decrypted. The cipher is the name of the cipher obtained using the ciphernames function. The passorkey specifies the password or key that will be use for encryption or decryption as determined by the keyword before it. If you specify key then the key needs to be the same size (in bits, eight per byte) as the specified cipher key length. The key may optionally be accompanied by the IVvalue used by some ciphers. If you specify password or don't specify a key mode, then a password, tyically text, will be used. The password may optionally be accompanied by a saltvalue. The bits specifies the key length in bits (for example, 64, 128, 192 or 256) and may be zero or empty for the default length (that listed with the cipherNames function). Some ciphers have fixed key lengths and using an unsupported value will result in an error.<p></p><p>The key and IV value are the fundamental determiner in block ciphers. The IV value is typically the width (in bits) of the block associated with the cipher. The default value is zero. Its use is beyond the scope of this documentation.</p><p></p><p>The password and salt value are combined and scrambled to form the key and IV which are used as described above. The key derivation process is the same as that used in the openSSL utility. A 16-byte salt prefix is prepended to the encrypted data, based on the salt value. This is used in decryption. If no salt value is specified for a password, one is randomly generated. The use of a randomized salt value is a protection against dictionary attacks.</p><p></p><p>Some modes of block ciphers will pad data to be a multiple of block size. The padding method is that used by the openSSL utility and is a minimum of one byte.</p><p></p><p>To use OpenSSL functionality with LiveCode, make sure that the openssl shared library is installed, and in a place where LiveCode can find it. It is pre-installed with OSX. You can download and build OpenSSL at www.openssl.org and sitribute with your apps. LiveCode includes a prebuilt openssl dll which is required to use OpenSSL for windows (libeay32.dll) which needs to be in the application, current, or system directory. If LiveCode cannot load SSL, it will return the error in the result "ssl library not found".</p><p></p><p></p><p></p><p></p><important> The decryptcommand is part of the SSL &amp; Encryption library. To ensure that the command works in a standalone application, you must include this custom library when you create your standalone. In the Inclusions section on the General screen of the Standalone Application Settings window, make sure "SSL &amp; Encryption" is selected in the list of script libraries.</important></comments> </description></doc>

docs/dictionary/command/encrypt-using-rsa.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<doc> <legacy_id></legacy_id> <name>encrypt using rsa</name> <type>command</type> <syntax> <example>encrypt <i>source</i> using rsa with {public | private} key <i>key</i> [and passphrase <i>passphrase</i>]</example> </syntax> <synonyms> </synonyms> <summary>Encrypt data using the RSA algorithm.</summary> <examples><example>encrypt myMessage with public key myKey</example><example>encrypt thisMessage with private key privateKey</example> </examples> <history> <introduced version="4.6">Added.</introduced> <deprecated version=""></deprecated> <removed version=""></removed> </history> <objects> </objects> <platforms> <mac/> <windows/> <linux/> </platforms> <classes> <desktop/> <server/> <web/> </classes> <security> <network/> </security> <classification> </classification> <references> <command tag="decrypt">decrypt Command</command> <command tag="encrypt">encrypt Command</command> <command tag="decrypt using rsa">decrypt using rsa Command</command> </references> <description> <overview>Use the <b>encrypt using rsa</b> command to encrypt a message using RSA public key encryption.</overview> <parameters> <parameter>The <i>message</i> is the message to be encrypted</parameter> <parameter>The <i>key</i> is the key to be used for the encryption, in PEM format</parameter> <parameter>The <i>passphrase </i>is an optional passphrase</parameter> </parameters> <value></value> <comments>Use the form <p><b>&#9;</b>encrypt <i>message</i> with public key <i>key</i></p><p>to encode a message that you only want to be decoded by the holder of the private key.</p><p></p><p>Use the form </p><p>&#9;encrypt <i>message</i> with private key <i>key</i></p><p>to encode a message that a receiver can then verify has come from one of the holders of the private key (this is a signing operation).</p><p></p><p><b>Generating key pairs</b></p><p>Public-private key pairs can be generated using the OpenSSL suite of command-line tools. For example:</p><p>&#9;openssl genrsa -out private_key.pem 512</p><p>&#9;openssl rsa -pubout -in private_key.pem -out public_key.pem</p><p>Will generate a key pair of size 512-bits, placing the private key in private_key.pem and the public key in public_key.pem.</p><p></p><p>For more information on these utilities see <a href="http://www.openssl.org/docs/apps/rsa.html">http://www.openssl.org/docs/apps/rsa.html</a> and <a href="http://www.openssl.org/docs/apps/genrsa.html">http://www.openssl.org/docs/apps/genrsa.html</a>.</p><p></p><p><note>The maximum length of a message that can be encrypted using RSA is the size of the key in bytes -11. So, for a 512-bit key pair, the maximum encryptable message size is 53 bytes.</note></p><p></p><p>For signing, the maximum length of an encryptable message isn't really an issue since typically in that scenario it will be some sort of hash that would be being encrypted. For the more traditional encrypting scenario, however, the standard approach is to use public key cryptography to encrypt a random password which is then used with a symmetric cipher to actually encrypt the payload.</p></comments> </description></doc>
1+
<doc> <legacy_id></legacy_id> <name>encrypt using rsa</name> <type>command</type> <syntax> <example>encrypt <i>source</i> using rsa with {public | private} key <i>key</i> [and passphrase <i>passphrase</i>]</example> </syntax> <synonyms> </synonyms> <summary>Encrypt data using the RSA algorithm.</summary> <examples><example>encrypt myMessage with public key myKey</example><example>encrypt thisMessage with private key privateKey</example> </examples> <history> <introduced version="4.6">Added.</introduced> <deprecated version=""></deprecated> <removed version=""></removed> <experimental version=""></experimental> <nonexperimental version=""></nonexperimental> </history> <objects> </objects> <platforms> <mac/> <windows/> <linux/> <ios/> <android/> </platforms> <classes> <desktop/> <server/> <web/> <mobile/> </classes> <security> <network/> </security> <classification> </classification> <references> <command tag="decrypt">decrypt Command</command> <command tag="encrypt">encrypt Command</command> <command tag="decrypt using rsa">decrypt using rsa Command</command> </references> <description> <overview>Use the <b>encrypt using rsa</b> command to encrypt a message using RSA public key encryption.</overview> <parameters> <parameter>The <i>message</i> is the message to be encrypted</parameter> <parameter>The <i>key</i> is the key to be used for the encryption, in PEM format</parameter> <parameter>The <i>passphrase </i>is an optional passphrase</parameter> </parameters> <value></value> <comments>Use the form <p><b>&#9;</b>encrypt <i>message</i> with public key <i>key</i></p><p>to encode a message that you only want to be decoded by the holder of the private key.</p><p></p><p>Use the form </p><p>&#9;encrypt <i>message</i> with private key <i>key</i></p><p>to encode a message that a receiver can then verify has come from one of the holders of the private key (this is a signing operation).</p><p></p><p><b>Generating key pairs</b></p><p>Public-private key pairs can be generated using the OpenSSL suite of command-line tools. For example:</p><p>&#9;openssl genrsa -out private_key.pem 512</p><p>&#9;openssl rsa -pubout -in private_key.pem -out public_key.pem</p><p>Will generate a key pair of size 512-bits, placing the private key in private_key.pem and the public key in public_key.pem.</p><p></p><p>For more information on these utilities see http://www.openssl.org/docs/apps/rsa.html and http://www.openssl.org/docs/apps/genrsa.html.</p><p></p><p></p><p></p><note> The maximum length of a message that can be encrypted using RSA is the size of the key in bytes -11. So, for a 512-bit key pair, the maximum encryptable message size is 53 bytes.</note><p></p><p>For signing, the maximum length of an encryptable message isn't really an issue since typically in that scenario it will be some sort of hash that would be being encrypted. For the more traditional encrypting scenario, however, the standard approach is to use public key cryptography to encrypt a random password which is then used with a symmetric cipher to actually encrypt the payload.</p></comments> </description></doc>

0 commit comments

Comments
 (0)