comparison: libpurple/ciphers/pbkdf2cipher.c
libpurple/ciphers/pbkdf2cipher.c
- branch
- soc.2013.gobjectification
- changeset 35062
- 2aee8634c912
- parent 35026
- fde23518e1e5
- child 35065
- 2fe1b3f20c3c
equal
deleted
inserted
replaced
| 35061:307195f879f3 | 35062:2aee8634c912 |
|---|---|
| 335 cipher_class->get_digest_size = purple_pbkdf2_cipher_get_digest_size; | 335 cipher_class->get_digest_size = purple_pbkdf2_cipher_get_digest_size; |
| 336 cipher_class->set_salt = purple_pbkdf2_cipher_set_salt; | 336 cipher_class->set_salt = purple_pbkdf2_cipher_set_salt; |
| 337 cipher_class->set_key = purple_pbkdf2_cipher_set_key; | 337 cipher_class->set_key = purple_pbkdf2_cipher_set_key; |
| 338 | 338 |
| 339 pspec = g_param_spec_object("hash", "hash", "hash", PURPLE_TYPE_HASH, | 339 pspec = g_param_spec_object("hash", "hash", "hash", PURPLE_TYPE_HASH, |
| 340 G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY); | 340 G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | |
| 341 G_PARAM_STATIC_STRINGS); | |
| 341 g_object_class_install_property(obj_class, PROP_HASH, pspec); | 342 g_object_class_install_property(obj_class, PROP_HASH, pspec); |
| 342 | 343 |
| 343 pspec = g_param_spec_uint("iter_count", "iter_count", "iter_count", 0, | 344 pspec = g_param_spec_uint("iter-count", "iter-count", "iter-count", 0, |
| 344 G_MAXUINT, 0, G_PARAM_READWRITE); | 345 G_MAXUINT, 0, G_PARAM_READWRITE | |
| 346 G_PARAM_STATIC_STRINGS); | |
| 345 g_object_class_install_property(obj_class, PROP_ITER_COUNT, pspec); | 347 g_object_class_install_property(obj_class, PROP_ITER_COUNT, pspec); |
| 346 | 348 |
| 347 pspec = g_param_spec_uint("out_len", "out_len", "out_len", 0, | 349 pspec = g_param_spec_uint("out-len", "out-len", "out-len", 0, |
| 348 G_MAXUINT, 0, G_PARAM_READWRITE); | 350 G_MAXUINT, 0, G_PARAM_READWRITE | |
| 351 G_PARAM_STATIC_STRINGS); | |
| 349 g_object_class_install_property(obj_class, PROP_OUT_LEN, pspec); | 352 g_object_class_install_property(obj_class, PROP_OUT_LEN, pspec); |
| 350 | 353 |
| 351 g_type_class_add_private(klass, sizeof(PurplePBKDF2CipherPrivate)); | 354 g_type_class_add_private(klass, sizeof(PurplePBKDF2CipherPrivate)); |
| 352 } | 355 } |
| 353 | 356 |
