Vm-dev July 2015

vm-dev@lists.squeakfoundation.org

19 participants
87 discussions

pharo 4.0 Crashed in the VM thread again
by Sabine Manaa 09 Aug '15

09 Aug '15

Hi, I have the pharo crash again, now in my production system on a windows machine. I can not yet reproduce it and ask for your help. What does " a(n) bad class" in the stack dump mean? Regards Sabine Smalltalk stack dump: 0x256720 M Dictionary>at:ifAbsent: 0x79f46c0: a(n) Dictionary 0x256740 M RKACurrency class>currencyFor: 0x70af390: a(n) RKACurrency class 0x256764 M RKAMoney class>amount:currencyCode: 0x70acafc: a(n) RKAMoney class 0x256784 M SmallInteger(Number)>eur 0x1=0 0x2567f4 M [] in INVALID RECEIVER>monthReportTripsTableData 0xbb5988c: a(n) bad class 0x256818 M INVALID RECEIVER>do:with:when: 0xbb614e8: a(n) bad class 0x256844 I INVALID RECEIVER>do:with: 0xbb614e8: a(n) bad class 0x25686c I INVALID RECEIVER>datesDo: 0xbb614e8: a(n) bad class 0x2568a8 I INVALID RECEIVER>monthReportTripsTableData 0xbb5988c: a(n) bad class 0x2568cc I INVALID RECEIVER>addMonthReportTripsTable 0xbb5988c: a(n) bad class 0x2568ec I INVALID RECEIVER>createMonthReport: --------------------------------------------------------------------- Mon Jun 15 15:32:56 2015 Exception code: C0000005 Exception addr: 004239D0 Access violation (read access) at 00000016 EAX:00000016 EBX:0000005C ECX:0000000E EDX:0BB41FB4 ESI:0BD58C48 EDI:00000060 EBP:0BD58C48 ESP:0023DF30 EIP:004239D0 EFL:00210246 FP Control: 0000027F FP Status: 00000020 FP Tag: 0000FFFF Crashed in the VM thread Hardware information: Manufacturer: Unknown Model: Unknown Number of processors: 2 Page size: 4096 Memory Information (upon launch): Physical Memory Size: 4193908 kbytes Physical Memory Free: 3054672 kbytes Page File Size: 4194303 kbytes Page File Free: 3502492 kbytes Virtual Memory Size: 2097024 kbytes Virtual Memory Free: 2029820 kbytes Memory Load: 27 percent Processor 0: Intel(R) Xeon(R) CPU E5-2670 v2 @ 2.50GHz Identifier: Intel64 Family 6 Model 62 Stepping 4 ~MHZ: 2500 Processor 1: Intel(R) Xeon(R) CPU E5-2670 v2 @ 2.50GHz Identifier: Intel64 Family 6 Model 62 Stepping 4 ~MHZ: 2500 Operating System: Windows Server 2008 R2 Datacenter (Build 7601 Service Pack 1) Registered Owner: Amazon Registered Company: Amazon.com SP major version: 1 SP minor version: 0 Suite mask: 190 Product type: 3 Display Information: Graphics adapter name: RDPDD Chained DD Primary monitor resolution: 2560 x 1440 Device: RDPDD Chained DD Adapter String: ??? Bios String: ??? Chip Type: ??? DAC Type: ??? Memory Size: 0xFFFFFFFF Driver Versions: RDPDD: VM Version: Cog VM 4.0.0 (release) from Sep 25 2014 Compiler: gcc 4.6.2 Interpreter Build: NBCoInterpreter NativeBoost-CogPlugin-HolgerHansPeterFreyther.21 uuid: e0df6e2d-5694-40e2-8035-dc217200b424 Sep 25 2014 Cogit Build: NBCogit NativeBoost-CogPlugin-HolgerHansPeterFreyther.21 uuid: e0df6e2d-5694-40e2-8035-dc217200b424 Sep 25 2014 Source Version: https://github.com/pharo-project/pharo-vm.git Commit: 81b5d19917dcb78f22482a780deec48c53738396 Date: 2014-09-20 14:36:18 +0200 By: Esteban Lorenzano <estebanlm(a)gmail.com> Jenkins build #14858 Current byte code: -1 Primitive index: -1 Loaded plugins: JPEGReaderPlugin VMMaker.oscog-jeanbaptistearnaud.783 (i) DSAPrims VMMaker.oscog-jeanbaptistearnaud.783 (i) SqueakSSL SqueakSSL-Plugin-ar.3 (e) Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-EstebanLorenzano.43 (i) SocketPlugin VMMaker.oscog-jeanbaptistearnaud.783 (i) B2DPlugin VMMaker.oscog-jeanbaptistearnaud.783 (i) Kernel32 ZipPlugin VMMaker.oscog-jeanbaptistearnaud.783 (i) NativeBoostPlugin NativeBoost-CogPlugin-HolgerHansPeterFreyther.21 (i) BitBltPlugin VMMaker.oscog-jeanbaptistearnaud.783 (i) JPEGReadWriter2Plugin VMMaker.oscog-jeanbaptistearnaud.783 (i) FT2Plugin Freetype-Plugin-IgorStasenko.64 (e) SecurityPlugin VMMaker.oscog-jeanbaptistearnaud.783 (i) FilePlugin VMMaker.oscog-jeanbaptistearnaud.783 (i) MiscPrimitivePlugin VMMaker.oscog-jeanbaptistearnaud.783 (i) LargeIntegers v1.5 VMMaker.oscog-jeanbaptistearnaud.783 (i) LocalePlugin VMMaker.oscog-jeanbaptistearnaud.783 (i) Module information: 00400000 - 006ee000: C:\Users\Administrator\Desktop\Pharo4.0\Pharo.exe 02480000 - 02580004: CogCode 63000000 - 631ba000: C:\Users\Administrator\Desktop\Pharo4.0\LIBEAY32.dll 66e40000 - 66f02000: C:\Users\Administrator\Desktop\Pharo4.0\libfreetype-6.dll 69f40000 - 69f5a000: C:\Users\Administrator\Desktop\Pharo4.0\FT2Plugin.DLL 6c240000 - 6c267000: C:\Windows\system32\crtdll.dll 6cb80000 - 6cb99000: C:\Users\Administrator\Desktop\Pharo4.0\SqueakSSL.DLL 6e400000 - 6e467000: C:\Users\Administrator\Desktop\Pharo4.0\SSLEAY32.dll 73f50000 - 73f55000: C:\Windows\system32\SHFolder.dll 743b0000 - 74434000: C:\Windows\WinSxS\x86_microsoft.windows.common-controls_6595b64144ccf1df_5.82.7601.17514_none_ec83dffa859149af\COMCTL32.dll 74800000 - 74813000: C:\Windows\system32\dwmapi.dll 74820000 - 74826000: C:\Windows\system32\DCIMAN32.dll 74830000 - 74917000: C:\Windows\system32\DDRAW.dll 74920000 - 74942000: C:\Windows\system32\GLU32.dll 74950000 - 74a18000: C:\Windows\system32\OPENGL32.DLL 74a20000 - 74a52000: C:\Windows\system32\WINMM.dll 74a60000 - 74a85000: C:\Windows\system32\dinput.dll 74dc0000 - 74e0c000: C:\Windows\system32\apphelp.dll 74f00000 - 74f07000: C:\Windows\system32\WSOCK32.DLL 74f10000 - 74f4b000: C:\Windows\system32\rsaenh.dll 74f50000 - 74f66000: C:\Windows\system32\CRYPTSP.dll 74f70000 - 74f76000: C:\Windows\system32\rasadhlp.dll 74f80000 - 74fb8000: C:\Windows\System32\fwpuclnt.dll 74fc0000 - 74fc7000: C:\Windows\system32\WINNSI.DLL 74fd0000 - 74fec000: C:\Windows\system32\IPHLPAPI.DLL 74ff0000 - 74ff8000: C:\Windows\System32\winrnr.dll 75000000 - 75044000: C:\Windows\system32\DNSAPI.dll 75050000 - 75060000: C:\Windows\system32\napinsp.dll 75060000 - 75070000: C:\Windows\system32\NLAapi.dll 75070000 - 75075000: C:\Windows\System32\wshtcpip.dll 75090000 - 750cc000: C:\Windows\System32\mswsock.dll 75190000 - 75199000: C:\Windows\system32\VERSION.dll 75260000 - 7526c000: C:\Windows\syswow64\CRYPTBASE.dll 75270000 - 752d0000: C:\Windows\syswow64\SspiCli.dll 752d0000 - 7537c000: C:\Windows\syswow64\msvcrt.dll 75390000 - 75480000: C:\Windows\syswow64\RPCRT4.dll 75480000 - 760ca000: C:\Windows\syswow64\SHELL32.dll 76120000 - 76230000: C:\Windows\syswow64\kernel32.dll 76230000 - 762c0000: C:\Windows\syswow64\GDI32.dll 76540000 - 765cf000: C:\Windows\syswow64\OLEAUT32.dll 76700000 - 7685c000: C:\Windows\syswow64\OLE32.dll 76860000 - 76900000: C:\Windows\syswow64\ADVAPI32.DLL 769c0000 - 769d9000: C:\Windows\SysWOW64\sechost.dll 769e0000 - 76a5b000: C:\Windows\syswow64\COMDLG32.DLL 76a70000 - 76c0d000: C:\Windows\syswow64\SETUPAPI.dll 76ca0000 - 76cb2000: C:\Windows\syswow64\DEVOBJ.dll 76cc0000 - 76cc5000: C:\Windows\syswow64\psapi.dll 76cd0000 - 76d27000: C:\Windows\syswow64\SHLWAPI.dll 76d40000 - 76d75000: C:\Windows\syswow64\WS2_32.dll 76d90000 - 76dd7000: C:\Windows\syswow64\KERNELBASE.dll 76de0000 - 76dea000: C:\Windows\syswow64\LPK.dll 76df0000 - 76e50000: C:\Windows\system32\IMM32.DLL 76fc0000 - 770c0000: C:\Windows\syswow64\USER32.dll 770c0000 - 770e7000: C:\Windows\syswow64\CFGMGR32.dll 772b0000 - 7734d000: C:\Windows\syswow64\USP10.dll 77350000 - 7741c000: C:\Windows\syswow64\MSCTF.dll 777f0000 - 777f6000: C:\Windows\syswow64\NSI.dll 77820000 - 779a0000: C:\Windows\SysWOW64\ntdll.dll Primitive trace: basicNew at:put: stringHash:initialHash: basicNew at:put: new: stringHash:initialHash: at:put: stringHash:initialHash: at:put: stringHash:initialHash: at:put: stringHash:initialHash: at:put: stringHash:initialHash: at:put: stringHash:initialHash: at:put: stringHash:initialHash: at:put: stringHash:initialHash: at:put: stringHash:initialHash: at:put: stringHash:initialHash: at:put: stringHash:initialHash: basicNew at:put: new: at:put: at:put: at:put: basicNew basicNew basicNew new: basicNew new: basicNew new: basicNew new: basicNew at:put: at:put: basicNew stringHash:initialHash: compare:with:collated: compare:with:collated: compare:with:collated: compare:with:collated: compare:with:collated: basicNew perform:with: basicNew stringHash:initialHash: compare:with:collated: compare:with:collated: compare:with:collated: compare:with:collated: compare:with:collated: basicNew basicNew basicNew basicNew basicNew perform:with: basicNew perform:with: basicNew basicNew basicNew stringHash:initialHash: compare:with:collated: compare:with:collated: compare:with:collated: compare:with:collated: compare:with:collated: basicNew basicNew basicNew basicNew basicNew perform:with: basicNew perform:with: basicNew basicNew basicNew stringHash:initialHash: compare:with:collated: compare:with:collated: compare:with:collated: compare:with:collated: compare:with:collated: basicNew basicNew basicNew basicNew basicNew perform:with: basicNew perform:with: basicNew basicNew basicNew basicNew basicNew basicNew perform:with: basicNew perform:with: basicNew basicNew basicNew new: basicNew: basicNew basicNew: replaceFrom:to:with:startingAt: basicNew new: basicNew new: basicNew: basicNew basicNew: replaceFrom:to:with:startingAt: basicNew new: basicNew new: basicNew: basicNew basicNew: replaceFrom:to:with:startingAt: basicNew new: basicNew: basicNew basicNew: replaceFrom:to:with:startingAt: basicNew basicNew: replaceFrom:to:with:startingAt: replaceFrom:to:with:startingAt: basicNew: replaceFrom:to:with:startingAt: replaceFrom:to:with:startingAt: basicNew: basicNew basicNew indexOfAscii:inString:startingAt: basicNew: replaceFrom:to:with:startingAt: basicNew basicNew replaceFrom:to:with:startingAt: at:put: indexOfAscii:inString:startingAt: basicNew: replaceFrom:to:with:startingAt: basicNew basicNew replaceFrom:to:with:startingAt: basicNew: replaceFrom:to:with:startingAt: stringHash:initialHash: basicNew at:put: stringHash:initialHash: basicNew at:put: stringHash:initialHash: basicNew at:put: stringHash:initialHash: basicNew at:put: stringHash:initialHash: basicNew at:put: new: stringHash:initialHash: at:put: stringHash:initialHash: at:put: stringHash:initialHash: at:put: stringHash:initialHash: at:put: stringHash:initialHash: at:put: stringHash:initialHash: basicNew at:put: stringHash:initialHash: basicNew at:put: stringHash:initialHash: basicNew at:put: stringHash:initialHash: basicNew at:put: stringHash:initialHash: basicNew at:put: new: stringHash:initialHash: at:put: stringHash:initialHash: at:put: stringHash:initialHash: at:put: stringHash:initialHash: at:put: stringHash:initialHash: at:put: stringHash:initialHash: at:put: stringHash:initialHash: at:put: stringHash:initialHash: at:put: stringHash:initialHash: at:put: stringHash:initialHash: at:put: stringHash:initialHash: basicNew at:put: new: at:put: at:put: at:put: basicNew basicNew basicNew new: basicNew new: basicNew new: basicNew new: basicNew at:put: perform:with: truncated new: replaceFrom:to:with:startingAt: at:put: basicNew **IncrementalGC** Stack backtrace: [004239D0] ??? + 145872 in Pharo.exe [002567F5] ??? + 0 in (null) Smalltalk stack dump: 0x256720 M Dictionary>at:ifAbsent: 0x79f46c0: a(n) Dictionary 0x256740 M RKACurrency class>currencyFor: 0x70af390: a(n) RKACurrency class 0x256764 M RKAMoney class>amount:currencyCode: 0x70acafc: a(n) RKAMoney class 0x256784 M SmallInteger(Number)>eur 0x1=0 0x2567f4 M [] in INVALID RECEIVER>monthReportTripsTableData 0xbb5988c: a(n) bad class 0x256818 M INVALID RECEIVER>do:with:when: 0xbb614e8: a(n) bad class 0x256844 I INVALID RECEIVER>do:with: 0xbb614e8: a(n) bad class 0x25686c I INVALID RECEIVER>datesDo: 0xbb614e8: a(n) bad class 0x2568a8 I INVALID RECEIVER>monthReportTripsTableData 0xbb5988c: a(n) bad class 0x2568cc I INVALID RECEIVER>addMonthReportTripsTable 0xbb5988c: a(n) bad class 0x2568ec I INVALID RECEIVER>createMonthReport:

6 23

Re: [Pharo-dev] Reducing the activity of the image
by phil＠highoctane.be 02 Aug '15

02 Aug '15

Can't the box be setup 5o do some WoL thing and go back to sleep when idling for a while? This CPU usage is really annoying indeed. Phil Le 9 févr. 2015 21:11, "Norbert Hartl" <norbert(a)hartl.name> a écrit : > I have an installation where a pharo powered hardware is used in a closed > case. Over time that collects quite some heat. One reason for this is that > the pharo vm is taking approx. 6% CPU all the time. The only thing that > happens is network/sockets. I suspended the ui thread in the image but on > this platform it doesn't help. > Are there any tweaks to lower the polling and the activity of the image/vm > even more? > > thanks, > > Norbert > > >

7 16

VM Maker: VMMaker.oscog-rmacnak.1428.mcz
by commits＠source.squeak.org 30 Jul '15

30 Jul '15

Ryan Macnak uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-rmacnak.1428.mcz ==================== Summary ==================== Name: VMMaker.oscog-rmacnak.1428 Author: rmacnak Time: 29 July 2015, 8:50:25.107 pm UUID: 7ae0e720-4afd-4d2d-9824-6b553e1fc559 Ancestors: VMMaker.oscog-eem.1427 Fix MNU for cogged self and outer sends. =============== Diff against VMMaker.oscog-eem.1427 =============== Item was changed: ----- Method: CoInterpreter>>lookupLexicalNoMNU:from:rule: (in category 'message sending') ----- lookupLexicalNoMNU: selector from: mixin rule: rule "A shared part of the lookup for implicit receiver sends that found a lexically visible method, and self and outer sends." | receiverClass mixinApplication dictionary found | receiverClass := objectMemory fetchClassOf: localAbsentReceiver. + lkupClass := receiverClass. "For use by MNU" mixinApplication := self findApplicationOfTargetMixin: mixin startingAtBehavior: receiverClass. dictionary := objectMemory followObjField: MethodDictionaryIndex ofObject: mixinApplication. found := self lookupMethodInDictionary: dictionary. (found and: [(self isPrivateMethod: newMethod)]) ifTrue: [^0]. ^self lookupProtectedNoMNU: selector startingAt: receiverClass rule: rule!

1 0

[commit][3417] Integrate Marcel Taeumel & Tobias Pape' s v2 SSL plugin changes.
by commits＠squeakvm.org 30 Jul '15

30 Jul '15

Revision: 3417 Author: eliot Date: 2015-07-29 18:55:26 -0700 (Wed, 29 Jul 2015) Log Message: ----------- Integrate Marcel Taeumel & Tobias Pape's v2 SSL plugin changes. Modified Paths: -------------- branches/Cog/platforms/Mac OS/plugins/SqueakSSL/sqMacSSL.c branches/Cog/platforms/unix/plugins/SqueakSSL/sqUnixOpenSSL.c Added Paths: ----------- branches/Cog/platforms/Mac OS/plugins/SqueakSSL/Info.plist branches/Cog/platforms/unix/plugins/SqueakSSL/config.cmake Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Mon Jul 20 23:17:35 PDT 2015 + Wed Jul 29 18:55:18 PDT 2015 Added: branches/Cog/platforms/Mac OS/plugins/SqueakSSL/Info.plist =================================================================== --- branches/Cog/platforms/Mac OS/plugins/SqueakSSL/Info.plist (rev 0) +++ branches/Cog/platforms/Mac OS/plugins/SqueakSSL/Info.plist 2015-07-30 01:55:26 UTC (rev 3417) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>CFBundleDevelopmentRegion</key> + <string>English</string> + <key>CFBundleExecutable</key> + <string>SqueakSSL</string> + <key>CFBundleIconFile</key> + <string></string> + <key>CFBundleIdentifier</key> + <string>org.squeak.SqueakSSL</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundlePackageType</key> + <string>BNDL</string> + <key>CFBundleSignature</key> + <string>FAST</string> + <key>CFBundleVersion</key> + <string>1.0</string> + <key>CFBundleShortVersionString</key> + <string>1.0</string> + <key>CSResourcesFileMapped</key> + <true/> +</dict> +</plist> Modified: branches/Cog/platforms/Mac OS/plugins/SqueakSSL/sqMacSSL.c =================================================================== --- branches/Cog/platforms/Mac OS/plugins/SqueakSSL/sqMacSSL.c 2015-07-30 01:51:21 UTC (rev 3416) +++ branches/Cog/platforms/Mac OS/plugins/SqueakSSL/sqMacSSL.c 2015-07-30 01:55:26 UTC (rev 3417) @@ -1,479 +1,683 @@ -/* sqMacSSL.c: SqueakSSL implementation based on Mac OSX Security Services */ +/**************************************************************************** + * PROJECT: SqueakSSL implementation for Mac OS X + * FILE: sqMac2SSL.c + * CONTENT: SSL platform functions + * + * AUTHORS: Andreas Raab (ar) + * + * Tobias Pape (topa) + * Hasso Plattner Institute, Postdam, Germany + *****************************************************************************/ #include "sq.h" #include "SqueakSSL.h" +#include <string.h> +#include <stdarg.h> -#include <Security/Security.h> -#include <Security/SecCertificate.h> +#import <Security/Security.h> typedef struct sqSSL { - int state; - int certFlags; - int loglevel; + int state; + int certFlags; + int loglevel; - char *certName; - char *peerName; + char* certName; + char* peerName; + char* serverName; - - SSLContextRef ctx; - CFArrayRef certs; + SSLContextRef ctx; + CFArrayRef certs; - /* internal data buffer */ - char *dataBuf; - int dataLen; - int dataMax; - - /* external data buffer */ - char *outBuf; - int outLen; - int outMax; + /* internal data buffer */ + char* dataBuf; + int dataLen; + int dataMax; + + /* external data buffer */ + char* outBuf; + int outLen; + int outMax; } sqSSL; -static sqSSL **handleBuf = NULL; +/********************************************************************/ +#pragma mark Global State +/********************************************************************/ + +static sqSSL** handleBuf = NULL; static sqInt handleMax = 0; +// Max lengh of a Certificate common name or DNS Host name +#define CN_MAX 255 + /********************************************************************/ +#pragma mark Forward Declarations /********************************************************************/ + +static int printf_status(OSStatus status, const char* restrict format, ...); +static OSStatus sqExtractPeerName(sqSSL* ssl); +static sqSSL* sqSSLFromHandle(sqInt handle); +OSStatus sqSetupSSL(sqSSL* ssl, int isServer); + +OSStatus SqueakSSLRead(SSLConnectionRef connection, void* data, + size_t* dataLength); + +OSStatus SqueakSSLWrite(SSLConnectionRef connection, const void* data, + size_t* dataLength); + + /********************************************************************/ +#pragma mark - +#pragma mark Internal Helper +/********************************************************************/ -/* SqueakSSLRead: Custom read function for Secure Transport */ -OSStatus SqueakSSLRead(SSLConnectionRef connection, void *data, - size_t *dataLength) { - sqSSL *ssl = (sqSSL*) connection; - size_t sz = *dataLength; +static int printf_status(OSStatus status, const char* restrict format, ...) +{ + int ret = 0; + va_list args; + va_start(args, format); + CFErrorRef _e = CFErrorCreate(NULL, kCFErrorDomainOSStatus, status, NULL); + CFStringRef _sdesc = CFErrorCopyDescription(_e); + CFStringRef _sreas = CFErrorCopyFailureReason(_e); + CFStringRef _sreco = CFErrorCopyRecoverySuggestion(_e); + ret += vprintf(format, args); + ret += printf("Status (%d): %s (%s): %s\n", + (int)status, + CFStringGetCStringPtr(_sdesc, kCFStringEncodingUTF8), + CFStringGetCStringPtr(_sreas, kCFStringEncodingUTF8), + CFStringGetCStringPtr(_sreco, kCFStringEncodingUTF8)); + CFRelease(_sreco); + CFRelease(_sreas); + CFRelease(_sdesc); + CFRelease(_e); + va_end(args); + return ret; +} - if(ssl->loglevel) - printf("SqueakSSLRead: Requesting %d bytes, having %d bytes\n", - (int)sz, ssl->dataLen); - if(ssl->dataLen < sz) sz = ssl->dataLen; - memcpy(data, ssl->dataBuf, sz); - /* Did we have enough data? */ - if(sz == *dataLength) { - /* Adjust read buffer */ - memmove(ssl->dataBuf, ssl->dataBuf+sz, ssl->dataLen - sz); - ssl->dataLen -= sz; - *dataLength = sz; - return noErr; - } - ssl->dataLen = 0; - *dataLength = sz; - return errSSLWouldBlock; +/* By convention, the sqSSL object is named ssl and has its logLevel >= 0 */ +#define logprintf if (ssl->loglevel) printf +#define logprintf_status if (ssl->loglevel) printf_status + +/* sqSSLFromHandle: Maps a handle to an SSL */ +static sqSSL* sqSSLFromHandle(sqInt handle) +{ + return handle < handleMax ? handleBuf[handle] : NULL; } -/* SqueakSSLRead: Custom write function for Secure Transport */ -OSStatus SqueakSSLWrite(SSLConnectionRef connection, const void *data, - size_t *dataLength) { - sqSSL *ssl = (sqSSL*) connection; - size_t sz = ssl->outMax - ssl->outLen; - - if(ssl->loglevel) - printf("SqueakSSLWrite: Writing %d bytes, having %d free\n", - (int)*dataLength, (int)sz); - if(sz == 0) { - *dataLength = 0; - return errSSLWouldBlock; - } - if(*dataLength < sz) sz = *dataLength; - memcpy(ssl->outBuf + ssl->outLen, data, sz); - ssl->outLen += sz; - *dataLength = sz; - return noErr; +/* sqSetupSSL: Common SSL setup task */ +OSStatus sqSetupSSL(sqSSL* ssl, int isServer) +{ + OSStatus status = noErr; + + logprintf("sqSetupSSL: Setting up new context\n"); + /* Create the new context */ +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 + ssl->ctx = SSLCreateContext(NULL, + isServer ? kSSLServerSide : kSSLClientSide, + kSSLStreamType); +#else + status = SSLNewContext(isServer, &ssl->ctx); + if (status != noErr) { + logprintf_status(status, "SSLNewContext failed"); + return status; + } +#endif // MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 + + /* Set the connection ref */ + status = SSLSetConnection(ssl->ctx, ssl); + if (status != noErr) { + logprintf_status(status, "SSLSetConnection failed"); + return status; + } + + /* Set up the read/write functions */ + status = SSLSetIOFuncs(ssl->ctx, SqueakSSLRead, SqueakSSLWrite); + if (status != noErr) { + logprintf_status(status, "SSLSetIOFuncs failed"); + return status; + } + +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 + /* At least TLS 1 */ + status = SSLSetProtocolVersionMin(ssl->ctx, kTLSProtocol1); +#else + /* Prefer TLS 1 */ + status = SSLSetProtocolVersionEnabled(ssl->ctx, kTLSProtocol1, true); +#endif // MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 + if (status != noErr) { + logprintf_status(status, "SSLSetProtocolVersion{Min,Enabled} failed"); + return status; + } + + + /* Disable cert verification since we do that ourselves */ + status = SSLSetEnableCertVerify(ssl->ctx, false); + if (status != noErr) { + logprintf_status(status, "SSLSetEnableCertVerify failed"); + return status; + } + + if (ssl->serverName) { + /* Try for SNI */ +#if !(MAC_OS_X_VERSION_MAX_ALLOWED >= 1070) + status = SSLSetPeerDomainName(ssl->ctx, ssl->serverName, + strlen(ssl->serverName)); +#else + status = SSLSetPeerDomainName(ssl->ctx, ssl->serverName, + strnlen(ssl->serverName, CN_MAX - 1)); +#endif // MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 + if (status != noErr) { + logprintf_status(status, "SSLSetPeerDomainName failed"); + return status; + } + } + + return status; } +/* sqExtractPeerName: Extract a copy of the first common name from the + certificate obtained in a handshake + */ +static OSStatus sqExtractPeerName(sqSSL* ssl) +{ + OSStatus status = noErr; + if (CFArrayGetCount(ssl->certs) <= 0) { + // No cert -> no peer name available + return status; + } + + char peerName[CN_MAX + 1]; + CFStringRef cfName = NULL; + SecCertificateRef cert = (SecCertificateRef)CFArrayGetValueAtIndex(ssl->certs, 0); + status = SecCertificateCopyCommonName(cert, &cfName); + if (status == noErr) { + CFStringGetCString(cfName, peerName, sizeof(peerName), kCFStringEncodingUTF8); +#if !(MAC_OS_X_VERSION_MAX_ALLOWED >= 1070) + ssl->peerName = strdup(peerName); +#else + ssl->peerName = strndup(peerName, CN_MAX); +#endif + CFRelease(cfName); + } + return status; +} + + +#pragma mark - +#pragma mark Callbacks + /********************************************************************/ /********************************************************************/ /********************************************************************/ -/* sslFromHandle: Maps a handle to an SSL */ -static sqSSL *sslFromHandle(sqInt handle) { - return handle < handleMax ? handleBuf[handle] : NULL; -} +/* SqueakSSLRead: Custom read function for Secure Transport */ +OSStatus SqueakSSLRead(SSLConnectionRef connection, void* data, + size_t* dataLength) +{ + sqSSL* ssl = (sqSSL*)connection; + size_t sz = *dataLength; -/* sqSetupSSL: Common SSL setup task */ + logprintf("SqueakSSLRead: Requesting %d bytes, having %d bytes\n", + (int)sz, ssl->dataLen); -int sqSetupSSL(sqSSL *ssl, int isServer) { - OSStatus status; + if (ssl->dataLen < sz) { + sz = ssl->dataLen; + } + memcpy(data, ssl->dataBuf, sz); - if(ssl->loglevel) printf("sqSetupSSL: Setting up new context\n"); - /* Create the new context */ - status = SSLNewContext(isServer, &ssl->ctx); - if(status) { - if(ssl->loglevel) printf("SSLNewContext failed: code = %d\n", (int)status); - return 0; - } - /* Set the connection ref */ - status = SSLSetConnection(ssl->ctx, ssl); - if(status) { - if(ssl->loglevel) printf("SSLSetConnection failed: code = %d\n", (int)status); - return 0; - } - - /* Set up the read/write functions */ - status = SSLSetIOFuncs(ssl->ctx,SqueakSSLRead, SqueakSSLWrite); - if(status) { - if(ssl->loglevel) printf("SSLSetIOFuncs failed: code = %d\n", (int)status); - return 0; - } + /* Did we have enough data? */ + if (sz == *dataLength) { + /* Adjust read buffer */ + memmove(ssl->dataBuf, ssl->dataBuf+sz, ssl->dataLen - sz); + ssl->dataLen -= sz; + *dataLength = sz; + return noErr; + } - /* Enable desired protocols */ - status = SSLSetProtocolVersionEnabled(ssl->ctx, kSSLProtocol2, false); - if(status) { - if(ssl->loglevel) printf("SSLSetProtocolVersionEnabled failed: code = %d\n", (int)status); - return 0; - } + ssl->dataLen = 0; + *dataLength = sz; + return errSSLWouldBlock; +} - status = SSLSetProtocolVersionEnabled(ssl->ctx, kSSLProtocol3, true); - if(status) { - if(ssl->loglevel) printf("SSLSetProtocolVersionEnabled failed: code = %d\n", (int)status); - return 0; - } +/* SqueakSSLRead: Custom write function for Secure Transport */ +OSStatus SqueakSSLWrite(SSLConnectionRef connection, const void* data, + size_t* dataLength) +{ + sqSSL* ssl = (sqSSL*)connection; + size_t sz = ssl->outMax - ssl->outLen; - status = SSLSetProtocolVersionEnabled(ssl->ctx, kTLSProtocol1, true); - if(status) { - if(ssl->loglevel) printf("SSLSetProtocolVersionEnabled failed: code = %d\n", (int)status); - return 0; - } - /* Disable cert verification since we do that ourselves */ - status = SSLSetEnableCertVerify(ssl->ctx, false); - if(status) { - if(ssl->loglevel) printf("SSLSetEnableCertVerify failed: code = %d\n", (int)status); - return 0; - } + logprintf("SqueakSSLWrite: Writing %d bytes, having %d free\n", + (int)*dataLength, (int)sz); + if (sz == 0) { + *dataLength = 0; + return errSSLWouldBlock; + } - return 1; + if (*dataLength < sz) { + sz = *dataLength; + } + memcpy(ssl->outBuf + ssl->outLen, data, sz); + ssl->outLen += sz; + *dataLength = sz; + return noErr; } /********************************************************************/ +#pragma mark - +#pragma mark Plugin Interface /********************************************************************/ -/********************************************************************/ /* sqCreateSSL: Creates a new SSL instance. - Arguments: None. - Returns: SSL handle. + Arguments: None. + Returns: SSL handle. */ -sqInt sqCreateSSL(void) { - sqInt handle = 0; - sqSSL *ssl = NULL; +sqInt sqCreateSSL(void) +{ + sqInt handle = 0; + sqSSL* ssl = NULL; - ssl = calloc(1, sizeof(sqSSL)); - ssl->loglevel = 0; + ssl = calloc(1, sizeof(sqSSL)); + ssl->loglevel = 0; - /* Find a free handle */ - for(handle = 1; handle < handleMax; handle++) - if(handleBuf[handle] == NULL) break; + /* Find a free handle */ + for (handle = 1; handle < handleMax; handle++) { + if (handleBuf[handle] == NULL) { + break; + } + } - if(handle >= handleMax) { - int i, delta = 100; - /* Resize the handle buffer */ - handleBuf = realloc(handleBuf, (handleMax+delta)*sizeof(void*)); - for(i = handleMax; i < handleMax+delta; i++) - handleBuf[i] = NULL; - handleMax += delta; - } - handleBuf[handle] = ssl; - return handle; + if (handle >= handleMax) { + int delta = 100; + /* Resize the handle buffer */ + handleBuf = (sqSSL**)realloc(handleBuf, + (handleMax + delta) * sizeof(sqSSL*)); + for (int i = handleMax; i < handleMax + delta; i++) { + handleBuf[i] = NULL; + } + handleMax += delta; + } + handleBuf[handle] = ssl; + return handle; } /* sqDestroySSL: Destroys an SSL instance. - Arguments: - handle - the SSL handle - Returns: Non-zero if successful. + Arguments: + handle - the SSL handle + Returns: Non-zero if successful. */ -sqInt sqDestroySSL(sqInt handle) { - sqSSL *ssl = sslFromHandle(handle); - if(ssl == NULL) return 0; +sqInt sqDestroySSL(sqInt handle) +{ + sqSSL* ssl = sqSSLFromHandle(handle); + if (ssl == NULL) { + return 0; + } - if(ssl->certName) free(ssl->certName); - if(ssl->peerName) free(ssl->peerName); + if (ssl->ctx) { +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 + CFRelease(ssl->ctx); +#else + SSLDisposeContext(ssl->ctx); +#endif // MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 + } - free(ssl); - handleBuf[handle] = NULL; - return 1; + if (ssl->certName) { + free(ssl->certName); + } + if (ssl->peerName) { + free(ssl->peerName); + } + if (ssl->serverName) { + free(ssl->serverName); + } + + free(ssl); + handleBuf[handle] = NULL; + return 1; } /* sqConnectSSL: Start/continue an SSL client handshake. - Arguments: - handle - the SSL handle - srcBuf - the input token sent by the remote peer - srcLen - the size of the input token - dstBuf - the output buffer for a new token - dstLen - the size of the output buffer - Returns: The size of the output token or an error code. + Arguments: + handle - the SSL handle + srcBuf - the input token sent by the remote peer + srcLen - the size of the input token + dstBuf - the output buffer for a new token + dstLen - the size of the output buffer + Returns: The size of the output token or an error code. */ -sqInt sqConnectSSL(sqInt handle, char* srcBuf, sqInt srcLen, char *dstBuf, sqInt dstLen) { - OSStatus status; - sqSSL *ssl = sslFromHandle(handle); +sqInt sqConnectSSL(sqInt handle, char* srcBuf, sqInt srcLen, char* dstBuf, + sqInt dstLen) +{ + OSStatus status; + sqSSL* ssl = sqSSLFromHandle(handle); - if(ssl->loglevel) printf("sqConnectSSL: %x\n", (int)ssl); + logprintf("sqConnectSSL: %x\n", (int)ssl); - /* Verify state of session */ - if(ssl == NULL || (ssl->state != SQSSL_UNUSED && ssl->state != SQSSL_CONNECTING)) { - return SQSSL_INVALID_STATE; - } + /* Verify state of session */ + if (ssl == NULL + || (ssl->state != SQSSL_UNUSED && ssl->state != SQSSL_CONNECTING)) { + return SQSSL_INVALID_STATE; + } - /* Set up the output buffer */ - ssl->outBuf = dstBuf; - ssl->outLen = 0; - ssl->outMax = dstLen; + /* Set up the output buffer */ + ssl->outBuf = dstBuf; + ssl->outLen = 0; + ssl->outMax = dstLen; - if(ssl->dataLen + srcLen > ssl->dataMax) { - /* resize the data buffer */ - ssl->dataMax += (srcLen < 4096) ? (4096) : (srcLen+1024); - ssl->dataBuf = realloc(ssl->dataBuf, ssl->dataMax); - if(!ssl->dataBuf) return SQSSL_OUT_OF_MEMORY; - } - if(ssl->loglevel) printf("sqConnectSSL: input token %d bytes\n", srcLen); - memcpy(ssl->dataBuf + ssl->dataLen, srcBuf, srcLen); - ssl->dataLen += srcLen; + if (ssl->dataLen + srcLen > ssl->dataMax) { + /* resize the data buffer */ + ssl->dataMax += (srcLen < 4096) ? (4096) : (srcLen + 1024); + ssl->dataBuf = realloc(ssl->dataBuf, ssl->dataMax); + if (!ssl->dataBuf) { + return SQSSL_OUT_OF_MEMORY; + } + } + logprintf("sqConnectSSL: input token %d bytes\n", srcLen); + memcpy(ssl->dataBuf + ssl->dataLen, srcBuf, srcLen); + ssl->dataLen += srcLen; - /* Establish initial connection */ - if(ssl->state == SQSSL_UNUSED) { - ssl->state = SQSSL_CONNECTING; - if(ssl->loglevel) printf("sqConnectSSL: Setting up SSL\n"); - if(!sqSetupSSL(ssl, 0)) return SQSSL_GENERIC_ERROR; - } + /* Establish initial connection */ + if (ssl->state == SQSSL_UNUSED) { + ssl->state = SQSSL_CONNECTING; + logprintf("sqConnectSSL: Setting up SSL\n"); + status = sqSetupSSL(ssl, 0); + if (status != noErr) { + return SQSSL_GENERIC_ERROR; + } + } - status = SSLHandshake(ssl->ctx); - if(status == errSSLWouldBlock) { - /* Return token to caller */ - if(ssl->loglevel) printf("sqConnectSSL: Produced %d token bytes\n", ssl->outLen); - return ssl->outLen ? ssl->outLen : SQSSL_NEED_MORE_DATA; - } - if(status != noErr) { - if(ssl->loglevel) printf("sqConnectSSL: SSLHandshake returned %d\n", (int)status); - return SQSSL_GENERIC_ERROR; - } - /* We are connected. Verify the cert. */ - ssl->state = SQSSL_CONNECTED; - ssl->certFlags = -1; + status = SSLHandshake(ssl->ctx); + if (status == errSSLWouldBlock) { + /* Return token to caller */ + logprintf("sqConnectSSL: Produced %d token bytes\n", ssl->outLen); + return ssl->outLen ? ssl->outLen : SQSSL_NEED_MORE_DATA; + } + if (status != noErr) { + logprintf_status(status, "sqConnectSSL: SSLHandshake"); + return SQSSL_GENERIC_ERROR; + } + /* We are connected. Verify the cert. */ + ssl->state = SQSSL_CONNECTED; + ssl->certFlags = -1; - /* Extract the peer name from the cert */ - status = SSLCopyPeerCertificates(ssl->ctx, &ssl->certs); - if(status == noErr) { - if(CFArrayGetCount(ssl->certs) > 0) { - char peerName[256]; - CFStringRef cfName; - SecCertificateRef cert = (SecCertificateRef) CFArrayGetValueAtIndex(ssl->certs, 0); - status = SecCertificateCopyCommonName(cert, &cfName); - if(status == noErr) { - CFStringGetCString(cfName, peerName, sizeof(peerName), kCFStringEncodingUTF8); - ssl->peerName = strdup(peerName); - CFRelease(cfName); - } - } - } - return 0; + /* Extract the peer name from the cert */ + status = SSLCopyPeerCertificates(ssl->ctx, &ssl->certs); + if (status == noErr) { + sqExtractPeerName(ssl); + } + return SQSSL_OK; } /* sqAcceptSSL: Start/continue an SSL server handshake. - Arguments: - handle - the SSL handle - srcBuf - the input token sent by the remote peer - srcLen - the size of the input token - dstBuf - the output buffer for a new token - dstLen - the size of the output buffer - Returns: The size of the output token or an error code. + Arguments: + handle - the SSL handle + srcBuf - the input token sent by the remote peer + srcLen - the size of the input token + dstBuf - the output buffer for a new token + dstLen - the size of the output buffer + Returns: The size of the output token or an error code. */ -sqInt sqAcceptSSL(sqInt handle, char* srcBuf, sqInt srcLen, char *dstBuf, sqInt dstLen) { - OSStatus status; - sqSSL *ssl = sslFromHandle(handle); +sqInt sqAcceptSSL(sqInt handle, char* srcBuf, sqInt srcLen, char* dstBuf, + sqInt dstLen) +{ + OSStatus status = noErr; + sqSSL* ssl = sqSSLFromHandle(handle); - /* Verify state of session */ - if(ssl == NULL || (ssl->state != SQSSL_UNUSED && ssl->state != SQSSL_ACCEPTING)) { - return SQSSL_INVALID_STATE; - } + /* Verify state of session */ + if (ssl == NULL + || (ssl->state != SQSSL_UNUSED && ssl->state != SQSSL_ACCEPTING)) { + return SQSSL_INVALID_STATE; + } - /* Set up the output buffer */ - ssl->outBuf = dstBuf; - ssl->outLen = 0; - ssl->outMax = dstLen; - - if(ssl->dataLen + srcLen > ssl->dataMax) { - /* resize the data buffer */ - ssl->dataMax += (srcLen < 4096) ? (4096) : (srcLen+1024); - ssl->dataBuf = realloc(ssl->dataBuf, ssl->dataMax); - if(!ssl->dataBuf) return SQSSL_OUT_OF_MEMORY; - } - if(ssl->loglevel) printf("sqConnectSSL: input token %d bytes\n", srcLen); - memcpy(ssl->dataBuf + ssl->dataLen, srcBuf, srcLen); - ssl->dataLen += srcLen; - - /* Establish initial connection */ - if(ssl->state == SQSSL_UNUSED) { - ssl->state = SQSSL_ACCEPTING; - if(ssl->loglevel) printf("sqAcceptSSL: Setting up SSL\n"); - if(!sqSetupSSL(ssl, 1)) return SQSSL_GENERIC_ERROR; - if(ssl->loglevel) printf("sqAcceptSSL: setting accept state\n"); - } + /* Set up the output buffer */ + ssl->outBuf = dstBuf; + ssl->outLen = 0; + ssl->outMax = dstLen; - status = SSLHandshake(ssl->ctx); - if(status == errSSLWouldBlock) { - /* Return token to caller */ - return ssl->outLen ? ssl->outLen : SQSSL_NEED_MORE_DATA; - } - if(status != noErr) { - if(ssl->loglevel) printf("sqConnectSSL: SSLHandshake returned %d\n", (int)status); - return SQSSL_GENERIC_ERROR; - } - /* We are connected. Verify the cert. */ - ssl->state = SQSSL_CONNECTED; - return 0; + if (ssl->dataLen + srcLen > ssl->dataMax) { + /* resize the data buffer */ + ssl->dataMax += (srcLen < 4096) ? (4096) : (srcLen + 1024); + ssl->dataBuf = realloc(ssl->dataBuf, ssl->dataMax); + if (!ssl->dataBuf) { + return SQSSL_OUT_OF_MEMORY; + } + } + logprintf("sqConnectSSL: input token %d bytes\n", srcLen); + memcpy(ssl->dataBuf + ssl->dataLen, srcBuf, srcLen); + ssl->dataLen += srcLen; + + /* Establish initial connection */ + if (ssl->state == SQSSL_UNUSED) { + ssl->state = SQSSL_ACCEPTING; + logprintf("sqAcceptSSL: Setting up SSL\n"); + status = sqSetupSSL(ssl, 1); + if (status != noErr) { + return SQSSL_GENERIC_ERROR; + } + logprintf("sqAcceptSSL: setting accept state\n"); + } + + status = SSLHandshake(ssl->ctx); + if (status == errSSLWouldBlock) { + /* Return token to caller */ + return ssl->outLen ? ssl->outLen : SQSSL_NEED_MORE_DATA; + } + if (status != noErr) { + logprintf("sqConnectSSL: SSLHandshake returned %d\n", (int)status); + return SQSSL_GENERIC_ERROR; + } + /* We are connected. Verify the cert. */ + ssl->state = SQSSL_CONNECTED; + return SQSSL_OK; } /* sqEncryptSSL: Encrypt data for SSL transmission. - Arguments: - handle - the SSL handle - srcBuf - the unencrypted input data - srcLen - the size of the input data - dstBuf - the output buffer for the encrypted contents - dstLen - the size of the output buffer - Returns: The size of the output generated or an error code. + Arguments: + handle - the SSL handle + srcBuf - the unencrypted input data + srcLen - the size of the input data + dstBuf - the output buffer for the encrypted contents + dstLen - the size of the output buffer + Returns: The size of the output generated or an error code. */ -sqInt sqEncryptSSL(sqInt handle, char* srcBuf, sqInt srcLen, char *dstBuf, sqInt dstLen) { - size_t nbytes; - OSStatus status; - sqSSL *ssl = sslFromHandle(handle); +sqInt sqEncryptSSL(sqInt handle, char* srcBuf, sqInt srcLen, char* dstBuf, + sqInt dstLen) +{ + size_t nbytes = 0; + OSStatus status = noErr; + sqSSL* ssl = sqSSLFromHandle(handle); - if(ssl == NULL || ssl->state != SQSSL_CONNECTED) return SQSSL_INVALID_STATE; + if (ssl == NULL || ssl->state != SQSSL_CONNECTED) { + return SQSSL_INVALID_STATE; + } - /* Set up the output buffer */ - ssl->outBuf = dstBuf; - ssl->outLen = 0; - ssl->outMax = dstLen; - - if(ssl->loglevel) printf("sqEncryptSSL: Encrypting %d bytes\n", srcLen); + /* Set up the output buffer */ + ssl->outBuf = dstBuf; + ssl->outLen = 0; + ssl->outMax = dstLen; - status = SSLWrite(ssl->ctx, srcBuf, srcLen, &nbytes); - if(nbytes != srcLen) return SQSSL_GENERIC_ERROR; - if(status == errSSLWouldBlock || status == noErr) return ssl->outLen; - if(ssl->loglevel) printf("sqDecryptSSL: SSLWrite returned %d\n", (int)status); - return SQSSL_GENERIC_ERROR; + logprintf("sqEncryptSSL: Encrypting %d bytes\n", srcLen); + + status = SSLWrite(ssl->ctx, srcBuf, srcLen, &nbytes); + if (nbytes != srcLen) { + return SQSSL_GENERIC_ERROR; + } + if (status == errSSLWouldBlock || status == noErr + || status == errSSLClosedGraceful) { + return ssl->outLen; + } + logprintf_status(status, "sqDecryptSSL: SSLWrite"); + return SQSSL_GENERIC_ERROR; } /* sqDecryptSSL: Decrypt data for SSL transmission. - Arguments: - handle - the SSL handle - srcBuf - the encrypted input data - srcLen - the size of the input data - dstBuf - the output buffer for the decrypted contents - dstLen - the size of the output buffer - Returns: The size of the output generated or an error code. + Arguments: + handle - the SSL handle + srcBuf - the encrypted input data + srcLen - the size of the input data + dstBuf - the output buffer for the decrypted contents + dstLen - the size of the output buffer + Returns: The size of the output generated or an error code. */ -sqInt sqDecryptSSL(sqInt handle, char* srcBuf, sqInt srcLen, char *dstBuf, sqInt dstLen) { - size_t nbytes = 0; - OSStatus status; - sqSSL *ssl = sslFromHandle(handle); +sqInt sqDecryptSSL(sqInt handle, char* srcBuf, sqInt srcLen, char* dstBuf, + sqInt dstLen) +{ + size_t nbytes = 0; + OSStatus status = noErr; + sqSSL* ssl = sqSSLFromHandle(handle); - if(ssl == NULL || ssl->state != SQSSL_CONNECTED) return SQSSL_INVALID_STATE; + if (ssl == NULL || ssl->state != SQSSL_CONNECTED) { + return SQSSL_INVALID_STATE; + } - if(ssl->dataLen + srcLen > ssl->dataMax) { - /* resize the read buffer */ - ssl->dataMax += (srcLen < 4096) ? (4096) : (srcLen+1024); - ssl->dataBuf = realloc(ssl->dataBuf, ssl->dataMax); - if(!ssl->dataBuf) return SQSSL_OUT_OF_MEMORY; - } - if(ssl->loglevel) printf("sqDecryptSSL: Input data %d bytes\n", srcLen); - memcpy(ssl->dataBuf + ssl->dataLen, srcBuf, srcLen); - ssl->dataLen += srcLen; - - if(ssl->loglevel) printf("sqDecryptSSL: Decrypting %d bytes\n", ssl->dataLen); + if (ssl->dataLen + srcLen > ssl->dataMax) { + /* resize the read buffer */ + ssl->dataMax += (srcLen < 4096) ? (4096) : (srcLen + 1024); + ssl->dataBuf = realloc(ssl->dataBuf, ssl->dataMax); + if (!ssl->dataBuf) { + return SQSSL_OUT_OF_MEMORY; + } + } + logprintf("sqDecryptSSL: Input data %d bytes\n", srcLen); + memcpy(ssl->dataBuf + ssl->dataLen, srcBuf, srcLen); + ssl->dataLen += srcLen; - status = SSLRead(ssl->ctx, dstBuf, dstLen, &nbytes); - if(status == errSSLWouldBlock || status == noErr) return nbytes; - if(ssl->loglevel) printf("sqDecryptSSL: SSLRead returned %d\n", (int)status); - return SQSSL_GENERIC_ERROR; + logprintf("sqDecryptSSL: Decrypting %d bytes\n", ssl->dataLen); + + status = SSLRead(ssl->ctx, dstBuf, dstLen, &nbytes); + if (status == errSSLWouldBlock || status == noErr + || status == errSSLClosedGraceful) { + return nbytes; + } + logprintf_status(status, "sqDecryptSSL: SSLRead"); + return SQSSL_GENERIC_ERROR; } /* sqGetStringPropertySSL: Retrieve a string property from SSL. - Arguments: - handle - the ssl handle - propID - the property id to retrieve - Returns: The string value of the property. + Arguments: + handle - the ssl handle + propID - the property id to retrieve + Returns: The string value of the property. */ -char* sqGetStringPropertySSL(sqInt handle, int propID) { - sqSSL *ssl = sslFromHandle(handle); +char* sqGetStringPropertySSL(sqInt handle, int propID) +{ + sqSSL* ssl = sqSSLFromHandle(handle); - if(ssl == NULL) return NULL; - switch(propID) { - case SQSSL_PROP_PEERNAME: return ssl->peerName; - case SQSSL_PROP_CERTNAME: return ssl->certName; - default: - if(ssl->loglevel) printf("sqGetStringPropertySSL: Unknown property ID %d\n", propID); - return NULL; - } - return NULL; + if (ssl == NULL) { + return NULL; + } + + switch (propID) { + case SQSSL_PROP_PEERNAME: return ssl->peerName; + case SQSSL_PROP_CERTNAME: return ssl->certName; + case SQSSL_PROP_SERVERNAME: return ssl->serverName; + default: + logprintf("sqGetStringPropertySSL: Unknown property ID %d\n", propID); + return NULL; + } + return NULL; } /* sqSetStringPropertySSL: Set a string property in SSL. - Arguments: - handle - the ssl handle - propID - the property id to retrieve - propName - the property string - propLen - the length of the property string - Returns: Non-zero if successful. + Arguments: + handle - the ssl handle + propID - the property id to retrieve + propName - the property string + propLen - the length of the property string + Returns: Non-zero if successful. */ -sqInt sqSetStringPropertySSL(sqInt handle, int propID, char *propName, sqInt propLen) { - sqSSL *ssl = sslFromHandle(handle); - char *property = NULL; +sqInt sqSetStringPropertySSL(sqInt handle, int propID, char* propName, + sqInt propLen) +{ + sqSSL* ssl = sqSSLFromHandle(handle); + char* property = NULL; - if(ssl == NULL) return 0; + if (ssl == NULL) return 0; - if(propLen) { - property = calloc(1, propLen+1); - memcpy(property, propName, propLen); - }; + if (propLen) { + property = malloc(propLen + 1); + memcpy(property, propName, propLen); + property[propLen] = '\0'; + } - if(ssl->loglevel) printf("sqSetStringPropertySSL(%d): %s\n", propID, property); + logprintf("sqSetStringPropertySSL(%d): %s\n", + propID, property ? property : "(null)"); - switch(propID) { - case SQSSL_PROP_CERTNAME: ssl->certName = property; break; - default: - if(ssl->loglevel) printf("sqSetStringPropertySSL: Unknown property ID %d\n", propID); - return 0; - } - return 1; + switch(propID) { + case SQSSL_PROP_CERTNAME: + if (ssl->certName) { + free(ssl->certName); + } + ssl->certName = property; + break; + case SQSSL_PROP_SERVERNAME: + if (ssl->serverName) { + free(ssl->serverName); + } + ssl->serverName = property; + break; + default: + if (property) { + free(property); + } + logprintf("sqSetStringPropertySSL: Unknown property ID %d\n", propID); + return 0; + } + return 1; } /* sqGetIntPropertySSL: Retrieve an integer property from SSL. - Arguments: - handle - the ssl handle - propID - the property id to retrieve - Returns: The integer value of the property. + Arguments: + handle - the ssl handle + propID - the property id to retrieve + Returns: The integer value of the property. */ -int sqGetIntPropertySSL(sqInt handle, int propID) { - sqSSL *ssl = sslFromHandle(handle); +int sqGetIntPropertySSL(sqInt handle, int propID) +{ + sqSSL* ssl = sqSSLFromHandle(handle); - if(ssl == NULL) return 0; - switch(propID) { - case SQSSL_PROP_SSLSTATE: return ssl->state; - case SQSSL_PROP_CERTSTATE: return ssl->certFlags; - case SQSSL_PROP_VERSION: return 1; - case SQSSL_PROP_LOGLEVEL: return ssl->loglevel; - default: - if(ssl->loglevel) printf("sqGetIntPropertySSL: Unknown property ID %d\n", propID); - return 0; - } - return 0; + if (ssl == NULL) { + return 0; + } + + switch(propID) { + case SQSSL_PROP_SSLSTATE: return ssl->state; + case SQSSL_PROP_CERTSTATE: return ssl->certFlags; + case SQSSL_PROP_VERSION: return SQSSL_VERSION; + case SQSSL_PROP_LOGLEVEL: return ssl->loglevel; + default: + logprintf("sqGetIntPropertySSL: Unknown property ID %d\n", propID); + return 0; + } + return 0; } /* sqSetIntPropertySSL: Set an integer property in SSL. - Arguments: - handle - the ssl handle - propID - the property id to retrieve - propValue - the property value - Returns: Non-zero if successful. + Arguments: + handle - the ssl handle + propID - the property id to retrieve + propValue - the property value + Returns: Non-zero if successful. */ -sqInt sqSetIntPropertySSL(sqInt handle, sqInt propID, sqInt propValue) { - sqSSL *ssl = sslFromHandle(handle); - if(ssl == NULL) return 0; +sqInt sqSetIntPropertySSL(sqInt handle, sqInt propID, sqInt propValue) +{ + sqSSL* ssl = sqSSLFromHandle(handle); + if (ssl == NULL) { + return 0; + } - switch(propID) { - case SQSSL_PROP_LOGLEVEL: ssl->loglevel = propValue; break; - default: - if(ssl->loglevel) printf("sqSetIntPropertySSL: Unknown property ID %d\n", propID); - return 0; - } - return 1; + switch(propID) { + case SQSSL_PROP_SSLSTATE: // falltrough + case SQSSL_PROP_CERTSTATE: // falltrough + case SQSSL_PROP_VERSION: + logprintf("sqSetIntPropertySSL: property is readonly %d\n", propID); + break; + case SQSSL_PROP_LOGLEVEL: + ssl->loglevel = propValue; + break; + default: + logprintf("sqSetIntPropertySSL: Unknown property ID %d\n", propID); + return 0; + } + return 1; } Added: branches/Cog/platforms/unix/plugins/SqueakSSL/config.cmake =================================================================== --- branches/Cog/platforms/unix/plugins/SqueakSSL/config.cmake (rev 0) +++ branches/Cog/platforms/unix/plugins/SqueakSSL/config.cmake 2015-07-30 01:55:26 UTC (rev 3417) @@ -0,0 +1 @@ +PLUGIN_REQUIRE_PACKAGE (OPENSSL openssl) Modified: branches/Cog/platforms/unix/plugins/SqueakSSL/sqUnixOpenSSL.c =================================================================== --- branches/Cog/platforms/unix/plugins/SqueakSSL/sqUnixOpenSSL.c 2015-07-30 01:51:21 UTC (rev 3416) +++ branches/Cog/platforms/unix/plugins/SqueakSSL/sqUnixOpenSSL.c 2015-07-30 01:55:26 UTC (rev 3417) @@ -37,7 +37,7 @@ sqInt sqCopyBioSSL(sqSSL *ssl, BIO *bio, char *dstBuf, sqInt dstLen) { int nbytes = BIO_ctrl_pending(bio); - if(ssl->loglevel) printf("sqCopyBioSSL: %d bytes pending; buffer size %d\n", + if(ssl->loglevel) printf("sqCopyBioSSL: %d bytes pending; buffer size %ld\n", nbytes, dstLen); if(nbytes > dstLen) return -1; return BIO_read(bio, dstBuf, dstLen); @@ -439,7 +439,7 @@ switch(propID) { case SQSSL_PROP_SSLSTATE: return ssl->state; case SQSSL_PROP_CERTSTATE: return ssl->certFlags; - case SQSSL_PROP_VERSION: return 1; + case SQSSL_PROP_VERSION: return SQSSL_VERSION; case SQSSL_PROP_LOGLEVEL: return ssl->loglevel; default: if(ssl->loglevel) printf("sqGetIntPropertySSL: Unknown property ID %d\n", propID); @@ -462,7 +462,7 @@ switch(propID) { case SQSSL_PROP_LOGLEVEL: ssl->loglevel = propValue; break; default: - if(ssl->loglevel) printf("sqSetIntPropertySSL: Unknown property ID %d\n", propID); + if(ssl->loglevel) printf("sqSetIntPropertySSL: Unknown property ID %ld\n", propID); return 0; } return 1;

1 0

[commit][3416] Integrate Marcel Taeumel & Tobias Pape' s v2 SSL plugin changes.
by commits＠squeakvm.org 30 Jul '15

30 Jul '15

Revision: 3416 Author: eliot Date: 2015-07-29 18:51:21 -0700 (Wed, 29 Jul 2015) Log Message: ----------- Integrate Marcel Taeumel & Tobias Pape's v2 SSL plugin changes. M SqueakSSL/sqWin32SSL.c Modified Paths: -------------- trunk/platforms/win32/plugins/SqueakSSL/sqWin32SSL.c Modified: trunk/platforms/win32/plugins/SqueakSSL/sqWin32SSL.c =================================================================== --- trunk/platforms/win32/plugins/SqueakSSL/sqWin32SSL.c 2015-07-30 01:46:49 UTC (rev 3415) +++ trunk/platforms/win32/plugins/SqueakSSL/sqWin32SSL.c 2015-07-30 01:51:21 UTC (rev 3416) @@ -1,4 +1,16 @@ -/* sqWin32SSL.c: SqueakSSL implementation for Windows */ +/**************************************************************************** +* PROJECT: SqueakSSL implementation for Windows +* FILE: sqWin32SSL.c +* CONTENT: SSL platform functions +* +* AUTHORS: Andreas Raab (ar) +* +* Marcel Taeumel (mt) +* Hasso Plattner Institute, Postdam, Germany +* Tobias Pape (topa) +* Hasso Plattner Institute, Postdam, Germany +*****************************************************************************/ + #include <windows.h> #include <errno.h> #include <malloc.h> @@ -18,6 +30,7 @@ char *certName; char *peerName; + char *serverName; CredHandle sslCred; CtxtHandle sslCtxt; @@ -126,7 +139,7 @@ char bFriendlyName[MAX_NAME_SIZE]; if(certName) { - hStore = CertOpenSystemStore(0, "MY"); + hStore = CertOpenSystemStore(0, L"MY"); if(!hStore) { if(ssl->loglevel) printf("sqSetupCert: CertOpenSystemStore failed\n"); return 0; @@ -199,7 +212,9 @@ PCERT_NAME_INFO certInfo = NULL; PCERT_RDN_ATTR certAttr = NULL; DWORD dwSize = 0; - char tmpBuf[1024]; + int cbPeerName = 0; + LPTSTR tmpBuf = NULL; + DWORD cchTmpBuf = 0; if(ssl->peerName) { free(ssl->peerName); @@ -214,32 +229,21 @@ return 0; } - /* Figure out the size of the blob */ - if(!CryptDecodeObject(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, X509_NAME, - certHandle->pCertInfo->Subject.pbData, - certHandle->pCertInfo->Subject.cbData, - 0, NULL, &dwSize)) { - if(ssl->loglevel) printf("sqExtractPeerName: CryptDecodeObject failed\n"); - return 0; - } - - /* Get the contents */ - certInfo = alloca(dwSize); - if(!CryptDecodeObject(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, X509_NAME, - certHandle->pCertInfo->Subject.pbData, - certHandle->pCertInfo->Subject.cbData, - 0, certInfo, &dwSize)) { - if(ssl->loglevel) printf("sqExtractPeerName: CryptDecodeObject failed\n"); - return 0; - } + /* Extract CN from certificate */ + cchTmpBuf = CertGetNameString(certHandle, CERT_NAME_ATTR_TYPE, 0, szOID_COMMON_NAME, NULL, 0); + tmpBuf = (LPTSTR)alloca(cchTmpBuf * sizeof(TCHAR)); + CertGetNameString(certHandle, CERT_NAME_ATTR_TYPE, 0, szOID_COMMON_NAME, tmpBuf, cchTmpBuf); - /* Fetch the CN from the cert */ - certAttr = CertFindRDNAttr(szOID_COMMON_NAME, certInfo); - if(certAttr == NULL) return 0; - - /* Translate from RDN to string */ - if(CertRDNValueToStr(CERT_RDN_PRINTABLE_STRING, &certAttr->Value, tmpBuf, sizeof(tmpBuf)) == 0) return 0; +#ifdef _UNICODE + /* Convert wide to UTF8 */ + cbPeerName = WideCharToMultiByte(CP_UTF8, 0, tmpBuf, -1, NULL, 0, NULL, NULL); + if (cbPeerName == 0) return 0; + ssl->peerName = calloc(1, cbPeerName); + WideCharToMultiByte(CP_UTF8, 0, tmpBuf, -1, ssl->peerName, cbPeerName, NULL, NULL); +#else ssl->peerName = _strdup(tmpBuf); +#endif + if(ssl->loglevel) printf("sqExtractPeerName: Peer name is %s\n", ssl->peerName); CertFreeCertificateContext(certHandle); @@ -401,6 +405,7 @@ if(ssl->certName) free(ssl->certName); if(ssl->peerName) free(ssl->peerName); + if(ssl->serverName) free(ssl->serverName); if(ssl->dataBuf) free(ssl->dataBuf); free(ssl); @@ -423,6 +428,8 @@ SCHANNEL_CRED sc_cred = { 0 }; ULONG sslFlags, retFlags; sqSSL *ssl = sslFromHandle(handle); + LPTSTR serverName = NULL; + int ccServerName = 0; /* Verify state of session */ if(ssl == NULL || (ssl->state != SQSSL_UNUSED && ssl->state != SQSSL_CONNECTING)) { @@ -433,9 +440,10 @@ /* resize the data buffer */ ssl->dataMax += (srcLen < 4096) ? (4096) : (srcLen+1024); ssl->dataBuf = realloc(ssl->dataBuf, ssl->dataMax); - if(!ssl->dataBuf) return SQSSL_OUT_OF_MEMORY; + if (!ssl->dataBuf) return SQSSL_OUT_OF_MEMORY; } - if(ssl->loglevel) printf("sqConnectSSL: input token %d bytes\n", srcLen); + if(ssl->loglevel) + printf("sqConnectSSL: input token %d bytes\n", srcLen); memcpy(ssl->dataBuf + ssl->dataLen, srcBuf, srcLen); ssl->dataLen += srcLen; @@ -470,18 +478,32 @@ if(ssl->loglevel) printf("sqConnectSSL: Input to InitSecCtxt is %d bytes\n", ssl->dataLen); +#ifdef _UNICODE + if(ssl->serverName) { + ccServerName = MultiByteToWideChar(CP_UTF8, 0, ssl->serverName, -1, NULL, 0); + if (ccServerName == 0) { + return SQSSL_GENERIC_ERROR; + } + serverName = (LPTSTR)alloca(ccServerName * sizeof(TCHAR)); + if (MultiByteToWideChar(CP_UTF8, 0, ssl->serverName, -1, serverName, ccServerName) == 0) { + return SQSSL_GENERIC_ERROR; + } + } +#else + if(ssl->serverName) serverName = ssl->serverName; +#endif + if(ssl->state == SQSSL_UNUSED) { ssl->state = SQSSL_CONNECTING; - if(!sqSetupCert(ssl, ssl->certName, 0)) - /* FIXME. We need a different error code here. */ + if (!sqSetupCert(ssl, ssl->certName, 0)) { return SQSSL_GENERIC_ERROR; - - ret = InitializeSecurityContext(&ssl->sslCred, NULL, NULL, + } + ret = InitializeSecurityContext(&ssl->sslCred, NULL, serverName, sslFlags, 0, 0, NULL, 0, &ssl->sslCtxt, &ssl->sbdOut, &retFlags, NULL); } else { - ret = InitializeSecurityContext(&ssl->sslCred, &ssl->sslCtxt, NULL, + ret = InitializeSecurityContext(&ssl->sslCred, &ssl->sslCtxt, serverName, sslFlags, 0, 0, &ssl->sbdIn, 0, NULL, &ssl->sbdOut, &retFlags, NULL); } @@ -516,11 +538,11 @@ memmove(ssl->dataBuf, ssl->dataBuf + (ssl->dataLen - extra), extra); ssl->dataLen = extra; } else ssl->dataLen = 0; - + /* Don't return zero (SQSSL_OK) when more data is needed */ return count ? count : SQSSL_NEED_MORE_DATA; default: - if(ssl->loglevel) printf("Unexpected return code %d\n", ret); + if(ssl->loglevel) printf("Unexpected return code %lu\n", (unsigned long)ret); return SQSSL_GENERIC_ERROR; } } @@ -799,6 +821,7 @@ switch(propID) { case SQSSL_PROP_PEERNAME: return ssl->peerName; case SQSSL_PROP_CERTNAME: return ssl->certName; + case SQSSL_PROP_SERVERNAME: return ssl->serverName; default: if(ssl->loglevel) printf("sqGetStringPropertySSL: Unknown property ID %d\n", propID); return NULL; @@ -838,7 +861,7 @@ if(!pfxStore) return 0; /* And copy the certificates to MY store */ - myStore = CertOpenSystemStore(0, "MY"); + myStore = CertOpenSystemStore(0, L"MY"); pContext = NULL; while(pContext = CertEnumCertificatesInStore(pfxStore, pContext)) { CertAddCertificateContextToStore(myStore, pContext, CERT_STORE_ADD_REPLACE_EXISTING, NULL); @@ -865,16 +888,27 @@ if(propLen) { property = calloc(1, propLen+1); memcpy(property, propName, propLen); + property[propLen] = '\0'; }; - if(ssl->loglevel) printf("sqSetStringPropertySSL(%d): %s\n", propID, property); + if(ssl->loglevel) printf("sqSetStringPropertySSL(%d): %s\n", propID, property ? property : "(null)"); switch(propID) { - case SQSSL_PROP_CERTNAME: ssl->certName = property; break; + case SQSSL_PROP_CERTNAME: + if(ssl->certName) free(ssl->certName); + ssl->certName = property; + break; + case SQSSL_PROP_SERVERNAME: + if(ssl->serverName) free(ssl->serverName); + ssl->serverName = property; + break; /* Platform specific: Adds a .PFX file to MY certificate store w/o password. Useful for installing the default test certificate in SqueakSSL. */ - case 10001: return sqAddPfxCertToStore(propName, propLen, NULL, 0); - default: + case 10001: + if(property) free(property); + return sqAddPfxCertToStore(propName, propLen, NULL, 0); + default: + if(property) free(property); if(ssl->loglevel) printf("sqSetStringPropertySSL: Unknown property ID %d\n", propID); return 0; } @@ -894,7 +928,7 @@ switch(propID) { case SQSSL_PROP_SSLSTATE: return ssl->state; case SQSSL_PROP_CERTSTATE: return ssl->certFlags; - case SQSSL_PROP_VERSION: return 1; + case SQSSL_PROP_VERSION: return SQSSL_VERSION; case SQSSL_PROP_LOGLEVEL: return ssl->loglevel; default: if(ssl->loglevel) printf("sqGetIntPropertySSL: Unknown property ID %d\n", propID); @@ -911,6 +945,7 @@ Returns: Non-zero if successful. */ sqInt sqSetIntPropertySSL(sqInt handle, sqInt propID, sqInt propValue) { + sqSSL *ssl = sslFromHandle(handle); if(ssl == NULL) return 0; @@ -920,5 +955,5 @@ if(ssl->loglevel) printf("sqSetIntPropertySSL: Unknown property ID %d\n", propID); return 0; } - return 0; + return 1; }

1 0

[commit][3415] Integrate Levente Uzonyi, Marcel Taeumel and Tobias Pape' s V2 SSL plugin header.
by commits＠squeakvm.org 30 Jul '15

30 Jul '15

Revision: 3415 Author: eliot Date: 2015-07-29 18:46:49 -0700 (Wed, 29 Jul 2015) Log Message: ----------- Integrate Levente Uzonyi, Marcel Taeumel and Tobias Pape's V2 SSL plugin header. This change adds only a version number define. Modified Paths: -------------- trunk/platforms/Cross/plugins/SqueakSSL/SqueakSSL.h Property Changed: ---------------- trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h Modified: trunk/platforms/Cross/plugins/SqueakSSL/SqueakSSL.h =================================================================== --- trunk/platforms/Cross/plugins/SqueakSSL/SqueakSSL.h 2015-07-24 18:36:02 UTC (rev 3414) +++ trunk/platforms/Cross/plugins/SqueakSSL/SqueakSSL.h 2015-07-30 01:46:49 UTC (rev 3415) @@ -1,6 +1,16 @@ #ifndef SqueakSSL_H #define SqueakSSL_H +/**********************************************************/ +/* SqueakSSL Version Information */ +/* Version 1: Inital version */ +/* Version 2: SNI support by Levente Uzonyi and help by */ +/* Marcel Taeumel and Tobias Pape */ +/**********************************************************/ + + +#define SQSSL_VERSION 2 + /*************************/ /* SSL connection states */ /*************************/ Property changes on: trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Thu Jul 16 11:54:21 PDT 2015 + Wed Jul 29 18:45:36 PDT 2015

1 0

SqueakSSL plugin v0.2.0 (was: Re: Fixes to the SqueakSSL Plugin)
by Das.Linux＠gmx.de 30 Jul '15

30 Jul '15

Dear Smalltalkers as a follow up to the SqueakSSL changes sent around yesterday… On 21.04.2015, at 16:52, Tobias Pape <Das.Linux(a)gmx.de> wrote: > Dear Smalltalkers > > Starting with Levente Uzonyi's patches to the Linux version > of the SqueakSSL-Plugin, we (Marcel Taeumel and me) have > ported this to the OS X and Windows version as well. > > Find three binaries[1] that can be used instead of > the ones found on versions found on SqueakSSL's google code > page. > […] > [1]: http://forum.world.st/file/n4820846/squeakssl.zip … I'd like to thank Levente Uzonyi and Ron Teitelbaum for their input and providing infrastructure. I put together all files and have uploaded them to the new (in the googlecode-export sense) SqueakSSL gitHub project: https://github.com/itsmeront/squeakssl/ And tagged a release as v0.2.0 with a Zip of all binaries (linux32/64,osx,windows) https://github.com/itsmeront/squeakssl/releases/tag/v0.2.0 (scroll to bottom for the binaries zip: squeakssl_v0.2.0.zip) I hope this comes in handy for anyone who wants to play around with that. Best -Tobias

5 11

Fwd: Accepted squeak-vm 1:4.10.2.2614-2 (source amd64) into unstable
by Bert Freudenberg 28 Jul '15

28 Jul '15

FYI: Jonas has updated Debian’s squeak-vm package, change log pasted below. The build fails on a few “unusual” CPU architectures but appears to work otherwise: https://buildd.debian.org/status/logs.php?pkg=squeak-vm&ver=1%3A4.10.2.2614… - Bert - > Begin forwarded message: > > From: Jonas Smedegaard <dr(a)jones.dk> > Subject: Accepted squeak-vm 1:4.10.2.2614-2 (source amd64) into unstable > Date: 24. Juli 2015 13:05:28 MESZ > To: debian-devel-changes(a)lists.debian.org > > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA256 > > Format: 1.8 > Date: Tue, 21 Jul 2015 20:02:34 +0200 > Source: squeak-vm > Binary: squeak-vm > Architecture: source amd64 > Version: 1:4.10.2.2614-2 > Distribution: unstable > Urgency: medium > Maintainer: Debian Squeak Team <pkg-squeak-devel(a)lists.alioth.debian.org> > Changed-By: Jonas Smedegaard <dr(a)jones.dk> > Description: > squeak-vm - Unix Squeak virtual machine > Closes: 603797 611115 658108 693633 696606 710367 740972 > Changes: > squeak-vm (1:4.10.2.2614-2) unstable; urgency=medium > . > * Update README.source to emphasize that control.in file is *not* a > show-stopper for contributions. > * Move packaging to pkg-squeak team governance. > * Declare compliance with Debian Policy 3.9.6. > * Improve short and long description, avoiding article in short > description, and referencing Debian packages (not web pages) for > Squeak images. > * Modernize CDBS use: > + Have utils.mk put aside cruft during build. > Tighten to build-depend on recent cdbs. > + Stop needlessly relax upstream-tarball.mk inclusion. > + Include cmake.mk (bypassing upstream configure script): Enables > fortifying options. > * Fix menu file. > * Recommend scratch with etoys as fallback (and stop suggest etoys). > Closes: bug#603797. Thanks to Ronny Standtke. > * Remove /usr/share/squeak dir when purging package. > Closes: Bug#658108. Thanks to Andreas Beckmann. > * Fix drop Education tag from desktop file. > Closes: Bug#611115. Thanks to Chris Wilson. > * Fix FTBFS with build-flag --as-needed. > Closes: Bug#710367. Thanks to Julian Taylor. > * Fix build-depend on libasound2-dev only on Linux archs, and > build-exclude it elsewhere. > Closes: Bug#696606. Thanks to Steven Chamberlain. > * Fix disable FFIPrims plugin on powerpcspe. > Closes: Bug#693633. Thanks to Roland Stigge. > * Add patch to fix FTBFS with clang. > Closes: bug#740972. Thanks to Nicolas Sévelin-Radiguet. > Checksums-Sha1: > 37b4dec32203ebab61b1c535db004a3c3bd29a41 2367 squeak-vm_4.10.2.2614-2.dsc > 01e508d0bfe4520c4bb54f3567733af47949329d 78624 squeak-vm_4.10.2.2614-2.debian.tar.xz > af83cee120fb09b855971c959c2b7d429d8ce071 529884 squeak-vm_4.10.2.2614-2_amd64.deb > Checksums-Sha256: > 0d6d75e3640746cadea8a1c0827b46feba956b555458994be43d3b3a667e8144 2367 squeak-vm_4.10.2.2614-2.dsc > b1ebf95a7f5f30a6597c042ddd1574461caf922a3390ae9499837e9db32140d8 78624 squeak-vm_4.10.2.2614-2.debian.tar.xz > a5ca1d3ee3e56fd0ebb55c855b9a4c86df31ef074774f581feaf051e0851023b 529884 squeak-vm_4.10.2.2614-2_amd64.deb > Files: > eac36db3e1e11f3c18a20747b8f4bac0 2367 interpreters optional squeak-vm_4.10.2.2614-2.dsc > 07e722bb42f0988a111fc1235849f127 78624 interpreters optional squeak-vm_4.10.2.2614-2.debian.tar.xz > 85f6cbe96e41246f3ea74c01d2181935 529884 interpreters optional squeak-vm_4.10.2.2614-2_amd64.deb > > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v2 > > iQIcBAEBCAAGBQJVrpVIAAoJECx8MUbBoAEhPu4P/0sVxk2nGwyv5kcUop58OcGe > U0biUbv+/rcJqq6MkhcEBoMEP7EgaIq3I/p3bcCu0MfAideyr6cUmPfBySWKBsof > PZISdGFw4rt5LmjsX82ZgxMlSkSSs7jgZe5wRzOsv3VhssBSC8691ffDTjScSbof > 1/9k6SC+TpvT5ruEWPl8Nm63L456+YmD7HK5i3MJUmmlAKHrNpFQMCB4ioYnr25S > yRfILU5rZu20Xh931fBwc9WgBzYXveV+pmAO/iSse4vts1cvK/8X16firpj3ed3u > FElcjVx8uwPjeFjtX3lj0G4vQeTceX9/bh9u6VeZwJ1tFLRYKObUjNOkH/w8IkmW > qovOvOSHJJr8ljuIOQGtHwWOTzuJmrkA6YfP3yhBxdQOp9yie5u7z3rN9sp5yTqe > JHEayumAQJPpYqmOYXc1IAVu3NYTv71s0ZVnzGSg4iRvvN1qBzyd/1AQDWasr9ON > +U1Nh2LWMCjjtfeJdh7sAMN+aIItHLqpoC72wxj6JktMoCd8i3CdKpuUecGHzQbp > U9lB7DUOPPWwchZIMd2Bsslzwch6189ThWkbz1NO2kB1Y+dEzN8Z84RCx5VsIK6z > /pEn4csuWxrS0JI9n5Mwa6FRq71/ZhpvgVgMBk6pm7+A1SmJq//hz50KpPlCAoJH > +fxbEpdwBA0MbZcCLYDo > =8vqK > -----END PGP SIGNATURE----- > >

2 1

Re: [squeak-dev] Squeak 5 will run on Rasberry Pi OOTB
by Eliot Miranda 24 Jul '15

24 Jul '15

Hi Herbert, first., apologies fror being unresponsive. I've had things to do for the last few days. On Thu, Jul 23, 2015 at 11:17 AM, Herbert König <herbertkoenig(a)gmx.net> wrote: > Hey, great! > > downloaded it on the Pi A+ installed my trusty 24/7 cat surveillance app > and it worked. > CPU usage went down from 50 to 40%. It exercises BitBlt, Collections, > file I/O incl. GPIO, OSProcess and CommandShell > Memory went up from 52M to 75M which is critical as I use the PiNoir > Camera. > So there's two things going on here. One is that the object format is indeed less compact tan the previous one and Spur image files are about 15% larger, so a 57Mb image file should result in something around 65Mb. Another is that right now I've chosen to have the memory manager allocate a chunk of free space at startup that defaults to the growHeadroom, which defaults to 16Mb. You can see what the free old space is via vm parameter 54, e.g. Smalltalk vmParameterAt: 54 22689208 You can change this by the command line switch -maxoldspace. Really I think there needs to be a way of a) specifying a free headroom on the command line, and b) setting a grow size in the image header, rather than from Smalltalk code. Basically Spur is very green and we need to evolve its facilities for management of memory management. So please feel free to make suggestions and requests for functionality here, but especially on vm-dev. We could do with careful discussions here as I don't want to hack, but I'm not pretending to have the right answers. > I'll watch what comes out of Tim's (Rowledge) recent post. > > And I'll watch if it runs as stable as 4.5. > > Thanks, > > Herbert > > > > Am 23.07.2015 um 17:55 schrieb Chris Muller: > >> I managed to successfully incorporate the ARM platform into the 5.0 >> All-In-One -- so Squeak 5 will now start up with one-click on FOUR >> platforms, OOTB..!! >> >> > > -- _,,,^..^,,,_ best, Eliot

1 0

[commit][3414] Remember to make assert and debug archives for linux VMs.
by commits＠squeakvm.org 24 Jul '15

24 Jul '15

Revision: 3414 Author: eliot Date: 2015-07-24 11:36:02 -0700 (Fri, 24 Jul 2015) Log Message: ----------- Remember to make assert and debug archives for linux VMs. Fix a slip in mklinuxarchive Modified Paths: -------------- branches/Cog/scripts/mkcogvmarchives branches/Cog/scripts/mklinuxarchive branches/Cog/scripts/mkspurvmarchives Modified: branches/Cog/scripts/mkcogvmarchives =================================================================== --- branches/Cog/scripts/mkcogvmarchives 2015-07-22 03:28:02 UTC (rev 3413) +++ branches/Cog/scripts/mkcogvmarchives 2015-07-24 18:36:02 UTC (rev 3414) @@ -51,21 +51,27 @@ echo REV=$REV TAG=$TAG if [ -n "$CL" ]; then - for archive in coglinux coglinuxht cogmtlinuxht; do - rm -rf $archive-$TAG.tgz - echo $archive '=>' $archive-$TAG.tgz - COPYFILE_DISABLE=1 tar czf $archive-$TAG.tgz $archive - EXES="$EXES $archive/lib/squeak/[0-9.-]*/squeak" + for d in . assert debug; do + (cd $d + for archive in coglinux coglinuxht cogmtlinuxht; do + rm -rf $archive-$TAG.tgz + echo $archive '=>' $archive-$TAG.tgz + COPYFILE_DISABLE=1 tar czf $archive-$TAG.tgz $archive + EXES="$EXES $archive/lib/squeak/[0-9.-]*/squeak" + done) done fi if [ -n "$NL" ]; then - set -- nscoglinux nscoglinuxht - for archive in nsvmlinux nsvmlinuxht; do - rm -rf $archive-$TAG.tgz - echo $1 '=>' $archive-$TAG.tgz - COPYFILE_DISABLE=1 tar czf $archive-$TAG.tgz $1 - EXES="$EXES $1/lib/nsvm/[0-9.-]*/nsvm" - shift + for d in . assert debug; do + (cd $d + set -- nscoglinux nscoglinuxht + for archive in nsvmlinux nsvmlinuxht; do + rm -rf $archive-$TAG.tgz + echo $1 '=>' $archive-$TAG.tgz + COPYFILE_DISABLE=1 tar czf $archive-$TAG.tgz $1 + EXES="$EXES $1/lib/nsvm/[0-9.-]*/nsvm" + shift + done) done fi if [ -n "$CM" ]; then Modified: branches/Cog/scripts/mklinuxarchive =================================================================== --- branches/Cog/scripts/mklinuxarchive 2015-07-22 03:28:02 UTC (rev 3413) +++ branches/Cog/scripts/mklinuxarchive 2015-07-24 18:36:02 UTC (rev 3414) @@ -46,7 +46,7 @@ if [ -d $f ]; then exe="`basename \`dirname $f\``" case $d in - nscog*) archive="`echo $d | | sed 's/nscog/nsvm/'`";; + nscog*) archive="`echo $d | sed 's/nscog/nsvm/'`";; *) archive=$d esac rm -rf $archive-$TAG.tgz Modified: branches/Cog/scripts/mkspurvmarchives =================================================================== --- branches/Cog/scripts/mkspurvmarchives 2015-07-22 03:28:02 UTC (rev 3413) +++ branches/Cog/scripts/mkspurvmarchives 2015-07-24 18:36:02 UTC (rev 3414) @@ -50,21 +50,27 @@ echo REV=$REV TAG=$TAG if [ -n "$CL" ]; then - for archive in cogspurlinux cogspurlinuxht cogspurlinuxhtARM; do - rm -rf $archive-$TAG.tgz - echo $archive '=>' $archive-$TAG.tgz - COPYFILE_DISABLE=1 tar czf $archive-$TAG.tgz $archive - EXES="$EXES $archive/lib/squeak/[0-9.-]*/squeak" + for d in . assert debug; do + (cd $d + for archive in cogspurlinux cogspurlinuxht cogspurlinuxhtARM; do + rm -rf $archive-$TAG.tgz + echo $archive '=>' $archive-$TAG.tgz + COPYFILE_DISABLE=1 tar czf $archive-$TAG.tgz $archive + EXES="$EXES $archive/lib/squeak/[0-9.-]*/squeak" + done) done fi if [ -n "$NL" ]; then - set -- nscogspurlinux nscogspurlinuxht nscogspurlinuxhtARM - for archive in nsvmspurlinux nsvmspurlinuxht nsvmspurlinuxhtARM; do - rm -rf $archive-$TAG.tgz - echo $1 '=>' $archive-$TAG.tgz - COPYFILE_DISABLE=1 tar czf $archive-$TAG.tgz $1 - EXES="$EXES $1/lib/nsvm/[0-9.-]*/nsvm" - shift + for d in . assert debug; do + (cd $d + set -- nscogspurlinux nscogspurlinuxht nscogspurlinuxhtARM + for archive in nsvmspurlinux nsvmspurlinuxht nsvmspurlinuxhtARM; do + rm -rf $archive-$TAG.tgz + echo $1 '=>' $archive-$TAG.tgz + COPYFILE_DISABLE=1 tar czf $archive-$TAG.tgz $1 + EXES="$EXES $1/lib/nsvm/[0-9.-]*/nsvm" + shift + done) done fi if [ -n "$CM" ]; then

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev July 2015