On 15-10-23 14:43:53, Mimi Zohar wrote:
> On Fri, 2015-10-23 at 16:05 +0300, Petko Manolov wrote:
> > On 15-10-22 21:49:25, Dmitry Kasatkin wrote:
>
> > > diff --git a/security/integrity/ima/Kconfig
> > > b/security/integrity/ima/Kconfig
> > > index df30334..a292b88 100644
> > > --- a/security/integrity/ima/Kconfig
> > > +++ b/security/integrity/ima/Kconfig
> > > @@ -123,14 +123,17 @@ config IMA_APPRAISE
> > > If unsure, say N.
> > >
> > > config IMA_TRUSTED_KEYRING
> > > - bool "Require all keys on the .ima keyring be signed"
> > > + bool "Require all keys on the .ima keyring be signed (deprecated)"
> > > depends on IMA_APPRAISE && SYSTEM_TRUSTED_KEYRING
> > > depends on INTEGRITY_ASYMMETRIC_KEYS
> > > + select INTEGRITY_TRUSTED_KEYRING
> > > default y
> > > help
> > > This option requires that all keys added to the .ima
> > > keyring be signed by a key on the system trusted keyring.
> > >
> > > + This option is deprecated in favor of INTEGRITY_TRUSTED_KEYRING
> > > +
> > > config IMA_LOAD_X509
> > > bool "Load X509 certificate onto the '.ima' trusted keyring"
> > > depends on IMA_TRUSTED_KEYRING
> >
> >
> > I guess we may as well remove this switch. Otherwise somebody have to
> > remember
> > to post a patch that does so a few kernel releases after this one goes
> > mainline.
>
> There's no harm in leaving the "IMA_TRUSTED_KEYRING" Kconfig option for a
> couple of releases (or perhaps until it is enabled in a long term release),
> so
> that the INTEGRITY_TRUSTED_KEYRING Kconfig option is enabled automatically.
I have no strong opinion either way. Just saying. Let it be for the moment.
Petko
--
To unsubscribe from this list: send the line "unsubscribe
linux-security-module" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
