Rohde-Schwarz / TrustedGRUB2

DEPRECATED TPM enabled GRUB2 Bootloader

GNU General Public License v3.0

191 stars 78 forks source link

Grub2 master #29

Closed neusdan closed 8 years ago

neusdan commented 8 years ago

Merge GRUB2 master

Especially to fix security issue CVE-2015-8370

26

caschulz88 commented 8 years ago

That was also what I wanted to do first, but I just cherry picked one commit since I didn't know if we prefer having the whole master merged or just this one bugfix.

Do you want me to review it? I also did the master merge in my machine locally. There was only one merge conflict for me (some file include in a c source file), which was easy to resolve.

caschulz88 commented 8 years ago

Closed #26 as it's not needed anymore after merging this.

neusdan commented 8 years ago

Yeah, the conflict in cryptodisk.c is already resolved here. Please have a look if you wan't. I didn't found anything that would break TGRUB2 functionality.

I'm going to build this now and make some tests.

neusdan commented 8 years ago

Basic tests successfully completed. I'll do some more thoroughly tests after fixing more issues and before releasing the next version

caschulz88 commented 8 years ago

Do you want to merge this before the other issue fixes?

I had a look on the master merge and could not see an error there. Looks exactly like my local merge

neusdan commented 8 years ago

thanks.yeah, please merge :)

caschulz88 commented 8 years ago

Will do it right now.

And please don't use this email answer method. It's totally broken :laughing: You can have a look at github.com and see what's posted there now. hehe

neusdan commented 8 years ago

haha, yeah that was :hankey:

caschulz88 commented 8 years ago

thanks to the nice github.com developers you can edit them afterwards! what a nice and useful feature