← Back to branch summary

~siretart/libav/trusty-security

« back to all changes in this revision

Viewing changes to libavformat/httpauth.h

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2013-10-22 23:24:08 UTC
  • mfrom: (1.3.36 sid)
  • Revision ID: package-import@ubuntu.com-20131022232408-b8tvvn4pyzri9mi3
Tags: 6:9.10-1ubuntu1
https://launchpad.net/bugs/1243235
https://launchpad.net/bugs/1180288
https://launchpad.net/bugs/1242802
* Build all -extra flavors from this source package, as libav got demoted
  from main to universe, cf LP: #1243235
* Simplify debian/rules to follow exactly the code that debian executes
* New upstream (LP: #1180288) fixes lots of security issues (LP: #1242802)
* Merge from unstable, remaining changes:
  - build-depend on libtiff5-dev rather than libtiff4-dev,
    avoids FTBFS caused by imlib
  - follow the regular debian codepaths

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavformat/httpauth.h
32
32
    HTTP_AUTH_DIGEST,      /**< HTTP 1.1 Digest auth from RFC 2617 */
33
33
} HTTPAuthType;
34
34
 
35
 
typedef struct {
 
35
typedef struct DigestParams {
36
36
    char nonce[300];       /**< Server specified nonce */
37
37
    char algorithm[10];    /**< Server specified digest algorithm */
38
38
    char qop[30];          /**< Quality of protection, containing the one
41
41
    char opaque[300];      /**< A server-specified string that should be
42
42
                             *  included in authentication responses, not
43
43
                             *  included in the actual digest calculation. */
 
44
    char stale[10];        /**< The server indicated that the auth was ok,
 
45
                             * but needs to be redone with a new, non-stale
 
46
                             * nonce. */
44
47
    int nc;                /**< Nonce count, the number of earlier replies
45
48
                             *  where this particular nonce has been used. */
46
49
} DigestParams;
49
52
 * HTTP Authentication state structure. Must be zero-initialized
50
53
 * before used with the functions below.
51
54
 */
52
 
typedef struct {
 
55
typedef struct HTTPAuthState {
53
56
    /**
54
57
     * The currently chosen auth type.
55
58
     */
62
65
     * The parameters specifiec to digest authentication.
63
66
     */
64
67
    DigestParams digest_params;
 
68
    /**
 
69
     * Auth ok, but needs to be resent with a new nonce.
 
70
     */
 
71
    int stale;
65
72
} HTTPAuthState;
66
73
 
67
74
void ff_http_auth_handle_header(HTTPAuthState *state, const char *key,