X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_update.h;h=1fd5a8593aca6d0f06b34debf5564c207abd8727;hb=12ade3e3bc975d5426ba4af155b7372c31093b31;hp=00439f479a85691cde86879969c7f5663d32c997;hpb=c2598291ca98e47ea0e7f371a023eb0f2e61b087;p=vlc diff --git a/include/vlc_update.h b/include/vlc_update.h index 00439f479a..1fd5a8593a 100644 --- a/include/vlc_update.h +++ b/include/vlc_update.h @@ -1,5 +1,5 @@ /***************************************************************************** - * vlc_update.h: VLC update and plugins download + * vlc_update.h: VLC update download ***************************************************************************** * Copyright © 2005-2007 the VideoLAN team * $Id$ @@ -22,21 +22,13 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. *****************************************************************************/ -#if !defined( __LIBVLC__ ) - #error You are not libvlc or one of its plugins. You cannot include this file -#endif +#ifndef VLC_UPDATE_H +#define VLC_UPDATE_H -#ifdef UPDATE_CHECK - -#ifndef _VLC_UPDATE_H -#define _VLC_UPDATE_H - -#include - -#include /* key & signature downloading */ -#include /* b64 decoding */ -#include /* utf8_fopen() */ -#include /* cryptography and digest algorithms */ +/** + * \file + * This file defines update API in vlc + */ /** * \defgroup update Update @@ -44,214 +36,7 @@ * @{ */ -enum /* Public key algorithms */ -{ - /* we will only use DSA public keys */ - PUBLIC_KEY_ALGO_DSA = 0x11 -}; - -enum /* Digest algorithms */ -{ - /* and DSA use SHA-1 digest */ - DIGEST_ALGO_SHA1 = 0x02 -}; - -enum /* Packet types */ -{ - SIGNATURE_PACKET = 0x02, - PUBLIC_KEY_PACKET = 0x06, - USER_ID_PACKET = 0x0d -}; - -enum /* Signature types */ -{ - BINARY_SIGNATURE = 0x00, - TEXT_SIGNATURE = 0x01, - - /* Public keys signatures */ - GENERIC_KEY_SIGNATURE = 0x10, /* No assumption of verification */ - PERSONA_KEY_SIGNATURE = 0x11, /* No verification has been made */ - CASUAL_KEY_SIGNATURE = 0x12, /* Some casual verification */ - POSITIVE_KEY_SIGNATURE = 0x13 /* Substantial verification */ -}; - - -enum /* Signature subpacket types */ -{ - ISSUER_SUBPACKET = 0x10 -}; - - - -struct public_key_packet_t -{ /* a public key packet (DSA/SHA-1) is 418 bytes */ - - uint8_t version; /* we use only version 4 */ - uint8_t timestamp[4]; /* creation time of the key */ - uint8_t algo; /* we only use DSA */ - /* the multi precision integers, with their 2 bytes length header */ - uint8_t p[2+128]; - uint8_t q[2+20]; - uint8_t g[2+128]; - uint8_t y[2+128]; -}; - -/* used for public key signatures */ -struct signature_packet_v4_t -{ /* hashed_data or unhashed_data can be empty, so the signature packet is - * theorically at least 54 bytes long, but always more than that. */ - - uint8_t version; - uint8_t type; - uint8_t public_key_algo; - uint8_t digest_algo; - uint8_t hashed_data_len[2]; - uint8_t *hashed_data; - uint8_t unhashed_data_len[2]; - uint8_t *unhashed_data; - uint8_t hash_verification[2]; - - /* The part below is made of consecutive MPIs, their number and size being - * public-key-algorithm dependant. - * But since we use DSA signatures only, we fix it. */ - uint8_t r[2+20]; - uint8_t s[2+20]; -}; - -/* Used for binary document signatures (to be compatible with older software) - * DSA/SHA-1 is always 65 bytes */ -struct signature_packet_v3_t -{ - uint8_t header[2]; - uint8_t version; /* 3 */ - uint8_t hashed_data_len; /* MUST be 5 */ - uint8_t type; - uint8_t timestamp[4]; /* 4 bytes scalar number */ - uint8_t issuer_longid[8]; /* The key which signed the document */ - uint8_t public_key_algo; /* we only know about DSA */ - uint8_t digest_algo; /* and his little sister SHA-1 */ - uint8_t hash_verification[2];/* the 2 1st bytes of the SHA-1 hash */ - - /* The part below is made of consecutive MPIs, their number and size being - * public-key-algorithm dependant. - * But since we use DSA signatures only, we fix it. */ - uint8_t r[2+20]; - uint8_t s[2+20]; -}; - -typedef struct public_key_packet_t public_key_packet_t; -typedef struct signature_packet_v4_t signature_packet_v4_t; -typedef struct signature_packet_v3_t signature_packet_v3_t; - -struct public_key_t -{ - uint8_t longid[8]; /* Long id */ - uint8_t *psz_username; /* USER ID */ - - public_key_packet_t key; /* Public key packet */ - - signature_packet_v4_t sig; /* Signature packet, by the embedded key */ -}; - -typedef struct public_key_t public_key_t; - -/* We trust this public key, and by extension, also keys signed by it. */ - -//#define OLD 1 //Define OLD to use Videolan Key 2006, to test public key download - -static uint8_t videolan_public_key_longid[8] = { -#ifdef OLD - 0xC3, 0x67, 0xD8, 0xB9, 0x81, 0xCA, 0xCA, 0x84 -#else - 0x90, 0x28, 0x17, 0xE4, 0xAA, 0x5F, 0x4D, 0xE6 -#endif -}; - -static uint8_t videolan_public_key[] = { -#ifdef OLD -"-----BEGIN PGP PUBLIC KEY BLOCK-----\n" -"Version: GnuPG v2.0.4 (FreeBSD)\n" -"\n" -"mQGiBEPBV9IRBADqm3i6AnMyZ2/iowBPZJrP3bwhcqx9EhJR5/N8Pz+QjhvLsY5P\n" -"efH1381RlEk33dl0vEvKULFstqT2GO+vtdoE+35tf1YlYFvxy23qn3Gsn2IMM6pl\n" -"e0AatBnxzD1Vtlh7+Xhm0PvGJilZeg/MamEK2A8hgwhj3aGxVfzdtkQ1HwCg9XIo\n" -"PZ8x5W0r6sfRXYmCDR06NFEEANRY98cFWJdvBmutLzoSC9y7eLxyGzKofs7ikxKg\n" -"myT1o3eraeCoZc+mIbZG4cZA9UqL/fmqZa/3gvnvDEzoI8u7u7gL6bu499XAnzVd\n" -"VV4cwvzgAPnMiqhi0jNWlXbt4dyZ+sWDhkL+ivrg3HsRU9xQUvYv54YQT0FxmR+E\n" -"yTnjA/9KoPRPwAWy7Q4R24CNSjMz5+075J2LUz0QDjTzcLh6Y/gI7oxNGsgsmLQ8\n" -"LMgtPZPbNw1FP6c6LMdUsLBCuCBKr7K3qOMubZc4694kB28bnpvP9EiHqvF8XiuY\n" -"lNNHzqFVCufAuSceg4B+INczF46i0KUT0xhsIkw0KMfofac+g7Q9VmlkZW9MQU4g\n" -"QXV0b21hdGljIFNpZ25pbmcgS2V5ICgyMDA2KSA8dmlkZW9sYW5AdmlkZW9sYW4u\n" -"b3JnPohGBBARAgAGBQJDwVhJAAoJEK0m7YKmyAW5enUAoKomp97VmvhcxzFFAWVq\n" -"nVmgR5o1AJ9pDxHnR987+WpQJEb29fOGRCv9mIhGBBARAgAGBQJDwvoRAAoJEKe9\n" -"h1GAZnhb3x0AnjPZNWxOxcgCm3pYNqvvoEG4Yn6lAKC25Llg8SZZ2ClPNK5a43Lm\n" -"QSLm8ohGBBMRAgAGBQJDwqW1AAoJEMPsbb7dbRK9zUIAoMxt11NpDs2I6PWn5rs3\n" -"kv2ERS/jAJ4lzBh03apWuHGRVTpa7JUwcuRrTIhGBBMRAgAGBQJDwveAAAoJEDlN\n" -"xZEO1wTqjN8Ani62eTBkOmn48PiGgDxlv0HDKGY+AKCT8dJrDIvWRbioeVoZ2q32\n" -"ro6nBohGBBMRAgAGBQJECI5aAAoJEMcpqsa+jGsuS4AAnRF5BHE4I5+x6LxpXwqI\n" -"rJYaJlr6AKCDpSflz+eOARGyMVNZ+tfN7zuYP4hJBBARAgAJBQJEiFlSAgcAAAoJ\n" -"EJ7/Di3F33VbbR8An2SLqQLhyCrSivMvhkY5y09u/JVyAJ9jLnR/JR/tP0bsaKSz\n" -"+unF3Tb7YohlBBMRAgAmBQJDwVfSAhsDBQkB3+IABgsJCAcDAgQVAggDBBYCAwEC\n" -"HgECF4AACgkQw2fYuYHKyoSRdACfcNQ3qoDA0PXABrljF5CctywanhoAmMZ9tbyn\n" -"LFy4ELbzCCglS8aJrYS5Ag0EQ8FX4xAIAICyMekh4upMZcq/x3krQAQ8bVTzOd1h\n" -"tcI4UV2voBEapdA7DA/xRpEjNO05o1LM/oq9Rzh8oQtEWf75vNeOLJfiVR1Vy3cz\n" -"0+a45GR4xFSTHg9zl13OM/oLI5hXrp5O5Zwu6yIZqBRiQNoCifKNvM3nrPhkjszr\n" -"TNMx2gH84DkoTDGh7th4Iar/t05Q9Ni3HS86LHOAJS4aEimPl/zqM3NyJnZDtlu1\n" -"dQ0DT13ykHmofrEb4cLNBwER2KfhmR/o9f/ybpPwpUaL3Wo1jJYYEQscBHH0o1Rl\n" -"OvLKwZrrkwEAuIJRGMWYYtFSecqr/kuSHKc5XQtx/mUnOy+Nrt7ooPcAAwUH+wWM\n" -"Ce3G4L4dASjTeZlmd8ETUV5Y7iP9GUJrGHek1S5JJeiMKqjfoMVsshBTJlZPkUYq\n" -"OwnJZzI5lxGD9SbkE2n9LUWGXll3GDbV0zXdzaG5/Efzq5BpISkpqyDszDxb9LPi\n" -"XQD/EiYP9pqlivgCTIqtcxN0Pdr0ArW0q7/yBfqWe0Fw9JrxHFN8dzmBnZk/sUis\n" -"ZIxcRWlK/mdfxgcbRSKsaqucToubwJvIONaW3y/zURjG/Ehdkh/NR7yEnMJN6/SY\n" -"E8VgjwL9Wx1KfC8nuqkFhmSMoIVKOck+0lAU3iTpThyYlU0M1luJvkYT2+Enlc1P\n" -"eqMK0FlDmF60NbnPuzOITwQYEQIADwUCQ8FX4wIbDAUJAd/iAAAKCRDDZ9i5gcrK\n" -"hCMLAKDB2xwcJT9OFM6G/seEnVMWGBfzrACg8UyCfxX2mNWNPTE4MQ/xiaQ6VBM=\n" -"=tVe2\n" -"-----END PGP PUBLIC KEY BLOCK-----\n" -#else -"-----BEGIN PGP PUBLIC KEY BLOCK-----\n" -"Version: GnuPG v2.0.4 (FreeBSD)\n" -"\n" -"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\n" -"=qrc1\n" -"-----END PGP PUBLIC KEY BLOCK-----\n" -#endif -}; - -enum -{ - UpdateReleaseStatusOlder, - UpdateReleaseStatusEqual, - UpdateReleaseStatusNewer -}; +#ifdef UPDATE_CHECK /** * Describes an update VLC release number @@ -266,28 +51,20 @@ struct update_release_t char* psz_desc; ///< Release description }; -/** - * The update object. Stores (and caches) all information relative to updates - */ -struct update_t -{ - libvlc_int_t *p_libvlc; - vlc_mutex_t lock; - struct update_release_t release; ///< Release (version) -}; +#endif /* UPDATE_CHECK */ -#define update_New( a ) __update_New( VLC_OBJECT( a ) ) +typedef struct update_release_t update_release_t; -VLC_EXPORT( update_t *, __update_New, ( vlc_object_t * ) ); +VLC_EXPORT( update_t *, update_New, ( vlc_object_t * ) ); +#define update_New( a ) update_New( VLC_OBJECT( a ) ) VLC_EXPORT( void, update_Delete, ( update_t * ) ); -VLC_EXPORT( void, update_Check, ( update_t * ) ); -VLC_EXPORT( int, update_CompareReleaseToCurrent, ( update_t * ) ); -VLC_EXPORT( void, update_Download, ( update_t *, char* ) ); +VLC_EXPORT( void, update_Check, ( update_t *, void (*callback)( void*, bool ), void * ) ); +VLC_EXPORT( bool, update_NeedUpgrade, ( update_t * ) ); +VLC_EXPORT( void, update_Download, ( update_t *, const char* ) ); +VLC_EXPORT( update_release_t*, update_GetRelease, ( update_t * ) ); /** * @} */ -#endif - -#endif +#endif /* _VLC_UPDATE_H */