[Spice-devel] [PATCH 6/9] Add TicketInfo::encryption_type

[Marc-André Lureau]

ack

----- Original Message -----
> In preparation to encrypt the SPICE ticket with either RSA or as plain text
> ticket, it's useful to know which one is expected in TicketInfo.
> ---
>  server/reds-private.h | 1 +
>  server/reds.c         | 3 ++-
>  2 files changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/server/reds-private.h b/server/reds-private.h
> index ee09e7c..93a883a 100644
> --- a/server/reds-private.h
> +++ b/server/reds-private.h
> @@ -15,6 +15,7 @@ typedef struct TicketAuthentication {
>  } TicketAuthentication;
>  
>  typedef struct TicketInfo {
> +    SpiceTicketEncryption encryption_type;
>      RSA *rsa;
>      int rsa_size;
>      BIGNUM *bn;
> diff --git a/server/reds.c b/server/reds.c
> index fbeb1a5..ff16df9 100644
> --- a/server/reds.c
> +++ b/server/reds.c
> @@ -1404,10 +1404,11 @@ static int reds_send_link_ack(RedLinkInfo *link)
>      ack.num_channel_caps = channel_caps->num_caps;
>      header.size += (ack.num_common_caps + ack.num_channel_caps) *
>      sizeof(uint32_t);
>      ack.caps_offset = sizeof(SpiceLinkReply);
> -    ack.ticket_encryption = SPICE_TICKET_ENCRYPTION_RSA;
> +    link->tiTicketing.encryption_type = SPICE_TICKET_ENCRYPTION_RSA;
>      if (!reds_generate_ticket_pubkey(link, &ack))
>          goto end;
>  
> +    ack.ticket_encryption = link->tiTicketing.encryption_type;
>      if (!reds_stream_write_all(link->stream, &header, sizeof(header)))
>          goto end;
>      if (!reds_stream_write_all(link->stream, &ack, sizeof(ack)))
> --
> 1.8.5.3
> 
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/spice-devel
>