From 9d9c879413e8ea2bc805399c15f2e94b02f48e1d Mon Sep 17 00:00:00 2001 From: Apprentice Harper Date: Mon, 9 Mar 2015 07:38:31 +0000 Subject: [PATCH] tools v6.2.0 Updated for B&N new scheme, added obok plugin, and many minor fixes, --- DeDRM_Macintosh_Application/DeDRM ReadMe.rtf | Bin 3882 -> 3980 bytes DeDRM_Macintosh_Application/DeDRM.app.txt | Bin 131856 -> 134520 bytes .../DeDRM.app/Contents/Info.plist | 22 +- .../DeDRM_Barnes and Noble Key_Help.htm | 21 +- .../Contents/Resources/DeDRM_Help.htm | 2 +- .../Contents/Resources/Scripts/main.scpt | Bin 293416 -> 298934 bytes .../DeDRM.app/Contents/Resources/__init__.py | 252 ++++-- .../Contents/Resources/activitybar.py | 75 ++ .../DeDRM.app/Contents/Resources/android.py | 54 +- .../Contents/Resources/android_readme.txt | 5 +- .../Contents/Resources/argv_utils.py | 88 +++ .../Contents/Resources/askfolder_ed.py | 211 +++++ .../Resources/description.rtfd/TXT.rtf | 2 +- .../DeDRM.app/Contents/Resources/dialogs.py | 719 ++++++++++++++++++ .../Contents/Resources/ignoblekey.py | 335 ++++++++ .../DeDRM.app/Contents/Resources/ineptepub.py | 5 +- .../Contents/Resources/scrolltextwidget.py | 27 + .../Contents/Resources/simpleprefs.py | 77 ++ .../Contents/Resources/subasyncio.py | 148 ++++ .../DeDRM_App/DeDRM_lib/DeDRM_App.pyw.bak | 635 ++++++++++++++++ .../DeDRM_App/DeDRM_lib/DeDRM_app.pyw | 13 +- .../lib/DeDRM_Barnes and Noble Key_Help.htm | 21 +- .../DeDRM_App/DeDRM_lib/lib/DeDRM_Help.htm | 2 +- .../DeDRM_App/DeDRM_lib/lib/__init__.py | 252 ++++-- .../DeDRM_App/DeDRM_lib/lib/android.py | 54 +- .../DeDRM_lib/lib/android_readme.txt | 5 +- .../DeDRM_App/DeDRM_lib/lib/ignoblekey.py | 335 ++++++++ .../DeDRM_App/DeDRM_lib/lib/ineptepub.py | 5 +- .../lib/plugin-import-name-dedrm.txt | 0 .../DeDRM_App/DeDRM_lib/lib/subasyncio.py | 148 ++++ .../DeDRM_App_ReadMe.txt | 49 +- DeDRM_calibre_plugin/DeDRM_plugin.zip | Bin 345078 -> 341636 bytes .../DeDRM_Barnes and Noble Key_Help.htm | 20 +- DeDRM_calibre_plugin/DeDRM_plugin/__init__.py | 184 +++-- .../DeDRM_plugin/activitybar.py | 75 ++ DeDRM_calibre_plugin/DeDRM_plugin/android.py | 54 +- .../DeDRM_plugin/android_readme.txt | 5 +- .../DeDRM_plugin/argv_utils.py | 88 +++ .../DeDRM_plugin/askfolder_ed.py | 211 +++++ DeDRM_calibre_plugin/DeDRM_plugin/dialogs.py | 719 ++++++++++++++++++ .../DeDRM_plugin/ignoblekey.py | 335 ++++++++ .../DeDRM_plugin/ineptepub.py | 5 +- .../DeDRM_plugin/scriptinterface.py | 176 +++++ .../DeDRM_plugin/scrolltextwidget.py | 27 + .../DeDRM_plugin/simpleprefs.py | 77 ++ DeDRM_calibre_plugin/DeDRM_plugin_ReadMe.txt | 39 +- Obok_calibre_plugin/obok_plugin.zip | Bin 0 -> 60610 bytes Obok_calibre_plugin/obok_plugin_ReadMe.txt | 52 ++ .../Barnes_and_Noble_ePubs/ignoblekey.pyw | 335 ++++++++ .../Notes on the Patch.txt | 11 + .../kindle4.8.1.10.patch | 157 ++++ Other_Tools/Kobo/obok.py | 490 ++++++++++++ Other_Tools/Kobo/obok_2.01.py | 231 ------ ReadMe_First.txt | 96 +-- 54 files changed, 6345 insertions(+), 604 deletions(-) create mode 100644 DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/activitybar.py create mode 100644 DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/argv_utils.py create mode 100644 DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/askfolder_ed.py create mode 100644 DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/dialogs.py create mode 100644 DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/ignoblekey.py create mode 100644 DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/scrolltextwidget.py create mode 100644 DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/simpleprefs.py create mode 100644 DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/subasyncio.py create mode 100644 DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/DeDRM_App.pyw.bak create mode 100644 DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/ignoblekey.py create mode 100644 DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/plugin-import-name-dedrm.txt create mode 100644 DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/subasyncio.py create mode 100644 DeDRM_calibre_plugin/DeDRM_plugin/activitybar.py create mode 100644 DeDRM_calibre_plugin/DeDRM_plugin/argv_utils.py create mode 100644 DeDRM_calibre_plugin/DeDRM_plugin/askfolder_ed.py create mode 100644 DeDRM_calibre_plugin/DeDRM_plugin/dialogs.py create mode 100644 DeDRM_calibre_plugin/DeDRM_plugin/ignoblekey.py create mode 100644 DeDRM_calibre_plugin/DeDRM_plugin/scriptinterface.py create mode 100644 DeDRM_calibre_plugin/DeDRM_plugin/scrolltextwidget.py create mode 100644 DeDRM_calibre_plugin/DeDRM_plugin/simpleprefs.py create mode 100644 Obok_calibre_plugin/obok_plugin.zip create mode 100644 Obok_calibre_plugin/obok_plugin_ReadMe.txt create mode 100644 Other_Tools/DRM_Key_Scripts/Barnes_and_Noble_ePubs/ignoblekey.pyw create mode 100644 Other_Tools/Kindle_for_Android_Patches/kindle_version_4.8.1.10/Notes on the Patch.txt create mode 100644 Other_Tools/Kindle_for_Android_Patches/kindle_version_4.8.1.10/kindle4.8.1.10.patch create mode 100644 Other_Tools/Kobo/obok.py delete mode 100644 Other_Tools/Kobo/obok_2.01.py diff --git a/DeDRM_Macintosh_Application/DeDRM ReadMe.rtf b/DeDRM_Macintosh_Application/DeDRM ReadMe.rtf index 8813e94bea6217f9d4fc1a2c36102537b987a128..cbc6d7c812c0259c88b8f1200e428dc1da887b95 100644 GIT binary patch delta 1770 zcmaJ?-)kII6t*Td>9#4?N& z&9{6E0*5J`2v3I*w>=hUWvwfF-|x>1`t-QK0wp91ybd=p+68D~TO-`rfmSzkwOsG_ zrz$<>X{inQ!8$YOJFIOGmBU<_U~Oq>JwJ1cwNatrRvS1FUI+b}1IyL-tEq<_eF!je*3e+wS}C~K&`q`eF(>BVu}QT(INCm z3Ie6yW4Bl!eL+yY+jpDW2cPWh?Lx=eXl;Hz>e`N0Rc+ey(9gspeG^ODd+{|(q{FCI3gZIuld}wq+N{TyLTcO%R zFgN|B^5>2G{7X}Z^zp?T|H=LF#kU7%RI;1~k=&w*6gD2=IdIrP(1z5fNdH2S>~q13 zw#tv;`Hq8b@eN2=J0&v3P41TMzSwGzRU&lb3kX!Jy8VPpDe{h;W ztV8@PiF^`wJO`d6LW+P!Q*NOp!YHPpDRnKQ$YtP}ZbUkf!ZqAbDRM^Tc+YrYGjRb` z?vc$+`s3v**9(V@C^D$5@DMg+K}?Do7s}F?luuP1Q5qDS@>+~+WGW*SDK@z3LLeSyB^=f= zcS6rE!pdt&D!zfgmgjJKH_! z?(xcstUUm?93tip;>rPWT~%H6)mK&X{MOGmUtF6cDp6e9 zEQ;3dGJi2;O!qsTFgU&^8c}9SS`$5E?zC~vvXEtFER11UGT_>v4dFiK2WUmYH(3_3 zObT*)W&8|v%B3^4Uo%bUVborO`$F>vd|2*kwX^j3oz37Vct+`Sr777a)0nnbR#@L5 zaYCGzNayBJzzSZV9!Jr77}oM2T3zdeY{Ydxk2=Sa_R@jC@iWUdSXbQz82xl^QNoQ!{TjS}b7Iy_pABwz!sP z;5O{2I7h(UGB%6V_cPy2lf$jX-Fw0Rcx(Xd@Dch{-7d&-6r%>EVTgy235o;rvBaW` zNzsZ|I}5D(s?n;RH{Nk!e{KBfj&I-i&K;M}J#GXJ4psZ`q%I;Tu8H|b8q4#XTcKo4 zOt8%p_+$^hfGBKrAYcNN%n#`dVFSKYrB{tgV}t7YEL_dB8o|KYVqBD&U;oTu)eW9p ze`VU&sw7&?Kq*TN@HJjOT_bfg$*RADf2V@#+=cfXBSgfF(@r%JU7A*5jd!?q+QCN& zVSj+t?-$;m&}MN<=;K4Df*#jHnydq)b88LnZV^O% zp$_&@(v|vYoyB*Z`vG(9Hi;I6H84hvaGZDI61xFElOXbG+h?@oRVE=T*Vo$X?o|W{ zk7M3PQ$rngMk*F5rh0Uo%|kF{QP38js3asRMHh?qz`~vw6^4}ae8^$X?RJg}i_qQP z>g{)ZoFwOZb|}>Wr&ax-dG*Gao0q(tg~Y1Anz!ei15bHjs~<03souPJbIW(A{vXib aFA2G%B*7|*9QQoka3(03UIWj9qyGTVx!I2Z diff --git a/DeDRM_Macintosh_Application/DeDRM.app.txt b/DeDRM_Macintosh_Application/DeDRM.app.txt index 0bfe84282cd871a8a7cc9c9165cce496a85d504e..d80e83aae4488499b4b0d440cbc69972cc6708c0 100644 GIT binary patch delta 795 zcmZuvUr5t&5Wh=V+gR$-`L8*D{R(O1ri)=DJ{VGimdlwBDKVTj((=!kTjoUbrQS5{ ztRo}Cr>LiB)Q=>hhwz~Xi+YI&E7(gAv52HZq?><&G!DM^z5CvM?(TEn@hkdYQ~C$K zjO{+?6*-@%$Z(Zx81%8UnTkvE62}yqdB=JLcp(G>^w}9JSiOM)jpB(y1Uf}ufFPNR za%sLiKjA*`6{*H<;;eSmCE~87F9t=5L?q>q<}zUga-axJ{3#c+D12PUuf6z&j|MP{ zyYkVhJuAVc$^rv;R`LI-5Bu0(kCyALXrq^>jGU@RBM&>Vkjv(=_^+A6)`Qqa%Zm!9 zym(rRBTjGA@)~i`!8xO-%iaw7T4awj%vbCb9i>FKCGI|hByNd(rD z_+CGrwQnFOa8gK!!5J8k`PQg$LK{?p8&t4^kq-ZGQKer`f#(Xf{?w)KeE%Y>Ak^3soOsO7Dp>r)uN53j|iv9iHDpT zL@Uj`Qz?8$;Y^S4)!^3if=BqO@t{(#$~Y%Pywdg72~;Q-zbcZ}|Lq1EASjb}zz__v z|1$34g+A16{2}f4B^<1-bAUtg`-MJ5NQ}x?=@L<(M?4|nOc7tNob5tyXcaFV8I*TL z>~07{l)k^U>~EH+^b)!SAu2lERZw2Ta;7tT#M>nsFoJaatKa-qscS`Wt5xjpv$s--bcn&;;ftux(vG0 z4~j90Pw!%3lAGSg#Ka}7z+lLr&tS%&#GuK*#lQ)NAf@iCO!_cYMz~Z>HvAwwJ%SZs zo-ry)4?Ds@Q=CfU)fg40KjVNZWmf?D1L&9OiK2|++XFb6 GG*|%t&ryc} diff --git a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Info.plist b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Info.plist index 86275f3..e251216 100644 --- a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Info.plist +++ b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Info.plist @@ -24,7 +24,7 @@ CFBundleExecutable droplet CFBundleGetInfoString - DeDRM AppleScript 6.1.0. Written 2010–2014 by Apprentice Alf and others. + DeDRM AppleScript 6.2.0. Written 2010–2015 by Apprentice Alf et al. CFBundleIconFile DeDRM CFBundleIdentifier @@ -36,25 +36,31 @@ CFBundlePackageType APPL CFBundleShortVersionString - 6.1.0 + 6.2.0 CFBundleSignature dplt LSRequiresCarbon + NSHumanReadableCopyright + Copyright © 2010–2015 Paul Durrant, Apprentice Alf and Apprentice Harper WindowState + bundleDividerCollapsed + + bundlePositionOfDivider + 728 dividerCollapsed - + eventLogLevel - -1 + 0 name ScriptWindowState positionOfDivider - 0.0 + 439 savedFrame - 85 100 1002 753 0 0 1440 878 - selectedTabView - event log + 77 69 1246 778 0 0 1440 877 + selectedTab + log diff --git a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM_Barnes and Noble Key_Help.htm b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM_Barnes and Noble Key_Help.htm index ac1b693..47da891 100644 --- a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM_Barnes and Noble Key_Help.htm +++ b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM_Barnes and Noble Key_Help.htm @@ -22,7 +22,24 @@ li {margin-top: 0.5em}

If you have upgraded from an earlier version of the plugin, any existing Barnes and Noble keys will have been automatically imported, so you might not need to do any more configuration. Continue reading for key generation and management instructions.

-

Creating New Keys:

+

Changes at Barnes & Noble

+ +

In mid-2014, Barnes & Noble changed the way they generated encryption keys. Instead of deriving the key from the user's name and credit card number, they started generating a random key themselves, sending that key through to devices when they connected to the Barnes & Noble servers. This means that some users will find that no combination of their name and CC# will work in decrypting their ebooks.

+ +

There is a work-around. Barnes & Noble’s desktop app NOOK Study generates a log file that contains the encryption key. You can download NOOK Study from https://yuzu.com/nsdownload.

+

Once downloaded, install the application, register with your Barnes & Noble or nook account, and download at least one DRMed ebook through NOOK Study. It will be saved somewhere in a folder called "My Barnes & Noble eBooks" in your Documents folder.

+

Now import that book into calibre. The log file and the key in the log should be automatically found by the plugin and used to decrypt the book.

+

If the automatic process doesn't work for you, you can still find extract it manually and save it as a .b64 file for import into the plugin's preferences as follows:

+
  1. In NOOK Study, select Settings/About (Windows) or NOOK Study/About NOOK Study (Mac) and in the dialog that appears click the link at the bottom to copy the log into the clipboard.
    2. +
  2. Paste the copied log into a text editor
    3. +
  3. Search for the text CCHashResponseV1
    4. +
  4. On the line below which starts with ccHash, copy the text between the " marks after ccHash, but don't include the " marks.
    5. +
  5. Save that text in a new plain text file, with file name extension .b64 (for example, key.b64)
    6. +
  6. Import that file into the preferences through this dialog, using the "Import Existing Key Files" button.
    7. +
+ + +

Old instructions: Creating New Keys:

On the right-hand side of the plugin’s customization dialog, you will see a button with an icon that looks like a green plus sign (+). Clicking this button will open a new dialog for entering the necessary data to generate a new key.