steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make windows random objects inherit from win32-handle, remove redundant error handling, use new-disposable instead of new

release
Doug Coleman 2010-09-15 19:10:21 -05:00
parent c37d967da2
commit f0a9741a96
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
basis/random/windows/windows.factor
View File

@ -2,10 +2,10 @@ USING: accessors alien.c-types alien.data byte-arrays
combinators.short-circuit continuations destructors init kernel combinators.short-circuit continuations destructors init kernel
locals namespaces random windows.advapi32 windows.errors locals namespaces random windows.advapi32 windows.errors
windows.kernel32 windows.types math.bitwise sequences fry windows.kernel32 windows.types math.bitwise sequences fry
literals ; literals io.backend.windows ;
IN: random.windows IN: random.windows
TUPLE: windows-crypto-context < disposable provider type handle ; TUPLE: windows-crypto-context < win32-handle provider type ;
M: windows-crypto-context dispose* ( tuple -- ) M: windows-crypto-context dispose* ( tuple -- )
[ handle>> 0 CryptReleaseContext win32-error=0/f ] [ handle>> 0 CryptReleaseContext win32-error=0/f ]
@ -38,24 +38,17 @@ ERROR: acquire-crypto-context-failed provider type error ;
dup [ provider>> ] [ type>> ] bi attempt-crypto-context >>handle ; dup [ provider>> ] [ type>> ] bi attempt-crypto-context >>handle ;
: <windows-crypto-context> ( provider type -- windows-crypto-type ) : <windows-crypto-context> ( provider type -- windows-crypto-type )
windows-crypto-context new windows-crypto-context new-disposable
swap >>type swap >>type
swap >>provider swap >>provider
initialize-crypto-context ; inline initialize-crypto-context ; inline
M: windows-crypto-context random-bytes* ( n windows-crypto-context -- bytes ) M: windows-crypto-context random-bytes* ( n windows-crypto-context -- bytes )
dup already-disposed? [ initialize-crypto-context f >>disposed ] when handle>> swap [ ] [ <byte-array> ] bi
[ [ CryptGenRandom win32-error=0/f ] keep ;
|dispose
handle>> swap dup <byte-array>
[ CryptGenRandom win32-error=0/f ] keep
] with-destructors ;
ERROR: no-windows-crypto-provider error ;
: try-crypto-providers ( seq -- windows-crypto-context ) : try-crypto-providers ( seq -- windows-crypto-context )
[ first2 <windows-crypto-context> ] attempt-all [ first2 <windows-crypto-context> ] attempt-all ;
dup windows-crypto-context? [ no-windows-crypto-provider ] unless ;
[ [
{ {