metze/wireshark/wip.git
10 years agorerun pidl ws-metze-gssapi
Gregor Beck [Wed, 22 Jan 2014 12:39:52 +0000 (13:39 +0100)]
rerun pidl

Change-Id: I3c5cb5dccbcf13d7f0c55c47545fe4acd70947dc

10 years agowitness: FIX for tvb_get_unicode_string -> tvb_get_string_enc
Gregor Beck [Wed, 22 Jan 2014 12:36:28 +0000 (13:36 +0100)]
witness: FIX for tvb_get_unicode_string -> tvb_get_string_enc

10 years agoWitness: move packet-dcerpc-witness-cnf.c to witness.cnf
Gregor Beck [Tue, 7 Jan 2014 10:02:47 +0000 (11:02 +0100)]
Witness: move packet-dcerpc-witness-cnf.c to witness.cnf

10 years agowitness: cast to avoid C++ warnings
Gregor Beck [Wed, 20 Nov 2013 14:40:35 +0000 (15:40 +0100)]
witness: cast to avoid C++ warnings

10 years agowitness fix for new tvb_get_unicode_string() interface using wmem
Gregor Beck [Wed, 20 Nov 2013 13:09:57 +0000 (14:09 +0100)]
witness fix for new tvb_get_unicode_string() interface using wmem

10 years agoFIXUP: add parameter dcerpc_info to functions defined in cnf file
Gregor Beck [Wed, 20 Nov 2013 10:43:33 +0000 (11:43 +0100)]
FIXUP: add parameter dcerpc_info to functions defined in cnf file

10 years agoadd parameter dcerpc_info to PIDL_dissect_ipv?address()
Gregor Beck [Wed, 20 Nov 2013 10:29:40 +0000 (11:29 +0100)]
add parameter dcerpc_info to PIDL_dissect_ipv?address()

10 years agoadd parameter dcerpc_info to functions defined in cnf file
Gregor Beck [Wed, 20 Nov 2013 10:35:49 +0000 (11:35 +0100)]
add parameter dcerpc_info to functions defined in cnf file

10 years agorun master pidl
Gregor Beck [Tue, 19 Nov 2013 10:25:01 +0000 (11:25 +0100)]
run master pidl

10 years agoWitness: V2 RegisterEx()
Gregor Beck [Wed, 28 Aug 2013 09:54:25 +0000 (11:54 +0200)]
Witness: V2 RegisterEx()

10 years agoWitness: start to implement V2
Gregor Beck [Wed, 28 Aug 2013 09:11:55 +0000 (11:11 +0200)]
Witness: start to implement V2

10 years agoWitness: fix notify change
Gregor Beck [Tue, 6 Aug 2013 13:31:55 +0000 (15:31 +0200)]
Witness: fix notify change

10 years agoWitness: add pidl output
Gregor Beck [Mon, 29 Jul 2013 14:11:20 +0000 (16:11 +0200)]
Witness: add pidl output

10 years agoWitness: fix whitespace
Gregor Beck [Mon, 29 Jul 2013 07:52:17 +0000 (09:52 +0200)]
Witness: fix whitespace

10 years agoWitness: PIDL_dissect_ipv6address()
Gregor Beck [Mon, 29 Jul 2013 07:51:46 +0000 (09:51 +0200)]
Witness: PIDL_dissect_ipv6address()

10 years agoWitness: fix compiler warnings
Gregor Beck [Mon, 29 Jul 2013 07:29:25 +0000 (09:29 +0200)]
Witness: fix compiler warnings

10 years agoWitness: set col_info for interfaceInfo_state
Gregor Beck [Mon, 29 Jul 2013 07:24:59 +0000 (09:24 +0200)]
Witness: set col_info for interfaceInfo_state

10 years agoWitness: cleanup cnf
Gregor Beck [Mon, 29 Jul 2013 07:23:32 +0000 (09:23 +0200)]
Witness: cleanup cnf

10 years agoWitness: add move ip to tree_item
Gregor Beck [Fri, 26 Jul 2013 11:37:34 +0000 (13:37 +0200)]
Witness: add move ip to tree_item

10 years agoWitness: working witness.cnf
Gregor Beck [Fri, 26 Jul 2013 11:16:45 +0000 (13:16 +0200)]
Witness: working witness.cnf

10 years agoWitness: WIP
Gregor Beck [Fri, 26 Jul 2013 10:39:56 +0000 (12:39 +0200)]
Witness: WIP

10 years agoWitness: track context handles
Gregor Beck [Thu, 25 Jul 2013 08:43:13 +0000 (10:43 +0200)]
Witness: track context handles

10 years agoWitness: enum witness_notifyResponse_type
Gregor Beck [Thu, 25 Jul 2013 07:08:31 +0000 (09:08 +0200)]
Witness: enum witness_notifyResponse_type

10 years agoWitness: bitmap witness_interfaceInfo_flags
Gregor Beck [Thu, 25 Jul 2013 07:08:14 +0000 (09:08 +0200)]
Witness: bitmap witness_interfaceInfo_flags

10 years agoFIXUP
Gregor Beck [Thu, 25 Jul 2013 06:55:57 +0000 (08:55 +0200)]
FIXUP

10 years agoWitness: enum witness_interface_state
Gregor Beck [Thu, 25 Jul 2013 06:47:39 +0000 (08:47 +0200)]
Witness: enum witness_interface_state

10 years agoWitness: interfaceInfo_group_name + ipv4address
Gregor Beck [Thu, 25 Jul 2013 06:03:16 +0000 (08:03 +0200)]
Witness: interfaceInfo_group_name + ipv4address

10 years agoWitness: first guess
Gregor Beck [Wed, 24 Jul 2013 07:14:12 +0000 (09:14 +0200)]
Witness: first guess

10 years agosq dissect_verification_trailer
Stefan Metzmacher [Tue, 28 Jan 2014 12:23:33 +0000 (13:23 +0100)]
sq dissect_verification_trailer

10 years agoTODO: quick fix
Gregor Beck [Wed, 22 Jan 2014 10:13:15 +0000 (11:13 +0100)]
TODO: quick fix

10 years agoTMP: parse with (wrong) lenght as multiple of 2
Gregor Beck [Tue, 7 Jan 2014 08:44:03 +0000 (09:44 +0100)]
TMP: parse with (wrong) lenght as multiple of 2

10 years agosq rpc_sec_veritication_trailer
Stefan Metzmacher [Sun, 5 Jan 2014 11:55:14 +0000 (12:55 +0100)]
sq rpc_sec_veritication_trailer

10 years agosq dissect_verification_trailer
Stefan Metzmacher [Fri, 3 Jan 2014 13:13:40 +0000 (14:13 +0100)]
sq dissect_verification_trailer

10 years agodcerpc sec_vt guid_to_ep_str
Stefan Metzmacher [Fri, 3 Jan 2014 12:36:55 +0000 (13:36 +0100)]
dcerpc sec_vt guid_to_ep_str

10 years agoepan/dissectors/packet-dcerpc.c fix warnings
Stefan Metzmacher [Fri, 20 Sep 2013 01:51:56 +0000 (03:51 +0200)]
epan/dissectors/packet-dcerpc.c fix warnings

10 years agosec_vt_header: dissect cont_id + opnum
Gregor Beck [Thu, 5 Sep 2013 11:12:02 +0000 (13:12 +0200)]
sec_vt_header: dissect cont_id + opnum

10 years agosec_vt_header: dissect call_id
Gregor Beck [Thu, 5 Sep 2013 10:58:29 +0000 (12:58 +0200)]
sec_vt_header: dissect call_id

10 years agosec_vt_header: dissect drep
Gregor Beck [Wed, 4 Sep 2013 09:14:07 +0000 (11:14 +0200)]
sec_vt_header: dissect drep

10 years agoDCERPC: factor out proto_tree_add_dcerpc_drep()
Gregor Beck [Wed, 4 Sep 2013 09:03:15 +0000 (11:03 +0200)]
DCERPC: factor out proto_tree_add_dcerpc_drep()

10 years agoWIP: rpc_sec_vt
Gregor Beck [Mon, 2 Sep 2013 11:22:47 +0000 (13:22 +0200)]
WIP: rpc_sec_vt

10 years agosec_vt_pcontext
Gregor Beck [Mon, 2 Sep 2013 09:06:43 +0000 (11:06 +0200)]
sec_vt_pcontext

10 years agoFIXUP: WIP: verification_trailer
Gregor Beck [Mon, 2 Sep 2013 08:55:44 +0000 (10:55 +0200)]
FIXUP:  WIP: verification_trailer

10 years agoFIXUP: sec_vt_command bitmask
Gregor Beck [Mon, 2 Sep 2013 08:35:53 +0000 (10:35 +0200)]
FIXUP: sec_vt_command bitmask

10 years agosec_vt_bitmask
Gregor Beck [Mon, 2 Sep 2013 08:04:57 +0000 (10:04 +0200)]
sec_vt_bitmask

10 years agoFIXUP: give names to sec_vt_command's
Gregor Beck [Fri, 30 Aug 2013 13:12:24 +0000 (15:12 +0200)]
FIXUP: give names to sec_vt_command's

10 years agoheader field for sec_vt_command_length
Gregor Beck [Fri, 30 Aug 2013 13:09:36 +0000 (15:09 +0200)]
header field for sec_vt_command_length

10 years agogive names to sec_vt_command's
Gregor Beck [Fri, 30 Aug 2013 13:02:28 +0000 (15:02 +0200)]
give names to sec_vt_command's

10 years agoadd bitmask for sec_vt_command
Gregor Beck [Fri, 30 Aug 2013 12:49:31 +0000 (14:49 +0200)]
add bitmask for sec_vt_command

10 years agoWIP: verification_trailer
Gregor Beck [Fri, 30 Aug 2013 12:01:29 +0000 (14:01 +0200)]
WIP: verification_trailer

10 years agoMove Auth padding to the right tree
Gregor Beck [Fri, 30 Aug 2013 12:00:56 +0000 (14:00 +0200)]
Move Auth padding to the right tree

10 years agoadd WERR_INVALID_STATE
Gregor Beck [Wed, 28 Aug 2013 10:35:00 +0000 (12:35 +0200)]
add WERR_INVALID_STATE

10 years agoadd WERR_TIMEOUT
Gregor Beck [Wed, 28 Aug 2013 09:22:05 +0000 (11:22 +0200)]
add WERR_TIMEOUT

10 years agopacket-smb2: pass smb2_info via private_data
Gregor Beck [Thu, 20 Sep 2012 07:21:41 +0000 (09:21 +0200)]
packet-smb2: pass smb2_info via private_data

10 years agosq FSCTL_PIPE_WAIT
Stefan Metzmacher [Fri, 3 Jan 2014 13:32:37 +0000 (14:32 +0100)]
sq FSCTL_PIPE_WAIT

10 years agosq epan/dissectors/packet-smb2.c no check_col => fsctl_pipe_wait
Stefan Metzmacher [Wed, 9 Oct 2013 09:01:49 +0000 (11:01 +0200)]
sq epan/dissectors/packet-smb2.c no check_col => fsctl_pipe_wait

10 years agoWIP: fsctl_pipe_wait
Gregor Beck [Mon, 17 Sep 2012 09:50:45 +0000 (11:50 +0200)]
WIP: fsctl_pipe_wait

10 years agoWIP: FSCTL_PIPE_WAIT
Gregor Beck [Thu, 13 Sep 2012 15:27:51 +0000 (17:27 +0200)]
WIP: FSCTL_PIPE_WAIT

10 years agoRevert "smb-direct fragmentation"
Stefan Metzmacher [Wed, 3 Oct 2012 21:02:14 +0000 (23:02 +0200)]
Revert "smb-direct fragmentation"

This reverts commit 7559f043b05f60abdec72c49bb1adb48ae2ee584.

10 years agosmb-direct fragmentation
Stefan Metzmacher [Wed, 3 Oct 2012 21:01:12 +0000 (23:01 +0200)]
smb-direct fragmentation

10 years agoMIT krb5-1.6 HACK patch
Stefan Metzmacher [Sat, 25 Jul 2009 08:23:26 +0000 (10:23 +0200)]
MIT krb5-1.6 HACK patch

Apply this patch to krb5-1.6.x and build it
with a special prefix that only wireshark will use!

Then start wireshark with a script like this:

-----
metze@SERNOX:~/devel/wireshark/wireshark.git$ cat ~/bin/mxwrap.wireshark.krb5

export LD_LIBRARY_PATH="/home/metze/prefix/mit-krb5-1-6/lib/:$LD_LIBRARY_PATH"
exec /home/metze/devel/prefix/wireshark/bin/wireshark $@
gdb --args /home/metze/devel/prefix/wireshark/bin/wireshark $@
------

The LD_PRELOAD only works if the krb5 library version your system one,
then you just need to replace "libk5crypto.so", otherwise wireshark
needs to all of the custom libraries.

metze

10 years agofix for netmon 3.x captures
Stefan Metzmacher [Wed, 25 Aug 2010 05:14:40 +0000 (07:14 +0200)]
fix for netmon 3.x captures

metze

10 years agoTODO: packet-smb2: setup decryption keys for kerberos session setups
Stefan Metzmacher [Mon, 13 Aug 2012 15:51:21 +0000 (17:51 +0200)]
TODO: packet-smb2: setup decryption keys for kerberos session setups

10 years agopacket-kerberos: remember in what frame a key was learned
Stefan Metzmacher [Mon, 13 Aug 2012 12:45:58 +0000 (14:45 +0200)]
packet-kerberos: remember in what frame a key was learned

10 years agoasn1/kerberos: remember in what frame a key was learned
Stefan Metzmacher [Mon, 13 Aug 2012 06:59:22 +0000 (08:59 +0200)]
asn1/kerberos: remember in what frame a key was learned

10 years agopacket-smb: register a dissector on top of smb_direct
Stefan Metzmacher [Wed, 19 Sep 2012 18:21:49 +0000 (20:21 +0200)]
packet-smb: register a dissector on top of smb_direct

Signed-off-by: Stefan Metzmacher <metze@samba.org>
10 years agopacket-smb2: register a dissector on top of smb_direct
Stefan Metzmacher [Wed, 19 Sep 2012 18:21:49 +0000 (20:21 +0200)]
packet-smb2: register a dissector on top of smb_direct

Signed-off-by: Stefan Metzmacher <metze@samba.org>
10 years agopacket-iwarp-mpa: give more information if the ULPDU length doesn't match
Stefan Metzmacher [Wed, 19 Sep 2012 18:21:04 +0000 (20:21 +0200)]
packet-iwarp-mpa: give more information if the ULPDU length doesn't match

Try to dissect even it the size is not as expected.
Windows doesn't use alignment for smb-direct.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
10 years agopacket-smb-direct.c: add initial implementation
Stefan Metzmacher [Wed, 19 Sep 2012 14:21:21 +0000 (16:21 +0200)]
packet-smb-direct.c: add initial implementation

Signed-off-by: Stefan Metzmacher <metze@samba.org>
10 years agopacket-iwarp-ddp-rdmap: make it possible to register "iwarp_ddp_rdmap" payload dissectors
Stefan Metzmacher [Wed, 19 Sep 2012 13:38:43 +0000 (15:38 +0200)]
packet-iwarp-ddp-rdmap: make it possible to register "iwarp_ddp_rdmap" payload dissectors

Signed-off-by: Stefan Metzmacher <metze@samba.org>
10 years agoTODO needed??? packet-ntlmssp: fix possible segfault and set blob->length so the...
Stefan Metzmacher [Tue, 6 Nov 2012 09:02:59 +0000 (10:02 +0100)]
TODO needed??? packet-ntlmssp: fix possible segfault and set blob->length so the max value

10 years agoAdd a HACK patch for building a patched kerberos library
Matthieu Patou [Mon, 23 Sep 2013 06:24:24 +0000 (23:24 -0700)]
Add a HACK patch for building a patched kerberos library

Signed-off-by: Matthieu Patou <mat@matws.net>
10 years agopacket-smb2: dissect SMBDirect Buffer Descriptors
Stefan Metzmacher [Sat, 29 Sep 2012 08:35:13 +0000 (10:35 +0200)]
packet-smb2: dissect SMBDirect Buffer Descriptors

Signed-off-by: Stefan Metzmacher <metze@samba.org>
10 years agopacket-smb2: fix lease epoch fields
Stefan Metzmacher [Wed, 31 Oct 2012 12:06:09 +0000 (13:06 +0100)]
packet-smb2: fix lease epoch fields

Bug: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9703

Change-Id: I1955360adaee53846f084434c59180d715e19fcd
Signed-off-by: Stefan Metzmacher <metze@samba.org>
10 years agosmb2: Lease Epoch is only 16 bit
Volker Lendecke [Tue, 28 Jan 2014 10:27:14 +0000 (11:27 +0100)]
smb2: Lease Epoch is only 16 bit

See [MS-SMB2] 2.2.14.2.12

Bug: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9703

Change-Id: Ia9c9c658bd5020e0dad84fc74617fed60ce7df06
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
10 years agosmb2: Fix a typo
Volker Lendecke [Tue, 28 Jan 2014 10:12:09 +0000 (11:12 +0100)]
smb2: Fix a typo

Bug: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9703

Change-Id: I8ebb20a48e1131fcf14ee55e5e1822a8dcd713d2
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
10 years agoRevert "In get_unicode_or_ascii_string(), check if the length is odd/even, not the...
Stefan Metzmacher [Fri, 3 Jan 2014 10:51:04 +0000 (11:51 +0100)]
Revert "In get_unicode_or_ascii_string(), check if the length is odd/even, not the offset.  Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5778 - Volume label field ... is not displayed correctly ..."

This is wrong it breaks all sort of things. The "Volume label field"
is a special case, which can be fixed by using nopad=TRUE.

Change-Id: I3cd3f30ff0076d5e31a735391b175fd68e5fa142
Signed-off-by: Stefan Metzmacher <metze@samba.org>
10 years agopacket-smb.c: real fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5778
Stefan Metzmacher [Fri, 3 Jan 2014 10:50:00 +0000 (11:50 +0100)]
packet-smb.c: real fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5778

Change-Id: I33308c44791b487844f23db07d152897380d7cf1
Signed-off-by: Stefan Metzmacher <metze@samba.org>
10 years agoComment out a lot more hf[] entries and related.
wmeier [Tue, 28 Jan 2014 03:09:03 +0000 (03:09 +0000)]
Comment out a lot more hf[] entries and related.
(Found by checkhf).

Note: There's quite a large amount of hf[] entries which are
      commented out. I wonder if there are "top-level" entries
      missing from the "parse-tree" arrays ?

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54990 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoComment out unused hf[] entries and related found by checkhf.
wmeier [Tue, 28 Jan 2014 03:06:03 +0000 (03:06 +0000)]
Comment out unused hf[] entries and related found by checkhf.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54989 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoRe-arrange #if 0/#endif related to an hf[] entry so that checkhf doesn't complain.
wmeier [Tue, 28 Jan 2014 03:02:37 +0000 (03:02 +0000)]
Re-arrange #if 0/#endif related to an hf[] entry so that checkhf doesn't complain.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54988 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom Marko Hrastovec via
eapache [Tue, 28 Jan 2014 00:48:23 +0000 (00:48 +0000)]
From Marko Hrastovec via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9697

Architectural support for multiple version of the same Asterix categories.
Includes implementation of CAT064 v.0.17.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54987 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoMake it easier to try GTK 3.6
etxrab [Mon, 27 Jan 2014 19:22:10 +0000 (19:22 +0000)]
Make it easier to try GTK 3.6

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54986 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoConvert the quick setup chapter to AsciiDoc and start converting its
gerald [Mon, 27 Jan 2014 18:43:57 +0000 (18:43 +0000)]
Convert the quick setup chapter to AsciiDoc and start converting its
content to Git.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54985 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFix hf[] entries with refs to range_string arrays
wmeier [Mon, 27 Jan 2014 18:22:39 +0000 (18:22 +0000)]
Fix hf[] entries with refs to range_string arrays
 to add missing BASE_RANGE_STRING and to use RVALS instead of VALS.

Fixes crashes in 'tshark -G values' and presumably also fixes
 crashes when used in a dissection.

Introduced in SVN #54449.

(I suspect that ' convert_proto_tree_add_text.pl' may need some work
 to handle range_strings).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54984 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFix: value string specified as a BASE_VAL64_STRING in
wmeier [Mon, 27 Jan 2014 17:20:44 +0000 (17:20 +0000)]
Fix: value string specified as a BASE_VAL64_STRING in
 an hf[] entry but defined as a 'value_string' intead of
 as a 'val64_string'.

Caused 'tshark -G values' to crash
 (and presumably would also cause a crash when the value-string
  is referenced in a dissection):

Introduced in svn #54728

(Note: There's still another 'tshark -G values' crash to to found & fixed)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54983 f5534014-38df-0310-8fa8-9805f1628bb7

10 years ago(Trivial) Fix spellling in a comment.
wmeier [Mon, 27 Jan 2014 14:33:54 +0000 (14:33 +0000)]
(Trivial) Fix spellling in a comment.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54982 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom Pavel Moravec via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9612
eapache [Mon, 27 Jan 2014 13:42:34 +0000 (13:42 +0000)]
From Pavel Moravec via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9612

Fix possibly-uninitialized variable caught by valgrind fuzzing in AMQP.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54981 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoAdd missing cast.
eapache [Mon, 27 Jan 2014 13:12:59 +0000 (13:12 +0000)]
Add missing cast.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54980 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoRevert part of previous change
martinm [Mon, 27 Jan 2014 12:54:34 +0000 (12:54 +0000)]
Revert part of previous change

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54979 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoSend news of SecurityModeFailure to PDCP dissector, which will attempt to roll back...
martinm [Mon, 27 Jan 2014 12:06:46 +0000 (12:06 +0000)]
Send news of SecurityModeFailure to PDCP dissector, which will attempt to roll back to previous setting

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54978 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoDo not handle BER bitstring as ASCII string, because this will fail
stig [Mon, 27 Jan 2014 09:57:24 +0000 (09:57 +0000)]
Do not handle BER bitstring as ASCII string, because this will fail
when the first bit is set.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54977 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoAdd back the fix from revision 54693.
stig [Mon, 27 Jan 2014 09:55:46 +0000 (09:55 +0000)]
Add back the fix from revision 54693.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54976 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoAdded back x509af_get_last_algorithm_id() removed in revision 54647 to
stig [Mon, 27 Jan 2014 09:02:06 +0000 (09:02 +0000)]
Added back x509af_get_last_algorithm_id() removed in revision 54647 to
restore usage in cms and pkcs12.  They never got a valid value in
actx->external.direct_reference because they use another actx in this case.

This will add back the global variable in x509af, but this is needed
until we manage to pass the value in another way.

See comments in bug 9573.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54975 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoTry to fix the path selector argument.
gerald [Mon, 27 Jan 2014 05:26:38 +0000 (05:26 +0000)]
Try to fix the path selector argument.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54974 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFix a section name conflict.
gerald [Mon, 27 Jan 2014 05:10:34 +0000 (05:10 +0000)]
Fix a section name conflict.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54973 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoRestore an inadvertently deleted file.
gerald [Mon, 27 Jan 2014 04:34:25 +0000 (04:34 +0000)]
Restore an inadvertently deleted file.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54972 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoMigrate the build environment introduction to AsciiDoc.
gerald [Mon, 27 Jan 2014 04:20:44 +0000 (04:20 +0000)]
Migrate the build environment introduction to AsciiDoc.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54971 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoConvert the preface to AsciiDoc with minor edits.
gerald [Mon, 27 Jan 2014 03:08:01 +0000 (03:08 +0000)]
Convert the preface to AsciiDoc with minor edits.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54970 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoGPLv2 -> GPLv2+
jmayer [Sun, 26 Jan 2014 22:21:28 +0000 (22:21 +0000)]
GPLv2 -> GPLv2+

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54969 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agolupdate / lrelease ui/qt/Qtshark.pro
alagoutte [Sun, 26 Jan 2014 18:24:56 +0000 (18:24 +0000)]
lupdate / lrelease ui/qt/Qtshark.pro

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54968 f5534014-38df-0310-8fa8-9805f1628bb7